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
Some build adjustments mandatory for the relocation of xbt_contexts [Cristian]
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
085d6f0
..
71f276f
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-185,9
+185,7
@@
SURF_SRC= \
xbt/xbt_sg_stubs.c
if CONTEXT_THREADS
xbt/xbt_sg_stubs.c
if CONTEXT_THREADS
- SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_context_thread.c
-else
- SURF_SRC += xbt/xbt_context_sysv.c
+ SURF_SRC += xbt/xbt_os_thread.c
endif
GTNETS_SRC= \
endif
GTNETS_SRC= \
@@
-198,7
+196,7
@@
GTNETS_SRC= \
# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library
# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library
-CTX_SRC=
xbt
/xbt_context.c
+CTX_SRC=
simix
/xbt_context.c
SIMIX_SRC= \
simix/smx_global.c \
SIMIX_SRC= \
simix/smx_global.c \
@@
-208,6
+206,12
@@
SIMIX_SRC= \
simix/smx_process.c \
simix/smx_action.c \
simix/smx_synchro.c
simix/smx_process.c \
simix/smx_action.c \
simix/smx_synchro.c
+
+if CONTEXT_THREADS
+ SURF_SRC += simix/xbt_context_thread.c
+else
+ SURF_SRC += simix/xbt_context_sysv.c
+endif
SMPI_SRC= \
smpi/smpi_base.c \
SMPI_SRC= \
smpi/smpi_base.c \
@@
-225,7
+229,7
@@
MSG_SRC= msg/msg_config.c \
msg/msg_actions.c
JMSG_C_SRC = \
msg/msg_actions.c
JMSG_C_SRC = \
-
xbt
/xbt_context_java.c \
+
simix
/xbt_context_java.c \
java/jxbt_utilities.c java/jxbt_utilities.h \
java/jmsg.c java/jmsg.h \
java/jmsg_channel.c java/jmsg_channel.h \
java/jxbt_utilities.c java/jxbt_utilities.h \
java/jmsg.c java/jmsg.h \
java/jmsg_channel.c java/jmsg_channel.h \