xbt/graphxml.dtd \
xbt/xbt_context_private.h \
xbt/xbt_context_factory.h \
- xbt/xbt_thread_context.h \
- xbt/xbt_ucontext.h \
xbt/xbt_jcontext.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_gtnets_private.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 \
\
msg/private.h \
+ msg/mailbox.h \
\
simdag/private.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/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
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_jcontext.c \
$(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
jardir = $(prefix)/jar
jar_DATA = simgrid.jar
-simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd
+simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
[ -e .classes ] || mkdir .classes
$(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
[ -e .classes/surf ] || mkdir .classes/surf
- cp $(srcdir)/surf/surfxml.dtd .classes/surf
+ cp $(srcdir)/surf/simgrid.dtd .classes/surf
$(JAR) cvf simgrid.jar -C .classes .
else
EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
@builddir@/xbt_str_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
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 --root-tags platform -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
-$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
- set -e; flexml --root-tags platform -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"
