set source level of java to 6 (5 may be enough, but not lower: we use genericity)

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f35fe3..3e82357 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
@@ -373,7 +372,7 @@ jar_DATA =  simgrid.jar
 
 simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
        [ -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 .
@@ -381,6 +380,12 @@ 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
@@ -399,11 +404,11 @@ gras_fragile_sources=gras/DataDesc/ddt_parse.yy.c xbt/graphxml_parse.c
 BUILT_SOURCES+=supernovae_sg.c supernovae_gras.c supernovae_smpi.c
 
 supernovae_sg.c: Makefile.am
-       ./mk_supernovae.sh supernovae_sg.c $(filter-out $(simgrid_fragile_sources),$(simgrid_sources))
+       @top_srcdir@/src/mk_supernovae.sh supernovae_sg.c $(filter-out $(simgrid_fragile_sources),$(simgrid_sources))
 supernovae_gras.c: Makefile.am
-       ./mk_supernovae.sh supernovae_gras.c $(filter-out $(gras_fragile_sources),$(gras_sources))
+       @top_srcdir@/src/mk_supernovae.sh supernovae_gras.c $(filter-out $(gras_fragile_sources),$(gras_sources))
 supernovae_smpi.c: Makefile.am
-       ./mk_supernovae.sh supernovae_smpi.c $(filter-out $(smpi_fragile_sources),$(smpi_sources))
+       @top_srcdir@/src/mk_supernovae.sh supernovae_smpi.c $(filter-out $(smpi_fragile_sources),$(smpi_sources))
 
 nodist_libsimgrid_la_SOURCES =  supernovae_sg.c $(simgrid_fragile_sources)
 nodist_libgras_la_SOURCES = supernovae_gras.c $(gras_fragile_sources)
@@ -528,20 +533,20 @@ simdag/dax_dtd.h: simdag/dax.dtd
 else
 
 $(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd
-       @echo "ERROR: src/surf/simgrid.dtd was modified, but the flexml program was not detected"
-       @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
-       @echo "ERROR:   touch include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l"
-       @exit 1
+       @echo "WARNING: src/surf/simgrid.dtd seem to be modified, but the flexml program was not detected"
+       @echo "WARNING: Please install it if you did modify this file."
+       @echo "WARNING: For now, I'll ignore the change"
+       touch $(top_srcdir)/include/surf/simgrid_dtd.h $(top_srcdir)/src/surf/simgrid_dtd.l
 $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd
-       @echo "ERROR: src/xbt/graphxml.dtd was modified, but the flexml program was not detected"
-       @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
-       @echo "ERROR:   touch include/xbt/graphxml.h src/xbt/graphxml.l"
-       @exit 1
-simdag/dax_dtd.h simdag/dax_dtd.l: simdag/dax_dtd.dtd
-       @echo "ERROR: src/simdag/dax.dtd was modified, but the flexml program was not detected"
-       @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
-       @echo "ERROR:   touch src/simdag/dax_dtd.h src/simdag/dax_dtd.l"
-       @exit 1
+       @echo "WARNING: src/xbt/graphxml.dtd seem to be modified, but the flexml program was not detected"
+       @echo "WARNING: Please install it if you did modify this file."
+       @echo "WARNING: For now, I'll ignore the change"
+       touch $(top_srcdir)/include/xbt/graphxml.h $(top_srcdir)/src/xbt/graphxml.l"
+simdag/dax_dtd.h simdag/dax_dtd.l: simdag/dax.dtd
+       @echo "WARNING: src/simdag/dax.dtd seem to be modified, but the flexml program was not detected"
+       @echo "WARNING: Please install it if you did modify this file."
+       @echo "WARNING: For now, I'll ignore the change"
+       touch $(top_srcdir)/src/simdag/dax_dtd.h $(top_srcdir)/src/simdag/dax_dtd.l
 endif
 endif
 endif