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

(limited to 'sca-cpp/trunk/components/sqldb')

diff --git a/sca-cpp/trunk/components/sqldb/Makefile.am b/sca-cpp/trunk/components/sqldb/Makefile.am
index d474dafb25..8abf252d92 100644
--- a/sca-cpp/trunk/components/sqldb/Makefile.am
+++ b/sca-cpp/trunk/components/sqldb/Makefile.am
@@ -19,7 +19,7 @@ if WANT_SQLDB
 
 INCLUDES = -I${PGSQL_INCLUDE}
 
-comp_SCRIPTS = pgsql-start pgsql-stop
+comp_SCRIPTS = pgsql-start pgsql-stop pgsql
 compdir=$(prefix)/components/sqldb
 
 comp_DATA = pgsql.prefix
@@ -27,9 +27,12 @@ pgsql.prefix: $(top_builddir)/config.status
 	echo ${PGSQL_PREFIX} >pgsql.prefix
 
 comp_LTLIBRARIES = libsqldb.la
+noinst_DATA = libsqldb.so
 
 libsqldb_la_SOURCES = sqldb.cpp
 libsqldb_la_LDFLAGS = -L${PGSQL_LIB} -R${PGSQL_LIB} -lpq
+libsqldb.so:
+	ln -s .libs/libsqldb.so
 
 pgsql_test_SOURCES = pgsql-test.cpp
 pgsql_test_LDFLAGS = -L${PGSQL_LIB} -R${PGSQL_LIB} -lpq
diff --git a/sca-cpp/trunk/components/sqldb/sqldb.composite b/sca-cpp/trunk/components/sqldb/sqldb.composite
index 9675340b0c..a27332e649 100644
--- a/sca-cpp/trunk/components/sqldb/sqldb.composite
+++ b/sca-cpp/trunk/components/sqldb/sqldb.composite
@@ -23,7 +23,7 @@
   name="sqldb">
         
     <component name="sqldb">
-        <implementation.cpp path=".libs" library="libsqldb"/>
+        <implementation.cpp path="." library="libsqldb"/>
         <property name="conninfo">dbname=db</property>
         <property name="table">test</property>
         <service name="sqldb">
-- 
cgit v1.2.3