Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add end line in msg_mailbox* files and add the file msg_mailbox.c in Makefile.am
[simgrid.git] / src / Makefile.in
index 6295b0a..239fc1b 100644 (file)
@@ -130,29 +130,28 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
        xbt/xbt_matrix.c xbt/xbt_queue.c xbt/xbt_peer.c xbt/xbt_main.c \
        xbt/config.c xbt/cunit.c xbt/graphxml_parse.c surf/maxmin.c \
        surf/fair_bottleneck.c surf/lagrange.c surf/trace_mgr.c \
-       surf/surf.c surf/surfxml_parse.c surf/cpu.c surf/network.c \
-       surf/workstation.c surf/surf_timer.c \
-       surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \
-       xbt/xbt_sg_stubs.c xbt/xbt_os_thread.c \
-       xbt/xbt_thread_context.c xbt/xbt_ucontext.c \
-       surf/gtnets/gtnets_simulator.cc surf/gtnets/gtnets_topology.cc \
-       surf/gtnets/gtnets_interface.cc surf/network_gtnets.c \
-       surf/sdp.c simix/smx_global.c simix/smx_deployment.c \
-       simix/smx_config.c simix/smx_environment.c simix/smx_host.c \
-       simix/smx_process.c simix/smx_action.c simix/smx_synchro.c \
-       xbt/xbt_context.c msg/msg_config.c msg/task.c msg/host.c \
-       msg/m_process.c msg/gos.c msg/global.c msg/environment.c \
-       msg/deployment.c simdag/sd_global.c simdag/sd_link.c \
-       simdag/sd_task.c simdag/sd_workstation.c gras/gras.c \
-       gras/Transport/transport.c gras/Transport/transport_private.h \
-       gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \
-       gras/Msg/gras_msg_exchange.c gras/Msg/gras_msg_listener.c \
-       gras/Msg/rpc.c gras/Msg/timer.c gras/Msg/msg_interface.h \
-       gras/Msg/msg_private.h gras/Virtu/process.c \
-       gras/Virtu/gras_module.c gras/DataDesc/ddt_create.c \
-       gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \
-       gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \
-       gras/DataDesc/datadesc_interface.h \
+       surf/random_mgr.c surf/surf.c surf/surfxml_parse.c surf/cpu.c \
+       surf/network.c surf/workstation.c surf/surf_timer.c \
+       surf/workstation_ptask_L07.c xbt/xbt_sg_stubs.c \
+       xbt/xbt_os_thread.c xbt/xbt_thread_context.c \
+       xbt/xbt_ucontext.c surf/gtnets/gtnets_simulator.cc \
+       surf/gtnets/gtnets_topology.cc surf/gtnets/gtnets_interface.cc \
+       surf/network_gtnets.c surf/sdp.c simix/smx_global.c \
+       simix/smx_deployment.c simix/smx_config.c \
+       simix/smx_environment.c simix/smx_host.c simix/smx_process.c \
+       simix/smx_action.c simix/smx_synchro.c xbt/xbt_context.c \
+       msg/msg_config.c msg/task.c msg/host.c msg/m_process.c \
+       msg/gos.c msg/global.c msg/environment.c msg/deployment.c \
+       simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \
+       simdag/sd_workstation.c gras/gras.c gras/Transport/transport.c \
+       gras/Transport/transport_private.h gras/Msg/gras_msg_mod.c \
+       gras/Msg/gras_msg_types.c gras/Msg/gras_msg_exchange.c \
+       gras/Msg/gras_msg_listener.c gras/Msg/rpc.c gras/Msg/timer.c \
+       gras/Msg/msg_interface.h gras/Msg/msg_private.h \
+       gras/Virtu/process.c gras/Virtu/gras_module.c \
+       gras/DataDesc/ddt_create.c gras/DataDesc/ddt_convert.c \
+       gras/DataDesc/ddt_exchange.c gras/DataDesc/cbps.c \
+       gras/DataDesc/datadesc.c gras/DataDesc/datadesc_interface.h \
        gras/DataDesc/datadesc_private.h gras/DataDesc/ddt_parse.c \
        gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \
        gras/Transport/sg_transport.c \
@@ -169,8 +168,8 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
 @CONTEXT_THREADS_TRUE@ xbt_thread_context.lo
 @CONTEXT_THREADS_FALSE@am__objects_7 = xbt_ucontext.lo
 am__objects_8 = maxmin.lo fair_bottleneck.lo lagrange.lo trace_mgr.lo \
-       surf.lo surfxml_parse.lo cpu.lo network.lo workstation.lo \
-       surf_timer.lo workstation_KCCFLN05.lo workstation_ptask_L07.lo \
+       random_mgr.lo surf.lo surfxml_parse.lo cpu.lo network.lo \
+       workstation.lo surf_timer.lo workstation_ptask_L07.lo \
        xbt_sg_stubs.lo $(am__objects_6) $(am__objects_7)
 am__objects_9 = gtnets_simulator.lo gtnets_topology.lo \
        gtnets_interface.lo network_gtnets.lo
@@ -323,6 +322,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
@@ -395,20 +395,20 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        xbt/dict_private.h xbt/heap_private.h xbt/fifo_private.h \
        xbt/graph_private.h xbt/graphxml_parse.c xbt/graphxml.l \
        xbt/graphxml.c xbt/graphxml.dtd xbt/xbt_context_private.h \
-       xbt/xbt_context_factory.h xbt/xbt_thread_context.h \
-       xbt/xbt_ucontext.h xbt/xbt_jcontext.h xbt/log_private.h \
+       xbt/xbt_context_factory.h xbt/xbt_jcontext.h xbt/log_private.h \
        xbt/ex_interface.h surf/maxmin_private.h \
        surf/trace_mgr_private.h surf/surf_private.h \
        surf/cpu_private.h surf/workstation_private.h \
-       surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \
-       surf/surfxml.c surf/surfxml.dtd surf/network_private.h \
-       surf/network_gtnets_private.h include/surf/maxmin.h \
-       include/surf/trace_mgr.h include/surf/surf.h \
-       include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \
-       include/xbt/xbt_os_thread.h msg/private.h simdag/private.h \
-       gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_rl.h \
-       gras/Virtu/virtu_sg.h gras/Virtu/virtu_interface.h \
-       gras/Virtu/virtu_private.h \
+       surf/surf_timer_private.h surf/surfxml_parse.c \
+       surf/simgrid_dtd.l surf/simgrid_dtd.c surf/simgrid.dtd \
+       surf/network_private.h surf/network_gtnets_private.h \
+       include/surf/maxmin.h include/surf/trace_mgr.h \
+       include/surf/surf.h include/surf/surfxml_parse_private.h \
+       include/surf/random_mgr.h include/xbt/context.h \
+       include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \
+       msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \
+       gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \
+       gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h \
        gras/Transport/transport_interface.h \
        amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
        include/simix/simix.h include/simix/datatypes.h \
@@ -497,10 +497,11 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC = surf/maxmin.c surf/fair_bottleneck.c surf/lagrange.c \
-       surf/trace_mgr.c surf/surf.c surf/surfxml_parse.c surf/cpu.c \
-       surf/network.c surf/workstation.c surf/surf_timer.c \
-       surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \
-       xbt/xbt_sg_stubs.c $(am__append_1) $(am__append_2)
+       surf/trace_mgr.c surf/random_mgr.c surf/surf.c \
+       surf/surfxml_parse.c surf/cpu.c surf/network.c \
+       surf/workstation.c surf/surf_timer.c \
+       surf/workstation_ptask_L07.c xbt/xbt_sg_stubs.c \
+       $(am__append_1) $(am__append_2)
 GTNETS_SRC = \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -634,7 +635,7 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \
 @GRAMINE_MODE_FALSE@       @builddir@/xbt_str_unit.c \
 @GRAMINE_MODE_FALSE@            @builddir@/config_unit.c 
 
-@GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \
+@GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
 @GRAMINE_MODE_FALSE@              ../include/xbt/graphxml.h xbt/graphxml.c \
 @GRAMINE_MODE_FALSE@              gras/DataDesc/ddt_parse.yy.c \
 @GRAMINE_MODE_FALSE@         $(TEST_UNITS) @builddir@/simgrid_units_main.c
@@ -824,6 +825,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_gtnets.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peermanagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_mgr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_dns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_emul.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_msg.Plo@am__quote@
@@ -874,7 +876,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport_plugin_sg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport_plugin_tcp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_KCCFLN05.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_ptask_L07.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_context.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_jcontext.Plo@am__quote@
@@ -1375,6 +1376,13 @@ trace_mgr.lo: surf/trace_mgr.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trace_mgr.lo `test -f 'surf/trace_mgr.c' || echo '$(srcdir)/'`surf/trace_mgr.c
 
+random_mgr.lo: surf/random_mgr.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random_mgr.lo -MD -MP -MF $(DEPDIR)/random_mgr.Tpo -c -o random_mgr.lo `test -f 'surf/random_mgr.c' || echo '$(srcdir)/'`surf/random_mgr.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/random_mgr.Tpo $(DEPDIR)/random_mgr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/random_mgr.c' object='random_mgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random_mgr.lo `test -f 'surf/random_mgr.c' || echo '$(srcdir)/'`surf/random_mgr.c
+
 surf.lo: surf/surf.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT surf.lo -MD -MP -MF $(DEPDIR)/surf.Tpo -c -o surf.lo `test -f 'surf/surf.c' || echo '$(srcdir)/'`surf/surf.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/surf.Tpo $(DEPDIR)/surf.Plo
@@ -1417,13 +1425,6 @@ surf_timer.lo: surf/surf_timer.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o surf_timer.lo `test -f 'surf/surf_timer.c' || echo '$(srcdir)/'`surf/surf_timer.c
 
-workstation_KCCFLN05.lo: surf/workstation_KCCFLN05.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workstation_KCCFLN05.lo -MD -MP -MF $(DEPDIR)/workstation_KCCFLN05.Tpo -c -o workstation_KCCFLN05.lo `test -f 'surf/workstation_KCCFLN05.c' || echo '$(srcdir)/'`surf/workstation_KCCFLN05.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/workstation_KCCFLN05.Tpo $(DEPDIR)/workstation_KCCFLN05.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/workstation_KCCFLN05.c' object='workstation_KCCFLN05.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workstation_KCCFLN05.lo `test -f 'surf/workstation_KCCFLN05.c' || echo '$(srcdir)/'`surf/workstation_KCCFLN05.c
-
 workstation_ptask_L07.lo: surf/workstation_ptask_L07.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workstation_ptask_L07.lo -MD -MP -MF $(DEPDIR)/workstation_ptask_L07.Tpo -c -o workstation_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/workstation_ptask_L07.Tpo $(DEPDIR)/workstation_ptask_L07.Plo
@@ -2227,11 +2228,11 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @HAVE_JAVA_TRUE@clean-local:
 @HAVE_JAVA_TRUE@       -rm -rf .classes
 
-@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd
+@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
 @HAVE_JAVA_TRUE@       [ -e .classes ] || mkdir .classes
 @HAVE_JAVA_TRUE@       $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
 @HAVE_JAVA_TRUE@       [ -e .classes/surf ] || mkdir .classes/surf
-@HAVE_JAVA_TRUE@       cp $(srcdir)/surf/surfxml.dtd .classes/surf
+@HAVE_JAVA_TRUE@       cp $(srcdir)/surf/simgrid.dtd .classes/surf
 @HAVE_JAVA_TRUE@       $(JAR) cvf simgrid.jar -C .classes .
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c
@@ -2278,17 +2279,18 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @GRAMINE_MODE_FALSE@gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 @GRAMINE_MODE_FALSE@   set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^
 
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/surfxml.c: surf/surfxml.l
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/simgrid_dtd.c: surf/simgrid_dtd.l
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     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 $@
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@xbt/graphxml.c: xbt/graphxml.l
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     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 $@
 
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e;                flexml --root-tags platform            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ 
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e;                flexml --root-tags platform            -P surfxml --sysid=simgrid.dtd -H $@ -L $^ 
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   mv $(top_srcdir)/include/surf/simgrid.h $@
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 
@@ -2299,10 +2301,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR: src/surf/simgrid.dtd was modified, but the flexml program was not detected"
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR:   touch include/surf/surfxml.h src/surf/surfxml.l"
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR:   touch include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l"
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @exit 1
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR: src/xbt/graphxml.dtd was modified, but the flexml program was not detected"