diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-17 09:02:57 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-17 09:02:57 +0000 |
| commit | cd55407949abee58e663cad28945ce48d0fb2a52 (patch) | |
| tree | 81f828ec076a27042105ee12000b8f4f8f509403 /sca-cpp/trunk/modules/java/Makefile.am | |
| parent | e34c4a9109bbbb28d7ecef7cccccdc537008f8a5 (diff) | |
Simplified Makefiles a bit. Added -R options to configure shared library runtime search path and not require LD_LIBRARY_PATH anymore. Refactored test shell scripts and added a store-cpp integration test.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900073 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/java/Makefile.am')
| -rw-r--r-- | sca-cpp/trunk/modules/java/Makefile.am | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am index 790277104b..f103a232fa 100644 --- a/sca-cpp/trunk/modules/java/Makefile.am +++ b/sca-cpp/trunk/modules/java/Makefile.am @@ -17,23 +17,30 @@ datadir=$(prefix)/modules/java JAVAROOT = $(top_builddir)/modules/java +libdir=$(prefix)/lib if WANT_JAVA -noinst_PROGRAMS = java-test java-shell +noinst_PROGRAMS = java-test java-shell client-test + +lib_LTLIBRARIES = libmod_tuscany_java.la INCLUDES = -I${JAVA_INCLUDE} +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 + java_test_SOURCES = java-test.cpp -java_test_LDADD = -L${JAVA_LIB} -ljava -java_test_LDFLAGS = -rpath ${JAVA_LIB} -rpath ${JAVA_LIB}/server +java_test_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava java_shell_SOURCES = java-shell.cpp -java_shell_LDADD = -L${JAVA_LIB} -ljava -java_shell_LDFLAGS = -rpath ${JAVA_LIB} -rpath ${JAVA_LIB}/server +java_shell_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava noinst_JAVA = org/apache/tuscany/*.java test/*.java -TESTS = java-test +client_test_SOURCES = client-test.cpp +client_test_LDFLAGS = -lxml2 -lcurl -lmozjs + +TESTS = java-test server-test -endif
\ No newline at end of file +endif |