X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c9feb6ee162497152386c3b5d193a500604e414..8961684b8ad3a24b5d940510fb65dd650753ac41:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 788309d6db..a1545d4e50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,7 +153,7 @@ XBT_SRC=\
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
   \
-  xbt/xbt_queue.c                                                            \
+  xbt/xbt_queue.c  xbt/xbt_synchro.c                                         \
   \
   xbt/xbt_peer.c                                                             \
   \
@@ -391,12 +391,12 @@ else
 noinst_PROGRAMS=testall
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
-	    xbt/xbt_str.c  xbt/xbt_sha.c                \
-            xbt/config.c 
+	    xbt/xbt_str.c  xbt/xbt_strbuff.c xbt/xbt_sha.c                \
+            xbt/config.c xbt/xbt_synchro.c
 TEST_UNITS= @builddir@/cunit_unit.c   @builddir@/ex_unit.c         \
             @builddir@/dynar_unit.c   @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
 	    @builddir@/xbt_str_unit.c @builddir@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\
-            @builddir@/config_unit.c 
+            @builddir@/config_unit.c  @builddir@/xbt_synchro_unit.c
 
 BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
               ../include/xbt/graphxml.h xbt/graphxml.c \
@@ -414,8 +414,7 @@ EXTRA_DIST+=$(testall_SOURCES)
 if MAINTAINER_MODE
 CLEANFILES=$(TEST_UNITS)
 
-$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\
-               xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c
+$(TEST_UNITS): $(TEST_CFILES)
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
 @builddir@/simgrid_units_main.c: $(TEST_UNITS)
@@ -480,9 +479,10 @@ $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
 	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 
 simdag/dax_dtd.l: simdag/dax.dtd
-	set -e; flexml -b 1000000 -P dax_ --sysid=dax.dtd -S $@ -L $^
+	set -e; flexml -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S $@ -L $^
+	sed -i 's/SET(DOCTYPE)/SET(ROOT_dax__adag)/' simdag/dax_dtd.l # DOCTYPE not mandatory
 simdag/dax_dtd.h: simdag/dax.dtd
-	set -e; flexml            -P dax_ --sysid=dax.dtd -H $@ -L $^
+	set -e; flexml            --root-tags adag -P dax_ --sysid=dax.dtd -H $@ -L $^
 	sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 else