X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d85c5081d8db2930806f2495adee27d1dedcf0d6..0180bf201ee9730f75e6500d2cdc530f76d9df36:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4cebdc3f3f..f6b67794a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,13 @@ EXTRA_DIST= \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
+        xbt/graph_private.h \
+	xbt/graphxml_parse.c \
+	xbt/graphxml.l \
+	xbt/graphxml.c \
+	xbt/graphxml.dtd \
         xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
+	xbt/ex_interface.h \
         \
 	surf/maxmin_private.h \
 	surf/trace_mgr_private.h \
@@ -28,7 +34,7 @@ EXTRA_DIST= \
 	surf/cpu_private.h \
 	surf/workstation_private.h \
 	surf/surf_timer_private.h \
-	surf/surf_parse.c \
+	surf/surfxml_parse.c \
 	surf/surfxml.l \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
@@ -39,7 +45,7 @@ EXTRA_DIST= \
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
 	include/surf/surf.h \
-	include/surf/surf_parse_private.h \
+	include/surf/surfxml_parse_private.h \
 	\
 	include/xbt/xbt_portability.h \
 	include/xbt/context.h \
@@ -94,6 +100,7 @@ VERSION_INFO= -release 20050627 -version-info 0:0:0
 #   using this trick is ready for a "stable" release (say, in Debian).
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
+noinst_PROGRAMS=testall
 
 COMMON_SRC=\
   \
@@ -111,9 +118,14 @@ COMMON_SRC=\
   xbt/heap.c                                                                 \
   xbt/fifo.c                                                                 \
   xbt/swag.c                                                                 \
+  xbt/graph.c                                                                \
   xbt/set.c                                                                  \
+  xbt/xbt_matrix.c                                                           \
+  xbt/xbt_host.c                                                             \
   xbt/module.c                                                               \
   xbt/config.c                                                               \
+  xbt/cunit.c                                                                \
+  xbt/graphxml_parse.c                                                       \
   \
   gras/gras.c \
   \
@@ -125,14 +137,14 @@ COMMON_SRC=\
   gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
   gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h \
   \
-  gras/Msg/msg.c                      gras/Msg/timer.c                 \
+  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
 
 RL_SRC= \
-  gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c  \
-  gras/Transport/transport_plugin_buf.c \
+  gras/Transport/rl_transport.c          \
+  gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
   \
   gras/Virtu/rl_emul.c \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c \
@@ -146,7 +158,7 @@ SG_SRC=  \
   surf/maxmin.c                                                              \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
-  surf/surf_parse.c                                                          \
+  surf/surfxml_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \
@@ -166,10 +178,72 @@ SG_SRC=  \
 
 AMOK_SRC= \
   amok/base.c \
-  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
+  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
+  amok/HostManagement/hostmanagement.c
+
+###
+### Testing infrastructure
+###
+
+# Test files must be added both to the TEST_CFILES and TEST_UNITS because
+# if I compute TEST_UNITS from TEST_CFILES, automake fails to note that they
+# 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
+
+# Suites and tests run in the given order.
+
+TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
+            xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
+            xbt/config.c
+TEST_UNITS= cunit_unit.c ex_unit.c         \
+            dynar_unit.c dict_unit.c set_unit.c swag_unit.c \
+            config_unit.c
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
-              gras/DataDesc/ddt_parse.yy.c
+              ../include/xbt/graphxml.h xbt/graphxml.c \
+              gras/DataDesc/ddt_parse.yy.c \
+              $(TEST_UNITS) simgrid_units_main.c
+
+testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
+testall_LDADD=libgras.la
+TESTS=testall
+
+EXTRA_DIST+=$(testall_SOURCES)
+
+if MAINTAINER_MODE
+cunit_unit.c: xbt/cunit.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+ex_unit.c: xbt/ex.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+dynar_unit.c: xbt/dynar.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+dict_unit.c: xbt/dict.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+set_unit.c: xbt/set.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+swag_unit.c: xbt/swag.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+config_unit.c: xbt/config.c
+	@top_srcdir@/tools/sg_unit_extractor.pl $^
+
+simgrid_units_main.c: $(TEST_UNITS)
+
+else
+
+$(TEST_UNITS) simgrid_units_main.c: 
+	@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."
+	@exit 1
+
+endif
+
+###
+### Regenerate what needs to with flex & flexml
+###
+
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 	@LEX@ -o$@ -Pgras_ddt_parse_ $^
@@ -177,22 +251,37 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
 	@LEX@ -o$@ -Psurf_parse_ $^
+xbt/graphxml.c: xbt/graphxml.l
+	@LEX@ -o$@ -Pxbt_graph_parse_ $^
 
 if HAVE_FLEXML
 surf/surfxml.l: surf/surfxml.dtd
-	set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd
+	set -e; cd surf; flexml -b 1000000 -P surfxml -S -L surfxml.dtd
 ../include/surf/surfxml.h: surf/surfxml.dtd
-	cd ../include/surf; flexml -H -L ../../src/surf/surfxml.dtd
+	cd ../include/surf; flexml -P surfxml -H -L ../../src/surf/surfxml.dtd
+xbt/graphxml.l: xbt/graphxml.dtd
+	set -e; cd xbt; flexml -b 1000000 -P graphxml -S -L graphxml.dtd
+../include/xbt/graphxml.h: xbt/graphxml.dtd
+	cd ../include/xbt; flexml -P graphxml -H -L ../../src/xbt/graphxml.dtd
 else
 
 ../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
 	@echo "ERROR: src/surf/surfxml.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/include/surf/surfxml.h src/surf/surfxml.l"
+	@echo "ERROR:   touch include/surf/surfxml.h src/surf/surfxml.l"
+	@exit 1
+../include/xbt/graphxml.h xbt/graphxml.l: 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
 endif
 endif
 
+###
+### Declare the library content
+###
+
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
 libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
@@ -200,4 +289,5 @@ libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 
+
 include $(top_srcdir)/acmacro/dist-files.mk