Remove the DTD and its resolver from the java bindings since we use the flexml parser

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6e20976..0a51345 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,7 @@ EXTRA_DIST= \
        \
        simdag/private.h \
        simdag/dax.dtd \
+       simdag/dax_dtd.l \
        simdag/dax_dtd.h \
        simdag/dax_dtd.c \
        \
@@ -194,10 +195,6 @@ SURF_SRC= \
   surf/cpu_im.c                                               \
   xbt/xbt_sg_stubs.c
 
-if CONTEXT_THREADS
-  SURF_SRC +=  xbt/xbt_os_thread.c
-endif
-
 GTNETS_SRC= \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -216,18 +213,20 @@ SIMIX_SRC= \
   simix/smx_network.c
   
 if CONTEXT_THREADS
-  SURF_SRC += simix/smx_context_thread.c  
+  SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c
+  EXTRA_DIST += simix/smx_context_sysv.c
 else  
   SURF_SRC += simix/smx_context_sysv.c
+  EXTRA_DIST += xbt/xbt_os_thread.c simix/smx_context_thread.c
 endif  
 
 SMPI_SRC= \
   smpi/smpi_base.c \
+  smpi/smpi_comm.c \
+  smpi/smpi_group.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 \
   smpi/smpi_coll.c \
   smpi/smpi_mpi_dt.c
@@ -260,7 +259,6 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/Task.java                         \
   \
   java/simgrid/msg/MsgNative.java                    \
-  java/simgrid/msg/DTDResolver.java                  \
   java/simgrid/msg/ApplicationHandler.java           \
   \
   java/simgrid/msg/Sem.java
@@ -371,16 +369,21 @@ clean-local:
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
 
-simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
+simgrid.jar: $(JMSG_JAVA_SRC)
        [ -e .classes ] || mkdir .classes
-       $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
+       $(JAVAC) -d .classes -source 6 $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
        [ -e .classes/surf ] || mkdir .classes/surf
-       cp $(srcdir)/surf/simgrid.dtd .classes/surf
        $(JAR) cvf simgrid.jar -C .classes .
 else
 EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
+LUA_SRC= simix/smx_context_lua.c bindings/lua/Msglua.c
+if HAVE_LUA
+  simgrid_sources += $(LUA_SRC)
+else
+  EXTRA_DIST += $(LUA_SRC)
+endif
 ##
 ## Compile the libs
 CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c