bugfix revealed by making maxmin_system private...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 581a820..18e4b3f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,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 \
@@ -62,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
 #                 | | |
@@ -149,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
@@ -186,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 \
@@ -303,6 +307,12 @@ libsmpi_la_LIBADD = libsimgrid.la
 libsmpi_la_SOURCES = $(SMPI_SRC)
 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