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/components | |
| 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/components')
| -rw-r--r-- | sca-cpp/trunk/components/cache/Makefile.am | 4 | ||||
| -rw-r--r-- | sca-cpp/trunk/components/webservice/Makefile.am | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am index fa6c61607d..69946a13fb 100644 --- a/sca-cpp/trunk/components/cache/Makefile.am +++ b/sca-cpp/trunk/components/cache/Makefile.am @@ -23,9 +23,9 @@ comp_LTLIBRARIES = libmcache.la libmcache_la_SOURCES = mcache.cpp mcache_test_SOURCES = mcache-test.cpp -mcache_test_LDADD = -lxml2 +mcache_test_LDFLAGS = -lxml2 client_test_SOURCES = client-test.cpp -client_test_LDADD = -lxml2 -lcurl -lmozjs +client_test_LDFLAGS = -lxml2 -lcurl -lmozjs TESTS = memcached-test server-test diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am index e2971b5182..f4dc712b4f 100644 --- a/sca-cpp/trunk/components/webservice/Makefile.am +++ b/sca-cpp/trunk/components/webservice/Makefile.am @@ -25,14 +25,14 @@ compdir=$(prefix)/components/webservice comp_LTLIBRARIES = libwebservice.la libwebservice_la_SOURCES = webservice.cpp -libwebservice_la_LIBADD = -lxml2 -L${AXIS2C_LIB} -laxis2_engine +libwebservice_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine webservice_test_SOURCES = webservice-test.cpp -webservice_test_LDADD = -lxml2 -L${AXIS2C_LIB} -laxis2_engine +webservice_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine client_test_SOURCES = client-test.cpp -client_test_LDADD = -lxml2 -lcurl -lmozjs +client_test_LDFLAGS = -lxml2 -lcurl -lmozjs TESTS = webservice-test client-test -endif
\ No newline at end of file +endif |