X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a49f9d2a3af185725e3fa3ee91803b6c76b38aa..69be1c2723a8ae01343cf1faba67091c49eff197:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ea11934d5..5d69dfae4a 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,7 +38,7 @@ EXTRA_DIST= \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
-	surf/network_dassf_private.h \
+	network_gtnets_private.h \
 	surf/workstation_KCCFLN05_private.h \
 	\
 	include/surf/maxmin.h \
@@ -152,14 +149,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
@@ -429,11 +426,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