Ok, I'm a lammer, and I cannot get the rule from an unit to its mother file right...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1809 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/Makefile.am b/src/Makefile.am
index a840e16..664265c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,8 +174,21 @@ AMOK_SRC= \
 ### Testing infrastructure
 ###
 
 ### 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/set.c                      \
+            xbt/config.c
+TEST_UNITS= cunit_unit.c ex_unit.c         \
+            set_unit.c                     \
+            config_unit.c

 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               gras/DataDesc/ddt_parse.yy.c \
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               gras/DataDesc/ddt_parse.yy.c \


@@ -184,18 +197,28 @@ BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
 testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
 testall_LDADD=libgras.la
 
 testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
 testall_LDADD=libgras.la
 

+EXTRA_DIST+=$(testall_SOURCES)
+
+# %_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";    
+         

 if MAINTAINER_MODE
 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 $^
+set_unit.c:   xbt/set.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)
 endif
 
 simgrid_units_main.c: $(TEST_UNITS)
 endif