Stop trying to add the .class files into the dist (plus indentation)

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

diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am
index 298b301..fe055df 100644 (file)
--- a/examples/java/basic/Makefile.am
+++ b/examples/java/basic/Makefile.am
@@ -8,10 +8,8 @@ EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
-noinst_JAVA=$(JAVA_SRC)
-TESTS=$(JAVA_TESTS)
-else
-EXTRA_DIST+=$(JAVA_TESTS)
+  noinst_JAVA=$(JAVA_SRC)
+  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 1a9a234..f7547dc 100644 (file)
--- a/examples/java/basic/Makefile.in
+++ b/examples/java/basic/Makefile.in
@@ -197,13 +197,15 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = basic_deployment.xml basic_platform.xml
+EXTRA_DIST = basic_deployment.xml basic_platform.xml $(JAVA_SRC)
 
 # 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
-TESTS = BasicTest.class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
+@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
 

diff --git a/examples/java/comm_time/Makefile.am b/examples/java/comm_time/Makefile.am
index 1a38e8c..63c3012 100644 (file)
--- a/examples/java/comm_time/Makefile.am
+++ b/examples/java/comm_time/Makefile.am
@@ -8,10 +8,8 @@ EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
-noinst_JAVA=$(JAVA_SRC)
-TESTS=$(JAVA_TESTS)
-else
-EXTRA_DIST+=$(JAVA_TESTS)
+  noinst_JAVA=$(JAVA_SRC)
+  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in
index 45e19ce..7058076 100644 (file)
--- a/examples/java/comm_time/Makefile.in
+++ b/examples/java/comm_time/Makefile.in
@@ -197,11 +197,16 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml
+EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml \
+       $(JAVA_SRC)
 
 # Declare sources:
-noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
-TESTS = CommTimeTest.class
+JAVA_SRC = Master.java Slave.java CommTimeTest.java CommTimeTask.java
+JAVA_TESTS = CommTimeTest.class
+
+# Declare test class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
+@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
 
@@ -472,9 +477,6 @@ uninstall-am:
        uninstall uninstall-am
 
 
-#if HAVE_JAVA
- # Declare test class
-
 # declare that we must recompile everything before lauching tests
 $(TESTS): classnoinst.stamp
 
@@ -482,7 +484,6 @@ dist-files:
        @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
        @echo
        @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
-#endif
 
 # Cruft
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/examples/java/ping_pong/Makefile.am b/examples/java/ping_pong/Makefile.am
index 5e23b21..564a8aa 100644 (file)
--- a/examples/java/ping_pong/Makefile.am
+++ b/examples/java/ping_pong/Makefile.am
@@ -8,10 +8,8 @@ EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
-noinst_JAVA=$(JAVA_SRC)
-TESTS=$(JAVA_TESTS)
-else
-EXTRA_DIST+=$(JAVA_TESTS)
+  noinst_JAVA=$(JAVA_SRC)
+  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in
index b7c2421..b13df98 100644 (file)
--- a/examples/java/ping_pong/Makefile.in
+++ b/examples/java/ping_pong/Makefile.in
@@ -197,14 +197,16 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ping_pong_deployment.xml ping_pong_platform.xml
+EXTRA_DIST = ping_pong_deployment.xml ping_pong_platform.xml \
+       $(JAVA_SRC)
 
 # 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
-#if HAVE_JAVA
-TESTS = PingPongTest.class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
+@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
 
@@ -482,7 +484,6 @@ dist-files:
        @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
        @echo
        @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
-#endif
 
 # Cruft
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/examples/java/suspend/Makefile.am b/examples/java/suspend/Makefile.am
index cdf77df..84d03bd 100644 (file)
--- a/examples/java/suspend/Makefile.am
+++ b/examples/java/suspend/Makefile.am
@@ -8,10 +8,8 @@ EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
-noinst_JAVA=$(JAVA_SRC)
-TESTS=$(JAVA_TESTS)
-else
-EXTRA_DIST+=$(JAVA_TESTS)
+  noinst_JAVA=$(JAVA_SRC)
+  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in
index 85aa48d..2f5a6f5 100644 (file)
--- a/examples/java/suspend/Makefile.in
+++ b/examples/java/suspend/Makefile.in
@@ -197,13 +197,15 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = suspend_deployment.xml suspend_platform.xml
+EXTRA_DIST = suspend_deployment.xml suspend_platform.xml $(JAVA_SRC)
 
 # 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
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
+@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.