From 99af35834fb7655f090af2a3ec01d09d3aa3f69c Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 1 Mar 2010 09:59:18 +0000
Subject: Minor fixes to distro build. Added missing scripts. Placed libraries
 in the correct module and component directories.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@917438 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/java/Makefile.am | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 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 5402ab495e..458a8f977b 100644
--- a/sca-cpp/trunk/modules/java/Makefile.am
+++ b/sca-cpp/trunk/modules/java/Makefile.am
@@ -15,19 +15,27 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+libdir = $(prefix)/modules/java
 JAVAROOT = $(top_builddir)/modules/java
-libdir = $(prefix)/lib
 
 if WANT_JAVA
 
-noinst_PROGRAMS = java-test java-shell client-test
+INCLUDES = -I${JAVA_INCLUDE}
 
-lib_LTLIBRARIES = libmod_tuscany_java.la
+mod_SCRIPTS = java-conf
+moddir = $(prefix)/modules/java
 
-INCLUDES = -I${JAVA_INCLUDE}
+prefix_DATA = java.prefix
+prefixdir = $(prefix)/modules/java
+java.prefix: $(top_builddir)/config.status
+	echo ${JAVA_PREFIX} >java.prefix
 
+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
+noinst_DATA = libmod_tuscany_java.so
+libmod_tuscany_java.so:
+	ln -s .libs/libmod_tuscany_java.so libmod_tuscany_java.so
 
 java_test_SOURCES = java-test.cpp
 java_test_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava
@@ -36,11 +44,9 @@ java_shell_SOURCES = java-shell.cpp
 java_shell_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava
 
 noinst_JAVA = org/apache/tuscany/*.java test/*.java
-
+jardir = ${prefix}/modules/java
 jarfile = libmod-tuscany-java-${PACKAGE_VERSION}.jar
-jardir = ${libdir}
 jar_DATA = ${jarfile}
-
 ${jarfile}: ${noinst_JAVA}
 	${JAR} cf $@ org/apache/tuscany/*.class
 
@@ -49,12 +55,7 @@ CLEANFILES = ${jarfile} org/apache/tuscany/*.class	test/*.class
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-prefixdir = $(top_builddir)/modules/java
-prefix_DATA = java.prefix
-
-java.prefix: $(top_builddir)/config.status
-	echo ${JAVA_PREFIX} >java.prefix
-
+noinst_PROGRAMS = java-test java-shell client-test
 TESTS = java-test server-test
 
 endif
-- 
cgit v1.2.3