A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
used host user data to store global index values and remove some clunky
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
5ea268c
..
2d6a211
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-38,7
+38,7
@@
EXTRA_DIST= \
surf/surfxml.c \
surf/surfxml.dtd \
surf/network_private.h \
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 \
surf/workstation_KCCFLN05_private.h \
\
include/surf/maxmin.h \
@@
-62,7
+62,7
@@
EXTRA_DIST= \
include/simix/simix.h include/simix/datatypes.h \
simix/msg_simix_private.h \
\
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
# | | |
#LIBRARY_VERSION= 0:0:0
# | | |
@@
-156,7
+156,6
@@
SURF_SRC= \
surf/surfxml_parse.c \
surf/cpu.c surf/network.c surf/workstation.c \
surf/surf_timer.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_ptask_L07.c
if CONTEXT_THREADS
surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c
if CONTEXT_THREADS
@@
-187,7
+186,12
@@
SIMIX_SRC= \
SMPI_SRC= \
smpi/smpi_base.c \
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 \
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@
-304,6
+308,12
@@
libsmpi_la_LIBADD = libsimgrid.la
libsmpi_la_SOURCES = $(SMPI_SRC)
libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
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
##
## Java cruft