X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1b86374a5c9d3f40f72910eaa68ad5ff7bd5a93..3880d9bc954cf5d4c6a623c0b7239a1a147ac483:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7792566b0b..ca6aac1353 100644
--- 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 \
@@ -48,6 +49,7 @@ EXTRA_DIST= \
 	surf/simgrid_dtd.c \
 	surf/simgrid.dtd \
 	surf/network_private.h \
+	surf/network_common.h \
 	surf/network_gtnets_private.h \
 	\
 	include/surf/maxmin.h \
@@ -56,11 +58,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 \
 	\
@@ -169,7 +173,7 @@ SURF_SRC= \
   surf/random_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf_timer.c                                                          \
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
@@ -211,7 +215,7 @@ SMPI_SRC= \
 
 MSG_SRC=  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 msg_mailbox.c
+  msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
 
 JMSG_C_SRC = \
   xbt/xbt_jcontext.c \
@@ -320,6 +324,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 +466,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 $@