From 45c3480003459fd0c8ea061f99d4105b0e4e0c8c Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 17 Jul 2007 14:16:29 +0000
Subject: [PATCH] Stop using options that only gcj understands, and stick to
 the ones that both gcj and classical javac understand

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3839 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/java/basic/Makefile.in     | 3 ++-
 examples/java/comm_time/Makefile.in | 3 ++-
 examples/java/java_test.mk          | 2 +-
 examples/java/ping_pong/Makefile.in | 3 ++-
 examples/java/suspend/Makefile.in   | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 14b5b8e996..76ab617869 100644
--- 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 cea2ff6676..cf525ea7ec 100644
--- 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 f9f257ef6e..1899744e50 100644
--- 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 07059e067a..b430ac4576 100644
--- 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 7ac769cd5e..bf091590ca 100644
--- 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
-- 
2.20.1