X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a4e264744a18d8953c3bd5e4a1df05f5d6088b9..b61fd75d5de007848291c118e37bfe6aa3aa3fa9:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 32c5006278..a1545d4e50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ EXTRA_DIST= \
 	msg/mailbox.h \
 	\
 	simdag/private.h \
+	simdag/dax.dtd \
 	\
 	gras/DataDesc/ddt_parse.yy.l \
 	gras/Virtu/virtu_rl.h \
@@ -152,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                                                             \
   \
@@ -260,7 +261,8 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/Sem.java
 
 
-SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
+SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c \
+  simdag/sd_daxloader.c
 
 GRAS_COMMON_SRC= \
   gras/gras.c  \
@@ -389,15 +391,16 @@ 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 \
+              simdag/dax_dtd.h simdag/dax_dtd.c \
               gras/DataDesc/ddt_parse.yy.c \
 	      $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
@@ -411,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)
@@ -455,6 +457,9 @@ surf/simgrid_dtd.c: surf/simgrid_dtd.l
 xbt/graphxml.c: xbt/graphxml.l
 	set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
 	sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
+simdag/dax_dtd.c: simdag/dax_dtd.l
+	set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pdax_ --noline $^
+	sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
 
 if HAVE_FLEXML
 surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
@@ -472,6 +477,14 @@ $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
 	set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
 	sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
+
+simdag/dax_dtd.l: simdag/dax.dtd
+	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            --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
 
 $(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd
@@ -484,6 +497,11 @@ $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graph
 	@echo "ERROR: Please install it, or if you didn't modify this file, try this:"
 	@echo "ERROR:   touch include/xbt/graphxml.h src/xbt/graphxml.l"
 	@exit 1
+simdag/dax_dtd.h simdag/dax_dtd.l: simdag/dax_dtd.dtd
+	@echo "ERROR: src/simdag/dax.dtd was modified, but the flexml program was not detected"
+	@echo "ERROR: Please install it, or if you didn't modify this file, try this:"
+	@echo "ERROR:   touch src/simdag/dax_dtd.h src/simdag/dax_dtd.l"
+	@exit 1
 endif
 endif
 endif