+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
xbt/graphxml.l \
xbt/graphxml.c \
xbt/graphxml.dtd \
- xbt/context_private.h \
+ xbt/xbt_context_private.h \
+ xbt/xbt_context_java.h \
+ xbt/log_private.h \
xbt/ex_interface.h \
+ xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
\
surf/maxmin_private.h \
surf/trace_mgr_private.h \
surf/workstation_private.h \
surf/surf_timer_private.h \
surf/surfxml_parse.c \
- surf/surfxml.l \
- surf/surfxml.c \
- surf/surfxml.dtd \
+ surf/simgrid_dtd.l \
+ surf/simgrid_dtd.c \
+ surf/simgrid.dtd \
surf/network_private.h \
+ surf/network_common.h \
surf/network_gtnets_private.h \
+ surf/gtnets/gtnets_interface.h \
+ surf/gtnets/gtnets_simulator.h \
+ surf/gtnets/gtnets_topology.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
include/surf/surf.h \
include/surf/surfxml_parse_private.h \
+ include/surf/random_mgr.h \
\
+ include/xbt/wine_dbghelp.h \
+ include/xbt/context.h \
include/xbt/xbt_os_time.h \
include/xbt/xbt_os_thread.h \
- include/xbt/context.h \
\
msg/private.h \
+ msg/mailbox.h \
\
simdag/private.h \
\
XBT_SRC=\
\
- xbt/snprintf.c xbt/xbt_str.c \
+ xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c \
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
surf/fair_bottleneck.c \
surf/lagrange.c \
surf/trace_mgr.c \
+ surf/random_mgr.c \
surf/surf.c \
surf/surfxml_parse.c \
- surf/cpu.c surf/network.c surf/workstation.c \
+ surf/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \
surf/surf_timer.c \
- surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c
+ surf/workstation_ptask_L07.c \
+ xbt/xbt_sg_stubs.c
if CONTEXT_THREADS
- SURF_SRC += xbt/xbt_os_thread.c
+ SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_context_thread.c
else
- SURF_SRC += xbt/xbt_os_thread_stubs.c
+ SURF_SRC += xbt/xbt_context_sysv.c
endif
GTNETS_SRC= \
surf/gtnets/gtnets_interface.cc \
surf/network_gtnets.c
-# Separated because we don't want it in libsimgrid4java
-CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
+# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
+# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library
+CTX_SRC= xbt/xbt_context.c
SIMIX_SRC= \
simix/smx_global.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
+ msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
JMSG_C_SRC = \
+ xbt/xbt_context_java.c \
java/jxbt_utilities.c java/jxbt_utilities.h \
java/jmsg.c java/jmsg.h \
java/jmsg_channel.c java/jmsg_channel.h \
java/jmsg_host.c java/jmsg_host.h \
- java/jmsg_parallel_task.c java/jmsg_parallel_task.h \
java/jmsg_process.c java/jmsg_process.h \
- java/jmsg_task.c java/jmsg_task.h
+ java/jmsg_task.c java/jmsg_task.h \
+ java/jmsg_application_handler.c java/jmsg_application_handler.h
JMSG_JAVA_SRC = \
java/simgrid/msg/MsgException.java \
java/simgrid/msg/HostNotFoundException.java \
java/simgrid/msg/ProcessNotFoundException.java \
\
+ java/simgrid/msg/Msg.java \
java/simgrid/msg/Process.java \
- java/simgrid/msg/DTDResolver.java \
- java/simgrid/msg/ApplicationHandler.java \
- java/simgrid/msg/Channel.java \
java/simgrid/msg/Host.java \
- java/simgrid/msg/Msg.java \
java/simgrid/msg/Task.java \
- java/simgrid/msg/ParallelTask.java \
+ \
+ java/simgrid/msg/MsgNative.java \
+ java/simgrid/msg/DTDResolver.java \
+ java/simgrid/msg/ApplicationHandler.java \
\
java/simgrid/msg/Sem.java
$(MSG_SRC) $(SIMDAG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+# -Wl,--entry -Wl,simgrid_version
# Please do not add -no-undefined to libsmpi_la_LDFLAGS:
# smpi_simulated_main is indeed defined in user code, and undef in the
## Java cruft
EXTRA_DIST+=$(JMSG_JAVA_SRC)
-if HAVE_JAVA
-lib_LTLIBRARIES += libsimgrid4java.la
-libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
- $(SIMIX_SRC) $(JCTX_SRC) \
- $(JMSG_C_SRC) $(MSG_SRC) \
- $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsimgrid4java_la_GCJFLAGS = -fjni
+if HAVE_JAVA
+libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
clean-local:
-rm -rf .classes
-jardir = $(prefix)/jar
+jardir = $(prefix)/jar
jar_DATA = simgrid.jar
-simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
+simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
[ -e .classes ] || mkdir .classes
- $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
- $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
+ $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
+ [ -e .classes/surf ] || mkdir .classes/surf
+ cp $(srcdir)/surf/simgrid.dtd .classes/surf
+ $(JAR) cvf simgrid.jar -C .classes .
else
-EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
endif
if GRAMINE_MODE
noinst_PROGRAMS=testall
TEST_CFILES=xbt/cunit.c xbt/ex.c \
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
- xbt/xbt_str.c \
+ xbt/xbt_str.c xbt/xbt_sha.c \
xbt/config.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 \
+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@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\
@builddir@/config_unit.c
-BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
+BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
../include/xbt/graphxml.h xbt/graphxml.c \
gras/DataDesc/ddt_parse.yy.c \
$(TEST_UNITS) @builddir@/simgrid_units_main.c
if MAINTAINER_MODE
CLEANFILES=$(TEST_UNITS)
-@builddir@/cunit_unit.c: xbt/cunit.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/ex_unit.c: xbt/ex.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/xbt_str_unit.c: xbt/xbt_str.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dynar_unit.c: xbt/dynar.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dict_unit.c: xbt/dict.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/set_unit.c: xbt/set.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/swag_unit.c: xbt/swag.c
- @top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/config_unit.c: xbt/config.c
+$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\
+ xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@builddir@/simgrid_units_main.c: $(TEST_UNITS)
set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^
if MAINTAINER_MODE
-surf/surfxml.c: surf/surfxml.l
+surf/simgrid_dtd.c: surf/simgrid_dtd.l
set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include <io.h>\n# include <process.h>\n# endif\n#else\n# include <unistd.h>\n#endif/g' -i $@
xbt/graphxml.c: xbt/graphxml.l
sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include <io.h>\n# include <process.h>\n# endif\n#else\n# include <unistd.h>\n#endif/g' -i $@
if HAVE_FLEXML
-surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
- 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 --sysid=surfxml.dtd -H $@ -L $^
+surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
+ set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^
+$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd
+ rm -f $(top_srcdir)/include/surf/simgrid.h
+ set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^
+ if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi
sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
else
-$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
- @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
+$(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd
+ @echo "ERROR: src/surf/simgrid.dtd was modified, but the flexml program was not detected"
@echo "ERROR: Please install it, or if you didn't modify this file, try this:"
- @echo "ERROR: touch include/surf/surfxml.h src/surf/surfxml.l"
+ @echo "ERROR: touch include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l"
@exit 1
$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd
@echo "ERROR: src/xbt/graphxml.dtd was modified, but the flexml program was not detected"