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
Stop C file inclusion madness and do include the files in the libraries the proper...
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
3f2bc94
..
baca6a5
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,5
@@
-AM_CFLAGS+= -g @GTNETS_CFLAGS@
+#AM_CPPFLAGS=
+AM_CFLAGS= -g
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
@@
-56,11
+57,15
@@
EXTRA_DIST= \
\
simdag/private.h \
\
\
simdag/private.h \
\
+ gras/DataDesc/ddt_parse.yy.l \
+ gras/Virtu/virtu_interface.h \
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
\
include/simix/simix.h include/simix/datatypes.h \
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
\
include/simix/simix.h include/simix/datatypes.h \
- simix/msg_simix_private.h
+ simix/msg_simix_private.h \
+ \
+ smpi/private.h smpi/smpi.h
#LIBRARY_VERSION= 0:0:0
# | | |
#LIBRARY_VERSION= 0:0:0
# | | |
@@
-139,11
+144,11
@@
XBT_SRC=\
xbt/graphxml_parse.c
XBT_RL_SRC = \
xbt/graphxml_parse.c
XBT_RL_SRC = \
- xbt/xbt_rl_synchro.c
\
-
xbt/xbt_rl_time.c
+ xbt/xbt_rl_synchro.c \
+ xbt/xbt_rl_time.c
XBT_SG_SRC = \
XBT_SG_SRC = \
- xbt/xbt_sg_synchro.c
\
- xbt/xbt_sg_time.c
+ xbt/xbt_sg_synchro.c \
+ xbt/xbt_sg_time.c
SURF_SRC= \
surf/maxmin.c \
SURF_SRC= \
surf/maxmin.c \
@@
-156,6
+161,10
@@
SURF_SRC= \
surf/network_dassf.c \
surf/workstation_KCCFLN05.c
surf/network_dassf.c \
surf/workstation_KCCFLN05.c
+if CONTEXT_THREADS
+ SURF_SRC += xbt/xbt_os_thread.c
+endif
+
GTNETS_SRC= \
surf/gtnets/gtnets_simulator.cc \
surf/gtnets/gtnets_topology.cc \
GTNETS_SRC= \
surf/gtnets/gtnets_simulator.cc \
surf/gtnets/gtnets_topology.cc \
@@
-164,7
+173,7
@@
GTNETS_SRC= \
# Separated because we don't want it in libsimgrid4java
CTX_SRC= xbt/context.c
# Separated because we don't want it in libsimgrid4java
CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
xbt/xbt_os_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
SIMIX_SRC= \
simix/smx_global.c \
SIMIX_SRC= \
simix/smx_global.c \
@@
-176,6
+185,10
@@
SIMIX_SRC= \
simix/smx_action.c \
simix/smx_synchro.c
simix/smx_action.c \
simix/smx_synchro.c
+SMPI_SRC= \
+ smpi/smpi_base.c \
+ smpi/smpi_mpi.c
+
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
msg/global.c msg/environment.c msg/deployment.c
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
msg/global.c msg/environment.c msg/deployment.c
@@
-210,7
+223,7
@@
GRAS_COMMON_SRC= \
gras/gras.c \
gras/Transport/transport.c gras/Transport/transport_private.h \
gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \
gras/gras.c \
gras/Transport/transport.c gras/Transport/transport_private.h \
gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \
- gras/Msg/gras_msg_exchange.c
\
+ gras/Msg/gras_msg_exchange.c
gras/Msg/gras_msg_listener.c
\
gras/Msg/rpc.c gras/Msg/timer.c \
gras/Msg/msg_interface.h gras/Msg/msg_private.h \
\
gras/Msg/rpc.c gras/Msg/timer.c \
gras/Msg/msg_interface.h gras/Msg/msg_private.h \
\
@@
-229,17
+242,17
@@
GRAS_RL_SRC= \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
\
gras/Virtu/rl_emul.c \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
\
gras/Virtu/rl_emul.c \
- gras/Virtu/rl_process.c
gras/Virtu/rl_time.c
\
+ gras/Virtu/rl_process.c \
gras/Virtu/rl_dns.c\
\
gras/Msg/rl_msg.c
gras/Virtu/rl_dns.c\
\
gras/Msg/rl_msg.c
-
+
GRAS_RL_SRC+=$(XBT_RL_SRC)
GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \
\
gras/Virtu/sg_emul.c \
GRAS_RL_SRC+=$(XBT_RL_SRC)
GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \
\
gras/Virtu/sg_emul.c \
- gras/Virtu/sg_process.c
gras/Virtu/sg_time.c
\
+ gras/Virtu/sg_process.c \
gras/Virtu/sg_dns.c\
\
gras/Msg/sg_msg.c
gras/Virtu/sg_dns.c\
\
gras/Msg/sg_msg.c
@@
-255,7
+268,7
@@
AMOK_SRC= \
# Deal with optional modules #
##############################
# Deal with optional modules #
##############################
-if
US
E_GTNETS
+if
HAV
E_GTNETS
GTNETS_USED=$(GTNETS_SRC)
else
GTNETS_USED=
GTNETS_USED=$(GTNETS_SRC)
else
GTNETS_USED=
@@
-273,16
+286,20
@@
endif
### Declare the library content
###
### Declare the library content
###
-lib_LTLIBRARIES= libsimgrid.la libgras.la
+lib_LTLIBRARIES= libsimgrid.la libgras.la
libsmpi.la
libgras_la_SOURCES= $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
libgras_la_SOURCES= $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO)
@GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(CTX_SRC) \
$(MSG_SRC) $(SIMDAG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(CTX_SRC) \
$(MSG_SRC) $(SIMDAG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+
+libsmpi_la_LIBADD = libsimgrid.la
+libsmpi_la_SOURCES = $(SMPI_SRC)
+libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
##
## Java cruft
##
## Java cruft
@@
-293,8
+310,8
@@
lib_LTLIBRARIES += libsimgrid4java.la
libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(JCTX_SRC) \
$(JMSG_C_SRC) $(MSG_SRC) \
libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(JCTX_SRC) \
$(JMSG_C_SRC) $(MSG_SRC) \
- $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @
GTNETS_LDFLAGS@ @
SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
+libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid4java_la_GCJFLAGS = -fjni
clean-local:
libsimgrid4java_la_GCJFLAGS = -fjni
clean-local: