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
cea2ff6
..
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
@@
-65,7
+71,7
@@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDR2LINE = @ADDR2LINE@
AMTAR = @AMTAR@
ACLOCAL = @ACLOCAL@
ADDR2LINE = @ADDR2LINE@
AMTAR = @AMTAR@
-AM_C
FLAGS = @AM_C
FLAGS@
+AM_C
PPFLAGS = @AM_CPP
FLAGS@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
@@
-99,8
+105,6
@@
GCJDEPMODE = @GCJDEPMODE@
GCJFLAGS = @GCJFLAGS@
GRAS_DEP = @GRAS_DEP@
GREP = @GREP@
GCJFLAGS = @GCJFLAGS@
GRAS_DEP = @GRAS_DEP@
GREP = @GREP@
-GTNETS_CFLAGS = @GTNETS_CFLAGS@
-GTNETS_LDFLAGS = @GTNETS_LDFLAGS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@
-134,9
+138,11
@@
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@
+SMPI_DEP = @SMPI_DEP@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING = @WARNING@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING = @WARNING@
@@
-198,14
+204,21
@@
target_os = @target_os@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml surfxml.dtd
+EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml \
+ $(JAVA_SRC)
# Declare sources:
# Declare sources:
-noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
-TESTS = CommTimeTest.class
+JAVA_SRC = Master.java Slave.java CommTimeTest.java \
+ CommTimeTask.java FinalizeTask.java
+
+JAVA_TESTS = CommTimeTest.class
+TESTS = $(JAVA_TESTS)
+
+# Declare test class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
JAVAROOT = .
JAVAROOT = .
-CLASSPATH = $(top_srcdir)/src/java
-AM_JAVACFLAGS = -I$(top_srcdir)/src/java
+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
@@
-214,9
+227,9
@@
AM_JAVACFLAGS = -I$(top_srcdir)/src/java
# 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
@@
-474,9
+487,6
@@
uninstall-am:
uninstall uninstall-am
uninstall uninstall-am
-#if HAVE_JAVA
- # Declare test class
-
# declare that we must recompile everything before lauching tests
$(TESTS): classnoinst.stamp
# declare that we must recompile everything before lauching tests
$(TESTS): classnoinst.stamp
@@
-484,7
+494,6
@@
dist-files:
@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
@echo
@for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
@echo
@for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
-#endif
# Cruft
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Cruft
# Tell versions [3.59,3.63) of GNU make to not export all variables.