-AM_CFLAGS= -g
+AM_CFLAGS+= -g
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
\
portable.h \
\
+ xbt/mallocator_private.h \
xbt/dynar_private.h \
xbt/dict_private.h \
xbt/heap_private.h \
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 \
include/surf/surfxml_parse_private.h \
\
include/xbt/xbt_portability.h \
+ include/xbt/xbt_thread.h \
include/xbt/context.h \
\
msg/private.h \
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
+if USE_SIMIX
+ EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/private.h
+endif
+
# gras_private.h
#LIBRARY_VERSION= 0:0:0
# | 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"`
#
# using this trick is ready for a "stable" release (say, in Debian).
lib_LTLIBRARIES= libsimgrid.la libgras.la
-noinst_PROGRAMS=testall
COMMON_SRC=\
\
- xbt/snprintf.c \
+ xbt/snprintf.c xbt/getline.c \
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
xbt/sysdep.c \
xbt/asserts.c \
xbt/log.c xbt/log_default_appender.c \
+ xbt/mallocator.c \
xbt/dynar.c \
xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c \
xbt/dict_multi.c \
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/Msg/rl_msg.c
SG_SRC= \
+ gras/sg_stubs.c \
xbt/context.c \
\
surf/maxmin.c \
\
gras/Msg/sg_msg.c
+if HAVE_SDP
+ SG_SRC+= surf/sdp.c
+endif
+
+SIMIX_SRC= \
+ simix/smx_global.c \
+ simix/smx_deployment.c \
+ simix/smx_config.c \
+ simix/smx_environment.c \
+ simix/smx_host.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
+
+
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
+if GRAMINE_MODE
+else
###
### Testing infrastructure
###
# are generated. Sorry about that.
# If you add a test unit, you should regenerate simgrid_units_main.c from scratch:
-# rm -f simgrid_units_main.c *_unit.c ; make testall
+# make clean-units ; make testall
# 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_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 \
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 $^
-ex_unit.c: xbt/ex.c
+./ex_unit.c: xbt/ex.c
@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 $^
-dict_unit.c: xbt/dict.c
+./dict_unit.c: xbt/dict.c
@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 $^
-swag_unit.c: xbt/swag.c
+./swag_unit.c: xbt/swag.c
@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 xbt/cunit.c
+
+clean-units:
+ rm -f simgrid_units_main.c *_unit.c
else
-$(TEST_UNITS) simgrid_units_main.c:
+$(TEST_UNITS) simgrid_units_main.c clean-units:
@echo "ERROR: Test units not generated."
@echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
@echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
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
- 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
- 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
- set -e; mkdir -p surf; flexml -b 1000000 -P surfxml -S $@ -L $^
+ set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
- set -e; flexml -P surfxml -H $@ -L $^
-
+ set -e; flexml -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+
xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
- set -e; flexml -b 1000000 -P graphxml -S $@ -L $^
+ set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
- set -e; flexml -P graphxml -H $@ -L $^
+ set -e; flexml -P graphxml --sysid=graphxml.dtd -H $@ -L $^
else
$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
@exit 1
endif
endif
+endif
###
### 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_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
