archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes to distro build. Added missing scripts. Placed libraries in the correct module and component directories.

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@917438 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jsdelfino 2010-03-01 09:59:18 +00:00
commit 99af35834f
24 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sca-cpp/trunk/modules/java/Makefile.am
View file

@ -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
lib_LTLIBRARIES = libmod_tuscany_java.la
INCLUDES = -I${JAVA_INCLUDE}
mod_SCRIPTS = java-conf
moddir = $(prefix)/modules/java
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