From e5a49fff24c79431782da107185431b7835ef492 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 29 May 2010 19:44:35 +0000
Subject: Fix distribution build, add missing files and samples and fix path to
 libraries. GCC 4.5 is used if available but not installed automatically.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949435 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/server/Makefile.am           | 10 +++++++---
 sca-cpp/trunk/modules/server/domain-test.composite |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'sca-cpp/trunk/modules/server')

diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index 06323aad05..a14382e114 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -27,16 +27,20 @@ noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
 libmod_tuscany_eval_la_SOURCES = mod-eval.cpp
 libmod_tuscany_eval_la_LDFLAGS = -lxml2 -lcurl -lmozjs
 libmod_tuscany_eval.so:
-	ln -s .libs/libmod_tuscany_eval.so libmod_tuscany_eval.so
+	ln -s .libs/libmod_tuscany_eval.so
 
 libmod_tuscany_wiring_la_SOURCES = mod-wiring.cpp
 libmod_tuscany_wiring_la_LDFLAGS = -lxml2 -lcurl -lmozjs
 libmod_tuscany_wiring.so:
-	ln -s .libs/libmod_tuscany_wiring.so libmod_tuscany_wiring.so
+	ln -s .libs/libmod_tuscany_wiring.so
 
-noinst_testdir = $(prefix)/test
 noinst_test_LTLIBRARIES = libimpl-test.la
+noinst_testdir = `pwd`/tmp
+noinst_DATA += libimpl-test.so
+
 libimpl_test_la_SOURCES = impl-test.cpp
+libimpl-test.so:
+	ln -s .libs/libimpl-test.so
 
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
diff --git a/sca-cpp/trunk/modules/server/domain-test.composite b/sca-cpp/trunk/modules/server/domain-test.composite
index ef85bb919b..048c451ef6 100644
--- a/sca-cpp/trunk/modules/server/domain-test.composite
+++ b/sca-cpp/trunk/modules/server/domain-test.composite
@@ -30,7 +30,7 @@
     </component>     
 
     <component name="cpp-test">
-        <implementation.cpp path=".libs" library="libimpl-test"/>
+        <implementation.cpp path="." library="libimpl-test"/>
         <service name="cpp">
             <t:binding.http uri="cpp"/>
         </service>
-- 
cgit v1.2.3