[PPL-devel] [GIT] ppl/ppl(master): We cannot test the Java interface unless ENABLE_SHARED.

[Roberto Bagnara]

Module: ppl/ppl
Branch: master
Commit: b94dc7951129d065d858b6dbd932eac59a643f96
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b94dc7951129d065d858b6dbd932eac59a643f96

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Tue May 12 18:04:44 2009 +0200

We cannot test the Java interface unless ENABLE_SHARED.

---

 interfaces/Java/tests/Makefile.am |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
index d616fec..9c700d4 100644
--- a/interfaces/Java/tests/Makefile.am
+++ b/interfaces/Java/tests/Makefile.am
@@ -63,13 +63,17 @@ Parma_Polyhedra_Library_test1.java \
 Parma_Polyhedra_Library_test2.java \
 PPL_Test.java
 
+if ENABLE_SHARED
+
 CLASSPATH = ../ppl_java.jar:.
 JAVACFLAGS = -classpath $(CLASSPATH)
 
 PPL_DLOPEN = -dlopen ../../../src/libppl.la
 
 if BUILD_WATCHDOG_LIBRARY
+
 PWL_DLOPEN = -dlopen ../../../Watchdog/src/libpwl.la
+
 endif BUILD_WATCHDOG_LIBRARY
 
 java_test_environment = \
@@ -77,6 +81,12 @@ $(LIBTOOL) --mode=execute $(PPL_DLOPEN) $(PWL_DLOPEN) \
 	$(JAVA) -classpath .:../ppl_java.jar \
 		-Djava.library.path=../jni/.libs
 
+ppl_java_generated_tests.java: $(interface_generator_dependencies)
+	$(M4) --prefix-builtin -I../.. \
+		-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+		$(srcdir)/ppl_interface_generator_java_test_java.m4 \
+			> $@
+
 check-local: ppl_java_generated_tests.java
 	$(java_test_environment) ppl_java_generated_tests
 	$(java_test_environment) C_Polyhedron_test1
@@ -85,14 +95,10 @@ check-local: ppl_java_generated_tests.java
 	$(java_test_environment) Parma_Polyhedra_Library_test1
 	$(java_test_environment) Parma_Polyhedra_Library_test2
 
-ppl_java_generated_tests.java: $(interface_generator_dependencies)
-	$(M4) --prefix-builtin -I../.. \
-		-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-		$(srcdir)/ppl_interface_generator_java_test_java.m4 \
-			> $@
-
 CLEANFILES = \
 ppl_java_generated_tests.java
 
+endif ENABLE_SHARED
+
 $(top_builddir)/interfaces/ppl_interface_instantiations.m4:
 	$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/interfaces ppl_interface_instantiations.m4