Stop using options that only gcj understands, and stick to the ones that both gcj...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3839 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 14b5b8e..76ab617 100644 (file)
--- a/examples/java/basic/Makefile.in
+++ b/examples/java/basic/Makefile.in
@@ -207,7 +207,8 @@ noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.jav
 TESTS = BasicTest.class
 JAVAROOT = .
 CLASSPATH = $(top_srcdir)/src/java
-AM_JAVACFLAGS = -I$(top_srcdir)/src/java
+
+#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
 
 ##########################
 # What to do on make check

diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in
index cea2ff6..cf525ea 100644 (file)
--- a/examples/java/comm_time/Makefile.in
+++ b/examples/java/comm_time/Makefile.in
@@ -205,7 +205,8 @@ noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
 TESTS = CommTimeTest.class
 JAVAROOT = .
 CLASSPATH = $(top_srcdir)/src/java
-AM_JAVACFLAGS = -I$(top_srcdir)/src/java
+
+#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
 
 ##########################
 # What to do on make check

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index f9f257e..1899744 100644 (file)
--- a/examples/java/java_test.mk
+++ b/examples/java/java_test.mk
@@ -5,7 +5,7 @@
 JAVAROOT=.
 CLASSPATH=$(top_srcdir)/src/java
 
-AM_JAVACFLAGS=-I$(top_srcdir)/src/java
+#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
 
 
 ##########################

diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in
index 07059e0..b430ac4 100644 (file)
--- a/examples/java/ping_pong/Makefile.in
+++ b/examples/java/ping_pong/Makefile.in
@@ -208,7 +208,8 @@ noinst_JAVA = Sender.java Receiver.java PingPongTask.java PingPongTest.java
 TESTS = PingPongTest.class
 JAVAROOT = .
 CLASSPATH = $(top_srcdir)/src/java
-AM_JAVACFLAGS = -I$(top_srcdir)/src/java
+
+#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
 
 ##########################
 # What to do on make check

diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in
index 7ac769c..bf09159 100644 (file)
--- a/examples/java/suspend/Makefile.in
+++ b/examples/java/suspend/Makefile.in
@@ -208,7 +208,8 @@ noinst_JAVA = DreamMaster.java LazyGuy.java SuspendTest.java
 TESTS = SuspendTest.class
 JAVAROOT = .
 CLASSPATH = $(top_srcdir)/src/java
-AM_JAVACFLAGS = -I$(top_srcdir)/src/java
+
+#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
 
 ##########################
 # What to do on make check