X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7362918af654000c20127d0b98dfb28938e76eb9..39a157b0abbb551db9d42f65d4268c9b607cd9cd:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c9a4191576..13ba0c2569 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST= \
         \
 	portable.h \
 	\
+        xbt/mallocator_private.h \
 	xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
@@ -59,7 +60,8 @@ EXTRA_DIST= \
 	gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
 	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
 	\
-	amok/Bandwidth/bandwidth_private.h
+	amok/Bandwidth/bandwidth_private.h \
+	amok/amok_modinter.h
 
 #        gras_private.h
 
@@ -114,6 +116,7 @@ COMMON_SRC=\
   xbt/sysdep.c                                                               \
   xbt/asserts.c                                                              \
   xbt/log.c         xbt/log_default_appender.c                               \
+  xbt/mallocator.c                                                           \
   xbt/dynar.c                                                                \
   xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
   xbt/dict_multi.c                                                           \
@@ -124,7 +127,7 @@ COMMON_SRC=\
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
   xbt/xbt_peer.c                                                             \
-  xbt/module.c                                                               \
+  xbt/xbt_main.c                                                             \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
   xbt/graphxml_parse.c                                                       \
@@ -142,7 +145,7 @@ COMMON_SRC=\
   gras/Msg/msg.c                      gras/Msg/rpc.c                       gras/Msg/timer.c                 \
   gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
   \
-  gras/Virtu/process.c
+  gras/Virtu/process.c gras/Virtu/gras_module.c
 
 RL_SRC= \
   gras/Transport/rl_transport.c          \
@@ -182,7 +185,7 @@ SG_SRC=  \
   gras/Msg/sg_msg.c
 
 AMOK_SRC= \
-  amok/base.c \
+  amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
   amok/PeerManagement/peermanagement.c
 
@@ -195,7 +198,7 @@ AMOK_SRC= \
 # are generated. Sorry about that.
 
 # If you add a test unit, you should regenerate simgrid_units_main.c from scratch:
-# rm -f simgrid_units_main.c *_unit.c ; make testall
+# make clean-units ; make testall
 
 # Suites and tests run in the given order.
 
@@ -234,10 +237,14 @@ config_unit.c: xbt/config.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
 simgrid_units_main.c: $(TEST_UNITS)
+	@top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c
+
+clean-units:
+	rm -f simgrid_units_main.c *_unit.c
 
 else
 
-$(TEST_UNITS) simgrid_units_main.c: 
+$(TEST_UNITS) simgrid_units_main.c clean-units: 
 	@echo "ERROR: Test units not generated."
 	@echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
 	@echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
@@ -261,14 +268,14 @@ xbt/graphxml.c: xbt/graphxml.l
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
-	set -e; mkdir -p surf; flexml -b 1000000 -P surfxml -S $@ -L $^
+	set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
-	set -e;                flexml            -P surfxml -H $@ -L $^
-	
+	set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
-	set -e; flexml -b 1000000 -P graphxml -S $@ -L $^
+	set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
 $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
-	set -e; flexml -P graphxml -H $@ -L $^
+	set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd