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/samples/store-cpp/Makefile.am     | 7 ++++++-
 sca-cpp/trunk/samples/store-cpp/store.composite | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'sca-cpp/trunk/samples/store-cpp')

diff --git a/sca-cpp/trunk/samples/store-cpp/Makefile.am b/sca-cpp/trunk/samples/store-cpp/Makefile.am
index f429166519..c86d5a5ebc 100644
--- a/sca-cpp/trunk/samples/store-cpp/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cpp/Makefile.am
@@ -15,9 +15,14 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
+
+sample_SCRIPTS = start stop ssl-start
 sampledir = $(prefix)/samples/store-cpp
 
+nobase_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*
+
+sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
+
 libcurrency_converter_la_SOURCES = currency-converter.cpp
 
 libfruits_catalog_la_SOURCES = fruits-catalog.cpp
diff --git a/sca-cpp/trunk/samples/store-cpp/store.composite b/sca-cpp/trunk/samples/store-cpp/store.composite
index 056f7b4c68..abb38add02 100644
--- a/sca-cpp/trunk/samples/store-cpp/store.composite
+++ b/sca-cpp/trunk/samples/store-cpp/store.composite
@@ -23,7 +23,7 @@
   name="store">
         
     <component name="Catalog">
-        <implementation.cpp path=".libs" library="libfruits-catalog"/> 
+        <implementation.cpp path="." library="libfruits-catalog"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
             <t:binding.jsonrpc uri="catalog"/>
@@ -32,7 +32,7 @@
     </component> 
      
     <component name="ShoppingCart">
-        <implementation.cpp path=".libs" library="libshopping-cart"/>
+        <implementation.cpp path="." library="libshopping-cart"/>
         <service name="ShoppingCart">
             <t:binding.atom uri="shoppingCart"/>
         </service>        
@@ -43,14 +43,14 @@
     </component>
     
     <component name="CurrencyConverter">
-        <implementation.cpp path=".libs" library="libcurrency-converter"/>
+        <implementation.cpp path="." library="libcurrency-converter"/>
         <service name="CurrencyConverter">
             <t:binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
-        <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
+        <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>
-- 
cgit v1.2.3