New version of the java bindings by Malek, passing all [existing] tests

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d69dfa..f694bbf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,6 @@ EXTRA_DIST= \
        surf/surfxml.dtd \
        surf/network_private.h \
        network_gtnets_private.h \
-       surf/workstation_KCCFLN05_private.h \
        \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
@@ -62,7 +61,7 @@ EXTRA_DIST= \
        include/simix/simix.h include/simix/datatypes.h \
        simix/msg_simix_private.h \
        \
-       smpi/private.h smpi/smpi.h
+       smpi/private.h
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -186,7 +185,12 @@ SIMIX_SRC= \
 
 SMPI_SRC= \
   smpi/smpi_base.c \
-  smpi/smpi_mpi.c
+  smpi/smpi_bench.c \
+  smpi/smpi_global.c \
+  smpi/smpi_mpi.c \
+  smpi/smpi_sender.c \
+  smpi/smpi_receiver.c \
+  smpi/smpi_util.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -209,12 +213,16 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
   java/simgrid/msg/Process.java                      \
+  java/simgrid/msg/DTDResolver.java                  \
   java/simgrid/msg/ApplicationHandler.java           \
   java/simgrid/msg/Channel.java                      \
   java/simgrid/msg/Host.java                         \
   java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Task.java                         \
-  java/simgrid/msg/ParallelTask.java                 
+  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/Sem.java
+
 
 SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
 
@@ -303,6 +311,12 @@ libsmpi_la_LIBADD = libsimgrid.la
 libsmpi_la_SOURCES = $(SMPI_SRC)
 libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
+# Windows users (at least, MSVC ones) need a def file.
+if IS_WINDOWS
+libgras_la_LDFLAGS    += -Wl,--output-def,libgras.def
+libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def
+libsmpi_la_LDFLAGS    += -Wl,--output-def,libsmpi.def
+endif
 
 ##
 ## Java cruft
@@ -323,10 +337,10 @@ clean-local:
 jardir = $(prefix)/jar 
 jar_DATA =  simgrid.jar
 
-simgrid.jar: $(JMSG_JAVA_SRC)
+simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
        [ -e .classes ] || mkdir .classes
-       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
-       $(JAR) cvf simgrid.jar -C .classes .;
+       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) 
+       $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
 else
 EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
 endif