Added flag for printing more debug info

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 520ee53..ed9474a 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,9 +213,11 @@ 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= \
@@ -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
@@ -531,17 +536,17 @@ $(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/s
        @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 include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l
+       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 "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 include/xbt/graphxml.h src/xbt/graphxml.l"
+       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 src/simdag/dax_dtd.h src/simdag/dax_dtd.l
+       touch $(top_srcdir)/src/simdag/dax_dtd.h $(top_srcdir)/src/simdag/dax_dtd.l
 endif
 endif
 endif