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
Making room for simix.
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
68941cc
..
c895516
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-63,6
+63,10
@@
EXTRA_DIST= \
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
+if USE_SIMIX
+ EXTRA_DIST+=include/simix/simix.h
+endif
+
# gras_private.h
#LIBRARY_VERSION= 0:0:0
# gras_private.h
#LIBRARY_VERSION= 0:0:0
@@
-104,7
+108,6
@@
VERSION_INFO= -version-info 0:0:0
# using this trick is ready for a "stable" release (say, in Debian).
lib_LTLIBRARIES= libsimgrid.la libgras.la
# using this trick is ready for a "stable" release (say, in Debian).
lib_LTLIBRARIES= libsimgrid.la libgras.la
-noinst_PROGRAMS=testall
COMMON_SRC=\
\
COMMON_SRC=\
\
@@
-184,11
+187,21
@@
SG_SRC= \
\
gras/Msg/sg_msg.c
\
gras/Msg/sg_msg.c
+if HAVE_SDP
+ SG_SRC+= surf/sdp.c
+endif
+
+if USE_SIMIX
+ SG_SRC+=simix/smx_global.c
+endif
+
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
+if GRAMINE_MODE
+else
###
### Testing infrastructure
###
###
### Testing infrastructure
###
@@
-202,6
+215,7
@@
AMOK_SRC= \
# Suites and tests run in the given order.
# Suites and tests run in the given order.
+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
@@
-258,13
+272,13
@@
endif
gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
- set -e;@LEX@ -o$@ -Pgras_ddt_parse_ $^
+ set -e;@LEX@ -o$@ -Pgras_ddt_parse_
--noline
$^
if MAINTAINER_MODE
surf/surfxml.c: surf/surfxml.l
if MAINTAINER_MODE
surf/surfxml.c: surf/surfxml.l
- set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ $^
+ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_
--noline
$^
xbt/graphxml.c: xbt/graphxml.l
xbt/graphxml.c: xbt/graphxml.l
- set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ $^
+ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_
--noline
$^
if HAVE_FLEXML
surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
if HAVE_FLEXML
surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
@@
-290,6
+304,7
@@
$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graph
@exit 1
endif
endif
@exit 1
endif
endif
+endif
###
### Declare the library content
###
### Declare the library content