Adding a stub for the graph library.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a840e16..694c96a 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 \
@@ -112,6 +113,7 @@ COMMON_SRC=\
   xbt/heap.c                                                                 \
   xbt/fifo.c                                                                 \
   xbt/swag.c                                                                 \
+  xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/module.c                                                               \
   xbt/config.c                                                               \
@@ -174,8 +176,21 @@ AMOK_SRC= \
 ### Testing infrastructure
 ###
 
-TEST_CFILES=xbt/cunit.c  xbt/ex.c  xbt/config.c
-TEST_UNITS= cunit_unit.c ex_unit.c config_unit.c
+# 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 \
@@ -183,21 +198,36 @@ BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
 
 testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
 testall_LDADD=libgras.la
+TESTS=testall
 
+EXTRA_DIST+=$(testall_SOURCES)
+         
 if MAINTAINER_MODE
-%_unit.c: $(TEST_CFILES) @top_srcdir@/tools/sg_unit_extractor.pl
-       @echo TEST_UNITS=$(TEST_UNITS)
-       @echo testall_SOURCES=$(testall_SOURCES)
-       @lookfor=`echo $@ | sed 's/_unit.c$$/.c/'`;      \
-        for s in $(TEST_CFILES) ; do                    \
-           if echo $$s | grep $$lookfor >/dev/null; then \
-             src="$$src $$s";                            \
-           fi;                                           \
-          done;                                          \
-         echo "Generate Testing Suite $@ from$$src";    \
-         @top_srcdir@/tools/sg_unit_extractor.pl $$src
+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
 
 ###