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
autogenerated
[simgrid.git]
/
examples
/
java
/
comm_time
/
Makefile.in
diff --git
a/examples/java/comm_time/Makefile.in
b/examples/java/comm_time/Makefile.in
index
7058076
..
8a19538
100644
(file)
--- a/
examples/java/comm_time/Makefile.in
+++ b/
examples/java/comm_time/Makefile.in
@@
-14,6
+14,12
@@
@SET_MAKE@
@SET_MAKE@
+# 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.
+
#########################
# How to compile the code
# All this to only get a dumb javac *java... Automake still have issues with java
#########################
# How to compile the code
# All this to only get a dumb javac *java... Automake still have issues with java
@@
-132,6
+138,7
@@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
RANLIB = @RANLIB@
PATH_SEPARATOR = @PATH_SEPARATOR@
PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMGRID_DEP = @SIMGRID_DEP@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMGRID_DEP = @SIMGRID_DEP@
@@
-201,14
+208,17
@@
EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml \
$(JAVA_SRC)
# Declare sources:
$(JAVA_SRC)
# Declare sources:
-JAVA_SRC = Master.java Slave.java CommTimeTest.java CommTimeTask.java
+JAVA_SRC = Master.java Slave.java CommTimeTest.java \
+ CommTimeTask.java FinalizeTask.java
+
JAVA_TESTS = CommTimeTest.class
JAVA_TESTS = CommTimeTest.class
+TESTS = $(JAVA_TESTS)
# Declare test class
@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
# Declare test class
@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
-@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
JAVAROOT = .
AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
JAVAROOT = .
AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
+@HAVE_JAVA_FALSE@TESTS_ENVIRONMENT = DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest
##########################
# What to do on make check
##########################
# What to do on make check
@@
-217,9
+227,9
@@
AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
# We need to override the CLASSPATH to add simgrid.jar and current dir to the picture
# We also need to express dependencies manually (in each test dir)
# Damn...
# We need to override the CLASSPATH to add simgrid.jar and current dir to the picture
# We also need to express dependencies manually (in each test dir)
# Damn...
-TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
- CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
- $(srcdir)/../runtest
+
@HAVE_JAVA_TRUE@
TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
+
@HAVE_JAVA_TRUE@
CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
+
@HAVE_JAVA_TRUE@
$(srcdir)/../runtest
all: all-am
all: all-am