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

[simgrid.git] / examples / java / ping_pong / Makefile.in

diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in
index fba85c6..b13df98 100644 (file)
--- a/examples/java/ping_pong/Makefile.in
+++ b/examples/java/ping_pong/Makefile.in
@@ -135,6 +135,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
+SMPI_DEP = @SMPI_DEP@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING = @WARNING@
@@ -196,16 +197,18 @@ 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 surfxml.dtd
+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 = -cp $(top_srcdir)/src/simgrid.jar
+AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
 
 ##########################
 # What to do on make check
@@ -481,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.