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
Added flag for printing more debug info
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
c3d36ec
..
ed9474a
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-195,10
+195,6
@@
SURF_SRC= \
surf/cpu_im.c \
xbt/xbt_sg_stubs.c
surf/cpu_im.c \
xbt/xbt_sg_stubs.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 \
@@
-217,9
+213,11
@@
SIMIX_SRC= \
simix/smx_network.c
if CONTEXT_THREADS
simix/smx_network.c
if CONTEXT_THREADS
- SURF_SRC += simix/smx_context_thread.c
+ SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c
+ EXTRA_DIST += simix/smx_context_sysv.c
else
SURF_SRC += simix/smx_context_sysv.c
else
SURF_SRC += simix/smx_context_sysv.c
+ EXTRA_DIST += xbt/xbt_os_thread.c simix/smx_context_thread.c
endif
SMPI_SRC= \
endif
SMPI_SRC= \
@@
-382,6
+380,12
@@
else
EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
endif
EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
endif
+LUA_SRC= simix/smx_context_lua.c bindings/lua/Msglua.c
+if HAVE_LUA
+ simgrid_sources += $(LUA_SRC)
+else
+ EXTRA_DIST += $(LUA_SRC)
+endif
##
## Compile the libs
CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c
##
## Compile the libs
CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c