\
simdag/private.h \
\
+ gras/DataDesc/ddt_parse.yy.l \
+ gras/Virtu/virtu_interface.h \
amok/Bandwidth/bandwidth_private.h \
amok/amok_modinter.h
\
include/simix/simix.h include/simix/datatypes.h \
- simix/msg_simix_private.h
+ simix/msg_simix_private.h \
+ \
+ smpi/private.h smpi/smpi.h
#LIBRARY_VERSION= 0:0:0
# | | |
xbt/graphxml_parse.c
XBT_RL_SRC = \
- xbt/xbt_rl_synchro.c \
- xbt/xbt_rl_time.c
+ xbt/xbt_rl_synchro.c \
+ xbt/xbt_rl_time.c
XBT_SG_SRC = \
- xbt/xbt_sg_synchro.c \
- xbt/xbt_sg_time.c
+ xbt/xbt_sg_synchro.c \
+ xbt/xbt_sg_time.c
SURF_SRC= \
surf/maxmin.c \
surf/network_dassf.c \
surf/workstation_KCCFLN05.c
+if CONTEXT_THREADS
+ SURF_SRC += xbt/xbt_os_thread.c
+else
+ SURF_SRC += xbt/xbt_os_thread_stubs.c
+endif
+
GTNETS_SRC= \
surf/gtnets/gtnets_simulator.cc \
surf/gtnets/gtnets_topology.cc \
# Separated because we don't want it in libsimgrid4java
CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
SIMIX_SRC= \
simix/smx_global.c \
simix/smx_action.c \
simix/smx_synchro.c
+SMPI_SRC= \
+ smpi/smpi_base.c \
+ smpi/smpi_mpi.c
+
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
msg/global.c msg/environment.c msg/deployment.c
### Declare the library content
###
-lib_LTLIBRARIES= libsimgrid.la libgras.la
+lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
libgras_la_SOURCES= $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(CTX_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+# Please do not add -no-undefined to libsmpi_la_LDFLAGS:
+# smpi_simulated_main is indeed defined in user code, and undef in the
+# library (no idea why it works under linux, but it fails under windows)
+libsmpi_la_LIBADD = libsimgrid.la
+libsmpi_la_SOURCES = $(SMPI_SRC)
+libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+
+
##
## Java cruft
$(SIMIX_SRC) $(JCTX_SRC) \
$(JMSG_C_SRC) $(MSG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid4java_la_GCJFLAGS = -fjni
clean-local:
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
xbt/xbt_str.c \
xbt/config.c
-TEST_UNITS= ./cunit_unit.c ./ex_unit.c \
- ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
- ./xbt_str_unit.c \
- ./config_unit.c
+TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c \
+ @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
+ @builddir@/xbt_str_unit.c \
+ @builddir@/config_unit.c
+MAINTAINERCLEANFILES+=$(TEST_UNITS)
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
- gras/DataDesc/ddt_parse.yy.c \
- $(TEST_UNITS) simgrid_units_main.c
+ gras/DataDesc/ddt_parse.yy.c
-testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
+testall_SOURCES= $(TEST_UNITS) @builddir@/simgrid_units_main.c
testall_LDADD=libgras.la
TESTS=testall
TESTS_ENVIRONMENT=$(SG_TEST_EXENV)
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
-./cunit_unit.c: xbt/cunit.c
+@builddir@/cunit_unit.c: xbt/cunit.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./ex_unit.c: xbt/ex.c
+@builddir@/ex_unit.c: xbt/ex.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./xbt_str_unit.c: xbt/xbt_str.c
+@builddir@/xbt_str_unit.c: xbt/xbt_str.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./dynar_unit.c: xbt/dynar.c
+@builddir@/dynar_unit.c: xbt/dynar.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./dict_unit.c: xbt/dict.c
+@builddir@/dict_unit.c: xbt/dict.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./set_unit.c: xbt/set.c
+@builddir@/set_unit.c: xbt/set.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./swag_unit.c: xbt/swag.c
+@builddir@/swag_unit.c: xbt/swag.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-./config_unit.c: xbt/config.c
+@builddir@/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
+@builddir@/simgrid_units_main.c: $(TEST_UNITS)
+ @top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c
clean-units:
rm -f simgrid_units_main.c *_unit.c
