X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d31ded41b278226dc70b269dc7af66588e6474e..b986ec78724f4f5d259947d66ef6a184079f384a:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index baca6a5d3b..2bc7af4da9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -163,6 +163,8 @@ SURF_SRC= \
 
 if CONTEXT_THREADS
   SURF_SRC += xbt/xbt_os_thread.c
+else  
+  SURF_SRC += xbt/xbt_os_thread_stubs.c
 endif
 
 GTNETS_SRC= \
@@ -297,9 +299,13 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
 			$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
+# Please do not add -no-undefined to libsmpi_la_LDFLAGS:
+# smpi_simulated_main is indeed defined in user code, and undef in the
+# library (no idea why it works under linux, but it fails under windows)
 libsmpi_la_LIBADD = libsimgrid.la
 libsmpi_la_SOURCES = $(SMPI_SRC)
-libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+
 
 ##
 ## Java cruft