From 14f2449fa9d78b7bde429a4996b20f51b8d0eb47 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 8 Mar 2010 06:16:14 +0000 Subject: Support different Java VMs, including Apache Harmony. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@920204 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/java/Makefile.am | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'sca-cpp/trunk/modules/java/Makefile.am') diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am index 5c640ac31b..293b9431b5 100644 --- a/sca-cpp/trunk/modules/java/Makefile.am +++ b/sca-cpp/trunk/modules/java/Makefile.am @@ -32,16 +32,19 @@ java.prefix: $(top_builddir)/config.status lib_LTLIBRARIES = libmod_tuscany_java.la libmod_tuscany_java_la_SOURCES = mod-java.cpp -libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava +libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs ${JAVA_LDFLAGS} noinst_DATA = libmod_tuscany_java.so libmod_tuscany_java.so: ln -s .libs/libmod_tuscany_java.so libmod_tuscany_java.so +jni_test_SOURCES = jni-test.cpp +jni_test_LDFLAGS = ${JAVA_LDFLAGS} + java_test_SOURCES = java-test.cpp -java_test_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava +java_test_LDFLAGS = ${JAVA_LDFLAGS} java_shell_SOURCES = java-shell.cpp -java_shell_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava +java_shell_LDFLAGS = ${JAVA_LDFLAGS} noinst_JAVA = org/apache/tuscany/*.java test/*.java jardir = ${prefix}/modules/java @@ -55,7 +58,7 @@ CLEANFILES = ${jarfile} org/apache/tuscany/*.class test/*.class client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -noinst_PROGRAMS = java-test java-shell client-test -TESTS = java-test server-test +noinst_PROGRAMS = jni-test java-test java-shell client-test +TESTS = jni-test java-test server-test endif -- cgit v1.2.3