actually, when --enable-maintainer-mode is on, we can remove these files on regular...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index baca6a5..89e0a3d 100644 (file)
--- 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
@@ -348,17 +354,17 @@ 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
+              gras/DataDesc/ddt_parse.yy.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)
@@ -366,25 +372,25 @@ 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