Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Bug fix.
[simgrid.git] / src / Makefile.in
index cefabcb..9e8b64b 100644 (file)
 
 @SET_MAKE@
 
+#AM_CFLAGS= -DNDEBUG 
+
+# -DNLOG   cuts absolutely all logs at compilation time.
+# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels.
+
 # Makefile chunk which allows to display the files which should be included
 # into the distribution.
 
@@ -21,6 +26,7 @@
 
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -73,7 +79,8 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(jardir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(jardir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgras_la_LIBADD =
@@ -111,28 +118,29 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
        xbt/heap.c xbt/fifo.c xbt/swag.c xbt/graph.c xbt/set.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/lagrange.c surf/trace_mgr.c surf/surf.c \
-       surf/surfxml_parse.c surf/cpu.c surf/network.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/network_dassf.c \
-       surf/workstation_KCCFLN05.c xbt/xbt_os_thread.c \
-       xbt/xbt_os_thread_stubs.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/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/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \
+       xbt/xbt_os_thread.c xbt/xbt_os_thread_stubs.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/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 \
@@ -143,10 +151,10 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
        amok/PeerManagement/peermanagement.c
 @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo
 @CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo
-am__objects_8 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \
-       surfxml_parse.lo cpu.lo network.lo workstation.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 network_dassf.lo workstation_KCCFLN05.lo \
-       $(am__objects_6) $(am__objects_7)
+       workstation_ptask_L07.lo $(am__objects_6) $(am__objects_7)
 am__objects_9 = gtnets_simulator.lo gtnets_topology.lo \
        gtnets_interface.lo network_gtnets.lo
 @HAVE_GTNETS_TRUE@am__objects_10 = $(am__objects_9)
@@ -179,17 +187,17 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
        xbt/heap.c xbt/fifo.c xbt/swag.c xbt/graph.c xbt/set.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/lagrange.c surf/trace_mgr.c surf/surf.c \
-       surf/surfxml_parse.c surf/cpu.c surf/network.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/network_dassf.c \
-       surf/workstation_KCCFLN05.c xbt/xbt_os_thread.c \
-       xbt/xbt_os_thread_stubs.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 java/jxbt_context.c \
-       java/jxbt_context.h java/jxbt_utilities.c \
+       surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \
+       xbt/xbt_os_thread.c xbt/xbt_os_thread_stubs.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 \
+       java/jxbt_context.c java/jxbt_context.h java/jxbt_utilities.c \
        java/jxbt_utilities.h java/jmsg.c java/jmsg.h \
        java/jmsg_channel.c java/jmsg_channel.h java/jmsg_host.c \
        java/jmsg_host.h java/jmsg_parallel_task.c \
@@ -251,6 +259,8 @@ am__testall_SOURCES_DIST = @builddir@/cunit_unit.c \
 @GRAMINE_MODE_FALSE@   simgrid_units_main.$(OBJEXT)
 testall_OBJECTS = $(am_testall_OBJECTS)
 @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -353,7 +363,6 @@ 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@
@@ -419,20 +428,9 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#AM_CPPFLAGS=
-AM_CFLAGS = -g
-#AM_CFLAGS= -DNDEBUG 
-
-# -DNLOG   cuts absolutely all logs at compilation time.
-# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels.
-
-# -g -ffast-math -funroll-loops -O3 -fno-strict-aliasing
-# Those should be added by configure when using gcc
-# fast-math is nasty when using IEEE floating point semantic
-# strict-aliasing breaks my type-punning bad habit.
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+bin_SCRIPTS = smpi/smpicc smpi/smpirun
 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 \
@@ -534,10 +532,11 @@ XBT_SG_SRC = \
   xbt/xbt_sg_synchro.c         \
   xbt/xbt_sg_time.c     
 
-SURF_SRC = surf/maxmin.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/network_dassf.c \
-       surf/workstation_KCCFLN05.c $(am__append_1) $(am__append_2)
+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/network_dassf.c surf/workstation_KCCFLN05.c \
+       surf/workstation_ptask_L07.c $(am__append_1) $(am__append_2)
 GTNETS_SRC = \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -776,6 +775,25 @@ clean-noinstPROGRAMS:
 testall$(EXEEXT): $(testall_OBJECTS) $(testall_DEPENDENCIES) 
        @rm -f testall$(EXEEXT)
        $(LINK) $(testall_OBJECTS) $(testall_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         if test -f $$d$$p; then \
+           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+           echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-binSCRIPTS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
+       done
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -810,6 +828,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex_unit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fair_bottleneck.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gos.Plo@am__quote@
@@ -891,6 +910,7 @@ distclean-compile:
 @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_log_appender_file.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_simple.Plo@am__quote@
@@ -1357,6 +1377,13 @@ maxmin.lo: surf/maxmin.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 maxmin.lo `test -f 'surf/maxmin.c' || echo '$(srcdir)/'`surf/maxmin.c
 
+fair_bottleneck.lo: surf/fair_bottleneck.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fair_bottleneck.lo -MD -MP -MF $(DEPDIR)/fair_bottleneck.Tpo -c -o fair_bottleneck.lo `test -f 'surf/fair_bottleneck.c' || echo '$(srcdir)/'`surf/fair_bottleneck.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/fair_bottleneck.Tpo $(DEPDIR)/fair_bottleneck.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/fair_bottleneck.c' object='fair_bottleneck.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 fair_bottleneck.lo `test -f 'surf/fair_bottleneck.c' || echo '$(srcdir)/'`surf/fair_bottleneck.c
+
 lagrange.lo: surf/lagrange.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lagrange.lo -MD -MP -MF $(DEPDIR)/lagrange.Tpo -c -o lagrange.lo `test -f 'surf/lagrange.c' || echo '$(srcdir)/'`surf/lagrange.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/lagrange.Tpo $(DEPDIR)/lagrange.Plo
@@ -1427,6 +1454,13 @@ workstation_KCCFLN05.lo: surf/workstation_KCCFLN05.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 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
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/workstation_ptask_L07.c' object='workstation_ptask_L07.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_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.c
+
 xbt_os_thread_stubs.lo: xbt/xbt_os_thread_stubs.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_thread_stubs.lo -MD -MP -MF $(DEPDIR)/xbt_os_thread_stubs.Tpo -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_os_thread_stubs.Tpo $(DEPDIR)/xbt_os_thread_stubs.Plo
@@ -2063,9 +2097,10 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) gras_config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+               gras_config.h
 installdirs:
-       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(jardir)"; do \
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jardir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -2122,7 +2157,7 @@ install-data-am: install-jarDATA
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -2154,7 +2189,8 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
+       uninstall-libLTLIBRARIES
 
 .MAKE: install-am install-strip
 
@@ -2163,15 +2199,16 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
        clean-noinstPROGRAMS ctags distclean distclean-compile \
        distclean-generic distclean-hdr distclean-libtool \
        distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-jarDATA \
-       install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am uninstall-jarDATA \
+       install install-am install-binSCRIPTS install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-jarDATA install-libLTLIBRARIES \
+       install-man install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am uninstall-binSCRIPTS uninstall-jarDATA \
        uninstall-libLTLIBRARIES
 
        \
@@ -2238,11 +2275,15 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; mkdir -p surf; flexml -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            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+@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_TRUE@@MAINTAINER_MODE_TRUE@xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
+@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"