Reintroduce a more robust hack here

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c321a1c..82d9103 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST= \
         xbt/xbt_jcontext.h \
        xbt/log_private.h \
        xbt/ex_interface.h \
+        xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
         \
        surf/maxmin_private.h \
        surf/trace_mgr_private.h \
@@ -56,11 +57,13 @@ EXTRA_DIST= \
        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 \
+       msg/mailbox.h \
        \
        simdag/private.h \
        \
@@ -320,6 +323,7 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                         $(MSG_SRC) $(SIMDAG_SRC) \
                        $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+# -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
@@ -461,8 +465,9 @@ if HAVE_FLEXML
 surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
        set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ 
 $(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd
+       rm -f $(top_srcdir)/include/surf/simgrid.h 
        set -e;                flexml --root-tags platform            -P surfxml --sysid=simgrid.dtd -H $@ -L $^ 
-       mv $(top_srcdir)/include/surf/simgrid.h $@
+       if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
        sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@