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
Visual C++ config doesn't use the gnu functions
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
6ba70ce
..
c2bec8a
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-39,7
+39,6
@@
EXTRA_DIST= \
surf/surfxml.dtd \
surf/network_private.h \
network_gtnets_private.h \
surf/surfxml.dtd \
surf/network_private.h \
network_gtnets_private.h \
- surf/workstation_KCCFLN05_private.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
\
include/surf/maxmin.h \
include/surf/trace_mgr.h \
@@
-186,7
+185,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 \
@@
-209,12
+213,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
@@
-303,6
+311,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
@@
-323,10
+337,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
@@
-355,7
+369,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 \
@@
-370,6
+383,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
@@
-399,12
+414,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
###