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
a makefile to build the ping_pong example
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
df20b08
..
03cd7b7
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,4
@@
-AM_CFLAGS
= -g
+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.
@@
-26,7
+26,7
@@
EXTRA_DIST= \
xbt/graphxml.l \
xbt/graphxml.c \
xbt/graphxml.dtd \
xbt/graphxml.l \
xbt/graphxml.c \
xbt/graphxml.dtd \
- xbt/context_private.h
xbt/context_win32.h xbt/context_win32.c
\
+ xbt/context_private.h \
xbt/ex_interface.h \
\
surf/maxmin_private.h \
xbt/ex_interface.h \
\
surf/maxmin_private.h \
@@
-49,6
+49,7
@@
EXTRA_DIST= \
include/surf/surfxml_parse_private.h \
\
include/xbt/xbt_portability.h \
include/surf/surfxml_parse_private.h \
\
include/xbt/xbt_portability.h \
+ include/xbt/xbt_thread.h \
include/xbt/context.h \
\
msg/private.h \
include/xbt/context.h \
\
msg/private.h \
@@
-111,7
+112,7
@@
lib_LTLIBRARIES= libsimgrid.la libgras.la
COMMON_SRC=\
\
COMMON_SRC=\
\
- xbt/snprintf.c
\
+ xbt/snprintf.c
xbt/getline.c
\
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
@@
-151,6
+152,8
@@
COMMON_SRC=\
gras/Virtu/process.c gras/Virtu/gras_module.c
RL_SRC= \
gras/Virtu/process.c gras/Virtu/gras_module.c
RL_SRC= \
+ gras/rl_stubs.c xbt/xbt_thread.c \
+ \
gras/Transport/rl_transport.c \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
\
gras/Transport/rl_transport.c \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
\
@@
-161,6
+164,7
@@
RL_SRC= \
gras/Msg/rl_msg.c
SG_SRC= \
gras/Msg/rl_msg.c
SG_SRC= \
+ gras/sg_stubs.c \
xbt/context.c \
\
surf/maxmin.c \
xbt/context.c \
\
surf/maxmin.c \
@@
-191,8
+195,8
@@
if HAVE_SDP
SG_SRC+= surf/sdp.c
endif
SG_SRC+= surf/sdp.c
endif
-if USE_SIMIX
-
SG_SRC+=
simix/smx_global.c \
+SIMIX_SRC= \
+ simix/smx_global.c \
simix/smx_deployment.c \
simix/smx_config.c \
simix/smx_environment.c \
simix/smx_deployment.c \
simix/smx_config.c \
simix/smx_environment.c \
@@
-200,8
+204,13
@@
if USE_SIMIX
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 USE_SIMIX
+ SG_SRC+=$(SIMIX_SRC)
+else
+ EXTRA_DIST+=$(SIMIX_SRC)
endif
endif
+
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
@@
-226,9
+235,9
@@
noinst_PROGRAMS=testall
TEST_CFILES=xbt/cunit.c xbt/ex.c \
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
xbt/config.c
TEST_CFILES=xbt/cunit.c xbt/ex.c \
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
xbt/config.c
-TEST_UNITS=
cunit_unit.c
ex_unit.c \
-
dynar_unit.c dict_unit.c set_unit.c
swag_unit.c \
- config_unit.c
+TEST_UNITS=
./cunit_unit.c ./
ex_unit.c \
+
./dynar_unit.c ./dict_unit.c ./set_unit.c ./
swag_unit.c \
+
./
config_unit.c
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
@@
-242,19
+251,19
@@
TESTS=testall
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
-cunit_unit.c: xbt/cunit.c
+
./
cunit_unit.c: xbt/cunit.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-ex_unit.c: xbt/ex.c
+
./
ex_unit.c: xbt/ex.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-dynar_unit.c: xbt/dynar.c
+
./
dynar_unit.c: xbt/dynar.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-dict_unit.c: xbt/dict.c
+
./
dict_unit.c: xbt/dict.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-set_unit.c: xbt/set.c
+
./
set_unit.c: xbt/set.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-swag_unit.c: xbt/swag.c
+
./
swag_unit.c: xbt/swag.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@top_srcdir@/tools/sg_unit_extractor.pl $^
-config_unit.c: xbt/config.c
+
./
config_unit.c: xbt/config.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
simgrid_units_main.c: $(TEST_UNITS)
@top_srcdir@/tools/sg_unit_extractor.pl $^
simgrid_units_main.c: $(TEST_UNITS)