mv surf_parse -> surfxml_parse

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 09ca7f5..bc304b4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST= \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
+        xbt/graph_private.h \
         xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
         \
        surf/maxmin_private.h \
@@ -28,7 +29,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 +40,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 +95,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,10 +113,11 @@ COMMON_SRC=\
   xbt/heap.c                                                                 \
   xbt/fifo.c                                                                 \
   xbt/swag.c                                                                 \
+  xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/module.c                                                               \
   xbt/config.c                                                               \
-  xbt/testsuite.c                                                            \
+  xbt/cunit.c                                                                \
   \
   gras/gras.c \
   \
@@ -147,7 +150,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                                                       \
@@ -169,8 +172,68 @@ AMOK_SRC= \
   amok/base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.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
+              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_ $^
@@ -194,6 +257,10 @@ else
 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 
 
@@ -201,4 +268,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