A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing files to the dist...
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
5ea268c
..
660dffc
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-38,8
+38,7
@@
EXTRA_DIST= \
surf/surfxml.c \
surf/surfxml.dtd \
surf/network_private.h \
surf/surfxml.c \
surf/surfxml.dtd \
surf/network_private.h \
- surf/network_dassf_private.h \
- surf/workstation_KCCFLN05_private.h \
+ surf/network_gtnets_private.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
@@
-55,14
+54,18
@@
EXTRA_DIST= \
simdag/private.h \
\
gras/DataDesc/ddt_parse.yy.l \
simdag/private.h \
\
gras/DataDesc/ddt_parse.yy.l \
+ gras/Virtu/virtu_rl.h \
+ gras/Virtu/virtu_sg.h \
gras/Virtu/virtu_interface.h \
gras/Virtu/virtu_interface.h \
+ gras/Virtu/virtu_private.h \
+ gras/Transport/transport_interface.h \
amok/Bandwidth/bandwidth_private.h \
amok/Bandwidth/bandwidth_private.h \
- amok/amok_modinter.h
+ amok/amok_modinter.h
\
\
\
- include/simix/simix.h include/simix/datatypes.h
\
- simix/
msg_simix_
private.h \
+ include/simix/simix.h include/simix/datatypes.h
\
+ simix/private.h \
\
\
- smpi/private.h
smpi/smpi.h
+ smpi/private.h
#LIBRARY_VERSION= 0:0:0
# | | |
#LIBRARY_VERSION= 0:0:0
# | | |
@@
-156,7
+159,6
@@
SURF_SRC= \
surf/surfxml_parse.c \
surf/cpu.c surf/network.c surf/workstation.c \
surf/surf_timer.c \
surf/surfxml_parse.c \
surf/cpu.c surf/network.c surf/workstation.c \
surf/surf_timer.c \
- surf/network_dassf.c \
surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c
if CONTEXT_THREADS
surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c
if CONTEXT_THREADS
@@
-187,7
+189,12
@@
SIMIX_SRC= \
SMPI_SRC= \
smpi/smpi_base.c \
SMPI_SRC= \
smpi/smpi_base.c \
- smpi/smpi_mpi.c
+ smpi/smpi_bench.c \
+ smpi/smpi_global.c \
+ smpi/smpi_mpi.c \
+ smpi/smpi_sender.c \
+ smpi/smpi_receiver.c \
+ smpi/smpi_util.c
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@
-210,12
+217,16
@@
JMSG_JAVA_SRC = \
java/simgrid/msg/ProcessNotFoundException.java \
\
java/simgrid/msg/Process.java \
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/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
SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
@@
-304,6
+315,12
@@
libsmpi_la_LIBADD = libsimgrid.la
libsmpi_la_SOURCES = $(SMPI_SRC)
libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
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
##
## Java cruft
@@
-324,10
+341,10
@@
clean-local:
jardir = $(prefix)/jar
jar_DATA = simgrid.jar
jardir = $(prefix)/jar
jar_DATA = simgrid.jar
-simgrid.jar: $(JMSG_JAVA_SRC)
+simgrid.jar: $(JMSG_JAVA_SRC)
./surf/surfxml.dtd
[ -e .classes ] || mkdir .classes
[ -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
else
EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
endif
@@
-356,7
+373,6
@@
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
@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 \
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
@@
-371,6
+387,8
@@
TESTS_ENVIRONMENT=$(SG_TEST_EXENV)
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
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
@builddir@/cunit_unit.c: xbt/cunit.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
@builddir@/ex_unit.c: xbt/ex.c
@@
-400,12
+418,17
@@
clean-units:
done
else
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."
$(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
@echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
@exit 1
-
+endif
endif
###
endif
###
@@
-419,8
+442,10
@@
gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
if MAINTAINER_MODE
surf/surfxml.c: surf/surfxml.l
set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
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 $^
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
if HAVE_FLEXML
surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
@@
-430,7
+455,6
@@
$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
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
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