These Makefiles should always include the source files but build the

binaries only when HAVE_JAVA.

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

diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am
index 32552a4..a9c71d6 100644 (file)
--- a/examples/java/basic/Makefile.am
+++ b/examples/java/basic/Makefile.am
@@ -1,10 +1,17 @@
 EXTRA_DIST=basic_deployment.xml basic_platform.xml
 
 # Declare sources:
 EXTRA_DIST=basic_deployment.xml basic_platform.xml
 
 # Declare sources:

-noinst_JAVA= Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java
+JAVA_SRC=Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java
+JAVA_TESTS=BasicTest.class

 
 # Declare test class
 
 # Declare test class

-TESTS=BasicTest.class
+if HAVE_JAVA
+noinst_JAVA=$(JAVA_SRC)
+TESTS=$(JAVA_TESTS)
+else
+EXTRA_DIST+=$(JAVA_SRC)
+EXTRA_DIST+=$(JAVA_TESTS)
+endif

 
 include $(srcdir)/../java_test.mk
 
 
 include $(srcdir)/../java_test.mk
 

diff --git a/examples/java/comm_time/Makefile.am b/examples/java/comm_time/Makefile.am
index d60c632..cb43c6c 100644 (file)
--- a/examples/java/comm_time/Makefile.am
+++ b/examples/java/comm_time/Makefile.am
@@ -1,12 +1,17 @@
 EXTRA_DIST=comm_time_deployment.xml comm_time_platform.xml
 
 # Declare sources:
 EXTRA_DIST=comm_time_deployment.xml comm_time_platform.xml
 
 # Declare sources:

-noinst_JAVA= Master.java Slave.java CommTimeTest.java CommTimeTask.java
+JAVA_SRC=Master.java Slave.java CommTimeTest.java CommTimeTask.java
+JAVA_TESTS=CommTimeTest.class

 
 

-#if HAVE_JAVA
- # Declare test class
- TESTS=CommTimeTest.class
-#endif
+# Declare test class
+if HAVE_JAVA
+noinst_JAVA=$(JAVA_SRC)
+TESTS=$(JAVA_TESTS)
+else
+EXTRA_DIST+=$(JAVA_SRC)
+EXTRA_DIST+=$(JAVA_TESTS)
+endif

 
 include $(srcdir)/../java_test.mk
 
 
 include $(srcdir)/../java_test.mk
 

diff --git a/examples/java/ping_pong/Makefile.am b/examples/java/ping_pong/Makefile.am
index 5b3fede..6250994 100644 (file)
--- a/examples/java/ping_pong/Makefile.am
+++ b/examples/java/ping_pong/Makefile.am
@@ -1,12 +1,17 @@
 EXTRA_DIST=ping_pong_deployment.xml ping_pong_platform.xml
 
 # Declare sources:
 EXTRA_DIST=ping_pong_deployment.xml ping_pong_platform.xml
 
 # Declare sources:

-noinst_JAVA= Sender.java Receiver.java PingPongTask.java PingPongTest.java
+JAVA_SRC=Sender.java Receiver.java PingPongTask.java PingPongTest.java
+JAVA_TESTS=PingPongTest.class

 
 # Declare test class
 
 # Declare test class

-#if HAVE_JAVA
-TESTS=PingPongTest.class
-#endif
+if HAVE_JAVA
+noinst_JAVA=$(JAVA_SRC)
+TESTS=$(JAVA_TESTS)
+else
+EXTRA_DIST+=$(JAVA_SRC)
+EXTRA_DIST+=$(JAVA_TESTS)
+endif

 
 include $(srcdir)/../java_test.mk
 
 
 include $(srcdir)/../java_test.mk
 

diff --git a/examples/java/suspend/Makefile.am b/examples/java/suspend/Makefile.am
index 5e83d6f..f51b61f 100644 (file)
--- a/examples/java/suspend/Makefile.am
+++ b/examples/java/suspend/Makefile.am
@@ -1,10 +1,17 @@
 EXTRA_DIST=suspend_deployment.xml suspend_platform.xml
 
 # Declare sources:
 EXTRA_DIST=suspend_deployment.xml suspend_platform.xml
 
 # Declare sources:

-noinst_JAVA= DreamMaster.java LazyGuy.java SuspendTest.java
+JAVA_SRC=DreamMaster.java LazyGuy.java SuspendTest.java
+JAVA_TESTS=SuspendTest.class

 
 

-# Declare test class 
-TESTS=SuspendTest.class
+# Declare test class
+if HAVE_JAVA
+noinst_JAVA=$(JAVA_SRC)
+TESTS=$(JAVA_TESTS)
+else
+EXTRA_DIST+=$(JAVA_SRC)
+EXTRA_DIST+=$(JAVA_TESTS)
+endif

 
 include $(srcdir)/../java_test.mk
 
 
 include $(srcdir)/../java_test.mk