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
document last change
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
13ba0c2
..
03c370d
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-78,7
+78,7
@@
EXTRA_DIST= \
# | Set to zero if current is incremented
# +- Increment if interfaces have been added, removed or changed
# | Set to zero if current is incremented
# +- Increment if interfaces have been added, removed or changed
-VERSION_INFO= -
release 20050627 -
version-info 0:0:0
+VERSION_INFO= -version-info 0:0:0
# from `info libtool "Updating version info"`
# and `info libtool "Release numbers"`
#
# from `info libtool "Updating version info"`
# and `info libtool "Release numbers"`
#
@@
-104,7
+104,6
@@
VERSION_INFO= -release 20050627 -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=\
\
@@
-189,6
+188,8
@@
AMOK_SRC= \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
+if GRAMINE_MODE
+else
###
### Testing infrastructure
###
###
### Testing infrastructure
###
@@
-202,6
+203,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
+260,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,16
+292,17
@@
$(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
###
libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
###
### Declare the library content
###
libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libgras_la_LDFLAGS =
-no-undefined
$(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS =
-no-undefined
$(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm