X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4356939afce9a4e0edb2c7f0e6b273e5f553f0b..427a367b3a89a64dbf91a0469841a717e4c604be:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a1b316291e..18e4b3f151 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,15 @@
-#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
 INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+
+bin_SCRIPTS= smpi/smpicc smpi/smpirun
+
 EXTRA_DIST= \
         \
 	portable.h \
@@ -41,8 +38,7 @@ EXTRA_DIST= \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
-	surf/network_dassf_private.h \
-	surf/workstation_KCCFLN05_private.h \
+	network_gtnets_private.h \
 	\
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
@@ -65,7 +61,7 @@ EXTRA_DIST= \
 	include/simix/simix.h include/simix/datatypes.h \
 	simix/msg_simix_private.h \
 	\
-	smpi/private.h smpi/smpi.h
+	smpi/private.h
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -152,14 +148,14 @@ XBT_SG_SRC = \
 
 SURF_SRC= \
   surf/maxmin.c                                                              \
+  surf/fair_bottleneck.c                                                              \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   surf/surf_timer.c                                                          \
-  surf/network_dassf.c                                                       \
-  surf/workstation_KCCFLN05.c
+  surf/workstation_KCCFLN05.c   surf/workstation_ptask_L07.c
 
 if CONTEXT_THREADS
   SURF_SRC += xbt/xbt_os_thread.c
@@ -189,7 +185,12 @@ SIMIX_SRC= \
 
 SMPI_SRC= \
   smpi/smpi_base.c \
-  smpi/smpi_mpi.c
+  smpi/smpi_bench.c \
+  smpi/smpi_global.c \
+  smpi/smpi_mpi.c \
+  smpi/smpi_sender.c \
+  smpi/smpi_receiver.c \
+  smpi/smpi_util.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -304,8 +305,14 @@ 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
 
+# Windows users (at least, MSVC ones) need a def file.
+if IS_WINDOWS
+libgras_la_LDFLAGS    += -Wl,--output-def,libgras.def
+libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def
+libsmpi_la_LDFLAGS    += -Wl,--output-def,libsmpi.def
+endif
 
 ##
 ## Java cruft
@@ -358,10 +365,12 @@ 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 
+              gras/DataDesc/ddt_parse.yy.c \
+	      $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
 testall_SOURCES= $(TEST_UNITS) @builddir@/simgrid_units_main.c
 testall_LDADD=libgras.la
@@ -392,8 +401,12 @@ if MAINTAINER_MODE
 	@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: 
@@ -423,11 +436,16 @@ surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
 	set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
 	set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+	sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
+	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
+
 
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 	set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
 $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
 	set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
+	sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
+	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd