X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1eb32ca7e4d755fec407842b7c879499e2034136..c803c90c02e18898f00775f8d8068635b24a6d10:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 96f1f215aa..712816dd96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,8 @@
-#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
@@ -144,11 +138,11 @@ XBT_SRC=\
   xbt/graphxml_parse.c
 
 XBT_RL_SRC = \
-  xbt/xbt_rl_synchro.c																											 \
-	xbt/xbt_rl_time.c
+  xbt/xbt_rl_synchro.c		\
+  xbt/xbt_rl_time.c
 XBT_SG_SRC = \
-  xbt/xbt_sg_synchro.c																											 \
-	xbt/xbt_sg_time.c
+  xbt/xbt_sg_synchro.c		\
+  xbt/xbt_sg_time.c     
 
 SURF_SRC= \
   surf/maxmin.c                                                              \
@@ -161,6 +155,12 @@ SURF_SRC= \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c
 
+if CONTEXT_THREADS
+  SURF_SRC += xbt/xbt_os_thread.c
+else  
+  SURF_SRC += xbt/xbt_os_thread_stubs.c
+endif
+
 GTNETS_SRC= \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -169,7 +169,7 @@ GTNETS_SRC= \
 
 # Separated because we don't want it in libsimgrid4java
 CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -285,7 +285,7 @@ endif
 lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
 
 libgras_la_SOURCES=  $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO)                     @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                         $(SIMIX_SRC) $(CTX_SRC) \
@@ -293,10 +293,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) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+
 
 ##
 ## Java cruft
@@ -345,17 +348,18 @@ TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
 	    xbt/xbt_str.c                      \
             xbt/config.c 
-TEST_UNITS= ./cunit_unit.c ./ex_unit.c         \
-            ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
-	    ./xbt_str_unit.c \
-            ./config_unit.c 
+TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c         \
+            @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
+	    @builddir@/xbt_str_unit.c \
+            @builddir@/config_unit.c 
+CLEANFILES=$(TEST_UNITS)
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               ../include/xbt/graphxml.h xbt/graphxml.c \
               gras/DataDesc/ddt_parse.yy.c \
-              $(TEST_UNITS) simgrid_units_main.c
+	      $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
-testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
+testall_SOURCES= $(TEST_UNITS) @builddir@/simgrid_units_main.c
 testall_LDADD=libgras.la
 TESTS=testall
 TESTS_ENVIRONMENT=$(SG_TEST_EXENV)
@@ -363,29 +367,33 @@ TESTS_ENVIRONMENT=$(SG_TEST_EXENV)
 EXTRA_DIST+=$(testall_SOURCES)
 
 if MAINTAINER_MODE
-./cunit_unit.c: xbt/cunit.c
+@builddir@/cunit_unit.c: xbt/cunit.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./ex_unit.c: xbt/ex.c
+@builddir@/ex_unit.c: xbt/ex.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./xbt_str_unit.c: xbt/xbt_str.c
+@builddir@/xbt_str_unit.c: xbt/xbt_str.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./dynar_unit.c: xbt/dynar.c
+@builddir@/dynar_unit.c: xbt/dynar.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./dict_unit.c: xbt/dict.c
+@builddir@/dict_unit.c: xbt/dict.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./set_unit.c: xbt/set.c
+@builddir@/set_unit.c: xbt/set.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./swag_unit.c: xbt/swag.c
+@builddir@/swag_unit.c: xbt/swag.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-./config_unit.c: xbt/config.c
+@builddir@/config_unit.c: xbt/config.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
-simgrid_units_main.c: $(TEST_UNITS)
-	@top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c
+@builddir@/simgrid_units_main.c: $(TEST_UNITS)
+	@top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c
 
 clean-units:
-	rm -f simgrid_units_main.c *_unit.c
-
+	rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c
+	for n in $(TEST_UNITS) ; do \
+	  dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \
+          echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \
+	  rm -vf $$dep @srcdir@/$$dep; touch $$dep; \
+        done
 else
 
 $(TEST_UNITS) simgrid_units_main.c clean-units: