added SMPI_DEP to configure.ac and src/Makefile.am

[simgrid.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index b0400d9..cefabcb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -353,9 +353,11 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
+SMPI_DEP = @SMPI_DEP@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING = @WARNING@
@@ -647,7 +649,7 @@ libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_
 # 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 = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 @HAVE_JAVA_TRUE@libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
 @HAVE_JAVA_TRUE@                             $(SIMIX_SRC) $(JCTX_SRC) \
 @HAVE_JAVA_TRUE@                             $(JMSG_C_SRC) $(MSG_SRC) \
@@ -670,7 +672,8 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
 @GRAMINE_MODE_FALSE@CLEANFILES = $(TEST_UNITS)
 @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \
 @GRAMINE_MODE_FALSE@              ../include/xbt/graphxml.h xbt/graphxml.c \
-@GRAMINE_MODE_FALSE@              gras/DataDesc/ddt_parse.yy.c 
+@GRAMINE_MODE_FALSE@              gras/DataDesc/ddt_parse.yy.c \
+@GRAMINE_MODE_FALSE@         $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
 @GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c
 @GRAMINE_MODE_FALSE@testall_LDADD = libgras.la
@@ -2206,7 +2209,12 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     @top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@clean-units:
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     rm -f simgrid_units_main.c *_unit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     for n in $(TEST_UNITS) ; do \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@       dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@          echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@       rm -vf $$dep @srcdir@/$$dep; touch $$dep; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@        done
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@    @echo "ERROR: Test units not generated."