Reintroduce a more robust hack here

[simgrid.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 3f5b683..f368a30 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -398,19 +398,21 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        xbt/graphxml.c xbt/graphxml.dtd xbt/xbt_context_private.h \
        xbt/xbt_context_factory.h xbt/xbt_jcontext.h xbt/log_private.h \
        xbt/ex_interface.h xbt/backtrace_linux.c \
-       xbt/backtrace_windows.c 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/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 \
+       xbt/backtrace_windows.c xbt/backtrace_dummy.c \
+       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/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/wine_dbghelp.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 \
+       msg/private.h msg/mailbox.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 \
@@ -617,6 +619,7 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
        $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) $(am__append_8)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ \
        @LD_DYNAMIC_FLAGS@ -lm $(am__append_6)
+# -Wl,--entry -Wl,simgrid_version
 
 # Please do not add -no-undefined to libsmpi_la_LDFLAGS:
 # smpi_simulated_main is indeed defined in user code, and undef in the
@@ -2299,8 +2302,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @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@   rm -f $(top_srcdir)/include/surf/simgrid.h 
 @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@   if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi
 @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 $@