49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
diff --git a/docs/Makefile b/docs/Makefile
|
|
index 86bdec0..76222d1 100644
|
|
--- a/docs/Makefile
|
|
+++ b/docs/Makefile
|
|
@@ -13,7 +13,7 @@ pdf_manual:
|
|
cd tex-files; latex manual; latex manual; latex manual; dvipdf manual.dvi; mv manual.pdf ..
|
|
|
|
html_manual:
|
|
- cd tex-files; latex2html -split 3 -no_math -html_version 3.2 -dir ../${MANUAL_DIR} -mkdir -contents_in_navigation manual
|
|
+ cd tex-files; latex2html -local_icons -split 3 -no_math -html_version 3.2 -dir ../${MANUAL_DIR} -mkdir -contents_in_navigation manual
|
|
|
|
|
|
java_docs:
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 7d0b731..50ee191 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -6,7 +6,7 @@
|
|
# This target builds the java language bindings to the adevs simulator.
|
|
# Point this at your java installation if you want to build the Java bindings.
|
|
JAVA_HOME = /usr/local/jdk1.6.0_26
|
|
-CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
|
|
+java_adevs: CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
|
|
#
|
|
# 2) adevs
|
|
#
|
|
@@ -23,7 +23,7 @@ CFLAGS += -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
|
|
# adevs object library. Point MODELICA_HOME at your Open Modelica
|
|
# installation if you want to build the Modelica extensions for adevs.
|
|
MODELICA_HOME = ${HOME}/Code/openmodelica/trunk
|
|
-CFLAGS += -I${MODELICA_HOME}/build/include/omc
|
|
+adevs_with_modelica: CFLAGS += -I${MODELICA_HOME}/build/include/omc
|
|
include Makefile.modelica
|
|
|
|
# These are generic options for the GNU C++ compiler.
|
|
@@ -64,6 +64,13 @@ JAVA_OBJS = \
|
|
# to C++ simulations
|
|
adevs: ${ADEVS_OBJS}
|
|
ar -r libadevs.a ${ADEVS_OBJS}
|
|
+ ${CXX} -shared -Wl,-soname,libadevs.so.2 -o libadevs.so.2.6 ${ADEVS_OBJS}
|
|
+
|
|
+install:
|
|
+ mkdir -p "${DESTDIR}"
|
|
+ install -m 755 -p libadevs.so.2.6 "${DESTDIR}"
|
|
+ ln -f -s libadevs.so.2.6 "${DESTDIR}/libadevs.so.2"
|
|
+ ln -f -s libadevs.so.2.6 "${DESTDIR}/libadevs.so"
|
|
|
|
# This adds the modelica extensions to the adevs library
|
|
adevs_with_modelica: ${ADEVS_OBJS} modelica_runtime.o
|