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

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index cf49303..f92566f 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 

diff --git a/src/Makefile.am b/src/Makefile.am
index 64391ec..6adcaa2 100644 (file)
--- 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:
 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
 
 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
        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
 endif
 
 if GRAMINE_MODE