surf/surfxml.c \
surf/surfxml.dtd \
surf/network_private.h \
- network_gtnets_private.h \
- surf/workstation_KCCFLN05_private.h \
+ surf/network_gtnets_private.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
amok/amok_modinter.h
\
include/simix/simix.h include/simix/datatypes.h \
- simix/msg_simix_private.h \
+ simix/private.h \
\
smpi/private.h
java/simgrid/msg/ProcessNotFoundException.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/ParallelTask.java \
+ \
+ java/simgrid/msg/Sem.java
+
SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
libsmpi_la_SOURCES = $(SMPI_SRC)
libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+# Windows users (at least, MSVC ones) need a def file.
+if IS_WINDOWS
+libgras_la_LDFLAGS += -Wl,--output-def,libgras.def
+libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def
+libsmpi_la_LDFLAGS += -Wl,--output-def,libsmpi.def
+endif
##
## Java cruft
jardir = $(prefix)/jar
jar_DATA = simgrid.jar
-simgrid.jar: $(JMSG_JAVA_SRC)
+simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
[ -e .classes ] || mkdir .classes
- $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
- $(JAR) cvf simgrid.jar -C .classes .;
+ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
+ $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
else
EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
endif
@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
-CLEANFILES=$(TEST_UNITS)
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
EXTRA_DIST+=$(testall_SOURCES)
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
done
else
+if BOTBUILD_MODE
+$(TEST_UNITS) simgrid_units_main.c clean-units:
+ @echo "WARNING: Test units not generated, but touched instead since this is a bot build."
+ touch $@
+else
$(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 you are using a SVN checkout, configure with the --enable-maintainer-mode flag"
@echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
@exit 1
-
+endif
endif
###
if MAINTAINER_MODE
surf/surfxml.c: surf/surfxml.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
set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_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 $@
if HAVE_FLEXML
surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
-
xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd