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
Simplify this example by not declaring BasicTask since that's empty
[simgrid.git]
/
examples
/
java
/
java_test.mk
diff --git
a/examples/java/java_test.mk
b/examples/java/java_test.mk
index
cf49303
..
90a568c
100644
(file)
--- a/
examples/java/java_test.mk
+++ b/
examples/java/java_test.mk
@@
-4,7
+4,7
@@
JAVAROOT=.
JAVAROOT=.
-AM_JAVACFLAGS=-classpath
$(top_srcdir)/src/simgrid.jar:
.
+AM_JAVACFLAGS=-classpath
.:$(top_srcdir)/src/simgrid.jar:../../../src/simgrid.jar:.
.
##########################
##########################
@@
-16,7
+16,7
@@
AM_JAVACFLAGS=-classpath $(top_srcdir)/src/simgrid.jar:.
# Damn...
if HAVE_JAVA
TESTS_ENVIRONMENT=LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
# Damn...
if HAVE_JAVA
TESTS_ENVIRONMENT=LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
- CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
+ CLASSPATH=".:
../../../src/simgrid.jar:
$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
$(srcdir)/../runtest
else
TESTS_ENVIRONMENT=DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest
$(srcdir)/../runtest
else
TESTS_ENVIRONMENT=DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest