From a431c02b798ec8bdd1c9c8e0314a1300e57ed028 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 18 Aug 2009 14:24:57 +0000
Subject: [PATCH] Various fixes to the java building infrastructure (now
 working in VPATH builds)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6595 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/java/java_test.mk | 4 ++--
 src/Makefile.am            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index cf493036dc..f92566f2c9 100644
--- a/examples/java/java_test.mk
+++ b/examples/java/java_test.mk
@@ -4,7 +4,7 @@
 
 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" \
-                    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 
diff --git a/src/Makefile.am b/src/Makefile.am
index 64391ec993..6adcaa2e8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -357,7 +357,7 @@ if HAVE_JAVA
 libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 
 clean-local:
-	-rm -rf .classes
+	-rm -rf .classes simgrid.jar
 
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
@@ -369,7 +369,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
 	cp $(srcdir)/surf/simgrid.dtd .classes/surf
 	$(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
 if GRAMINE_MODE
-- 
2.20.1