X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9d3268549bd00e5c641db00d49c5b8f120986439..b910008f9eefbbda9a78325b3edfd3f980081240:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 664265cb33..479ea05ea8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -184,10 +184,10 @@ AMOK_SRC= \
 # Suites and tests run in the given order.
 
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
-            xbt/set.c                      \
+            xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
             xbt/config.c
 TEST_UNITS= cunit_unit.c ex_unit.c         \
-            set_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 \
@@ -196,31 +196,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)
-
-# %_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
 cunit_unit.c: xbt/cunit.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-ex_unit.c:    xbt/ex.c
+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
+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
 
 ###