Fix source distribution build scripts, add missing files to the dist targets.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949466 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 30 insertions, 8 deletions

diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am
index 150cf9ddae..df802babab 100644
--- a/sca-cpp/trunk/components/cache/Makefile.am
+++ b/sca-cpp/trunk/components/cache/Makefile.am
@@ -15,13 +15,15 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-comp_SCRIPTS = memcached-start memcached-stop
+dist_comp_SCRIPTS = memcached-start memcached-stop
 compdir=$(prefix)/components/cache
 
 comp_DATA = memcached.prefix
 memcached.prefix: $(top_builddir)/config.status
 	echo ${MEMCACHED_PREFIX} >memcached.prefix
 
+EXTRA_DIST = memcache.composite
+
 comp_LTLIBRARIES = libmemcache.la
 libmemcache_la_SOURCES = memcache.cpp
 noinst_DATA = libmemcache.so
@@ -34,5 +36,6 @@ memcache_test_LDFLAGS = -lxml2
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = memcached-test server-test
 noinst_PROGRAMS = memcache-test client-test
 TESTS = memcached-test server-test
diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am
index e7093caa2e..c82e94c371 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -21,13 +21,15 @@ if WANT_CHAT
 
 INCLUDES = -I${LIBSTROPHE_INCLUDE}
 
-comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
+dist_comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
 compdir=$(prefix)/components/chat
 
 comp_DATA = vysper.prefix
 vysper.prefix: $(top_builddir)/config.status
 	echo ${VYSPER_PREFIX} >vysper.prefix
 
+EXTRA_DIST = chat.composite *.scm
+
 comp_LTLIBRARIES = libchatter.la
 libchatter_la_SOURCES = chatter.cpp
 libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
@@ -42,13 +44,15 @@ client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
 
 noinst_PROGRAMS = xmpp-test client-test
+dist_noinst_SCRIPTS = server-test
 
 if WANT_VYSPER
 
 AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath ${VYSPER_PREFIX}`${JAVAROOT}
-noinst_JAVA = test/*.java
+dist_noinst_JAVA = test/*.java
 CLEANFILES = test/*.class
 
+dist_noinst_SCRIPTS += echo-test
 TESTS = echo-test 
 endif
 
diff --git a/sca-cpp/trunk/components/log/Makefile.am b/sca-cpp/trunk/components/log/Makefile.am
index 2dd4ab861a..6b03c215c9 100644
--- a/sca-cpp/trunk/components/log/Makefile.am
+++ b/sca-cpp/trunk/components/log/Makefile.am
@@ -19,7 +19,7 @@ if WANT_LOG
 
 INCLUDES = -I${THRIFT_INCLUDE} -I${FB303_INCLUDE}
 
-comp_SCRIPTS = scribed-central-conf scribed-client-conf scribed-central-start scribed-central-stop scribed-client-start scribed-client-stop scribe-cat
+dist_comp_SCRIPTS = scribed-central-conf scribed-client-conf scribed-central-start scribed-central-stop scribed-client-start scribed-client-stop scribe-cat
 compdir=$(prefix)/components/log
 
 comp_DATA = scribe.prefix thrift.prefix scribecat.py
@@ -29,6 +29,8 @@ scribe.prefix: $(top_builddir)/config.status
 thrift.prefix: $(top_builddir)/config.status
 	echo ${THRIFT_PREFIX} >thrift.prefix
 
+EXTRA_DIST = log.composite *.py *.scm *.thrift
+
 BUILT_SOURCES=gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h
 gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h: scribe.thrift
 	${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift
@@ -55,6 +57,7 @@ liblogger.so:
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = scribe-test server-test
 noinst_PROGRAMS = client-test
 TESTS = scribe-test server-test
 
diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am
index 12e88308b9..99a21d7607 100644
--- a/sca-cpp/trunk/components/nosqldb/Makefile.am
+++ b/sca-cpp/trunk/components/nosqldb/Makefile.am
@@ -19,13 +19,15 @@ if WANT_NOSQLDB
 
 INCLUDES = -I${TINYCDB_INCLUDE}
 
-comp_SCRIPTS = tinycdb
+dist_comp_SCRIPTS = tinycdb
 compdir=$(prefix)/components/nosqldb
 
 comp_DATA = tinycdb.prefix
 tinycdb.prefix: $(top_builddir)/config.status
 	echo ${TINYCDB_PREFIX} >tinycdb.prefix
 
+EXTRA_DIST = nosqldb.composite
+
 comp_LTLIBRARIES = libnosqldb.la
 noinst_DATA = libnosqldb.so
 
@@ -40,6 +42,7 @@ tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = nosqldb-test server-test
 noinst_PROGRAMS = tinycdb-test client-test
 TESTS = nosqldb-test server-test
 
diff --git a/sca-cpp/trunk/components/queue/Makefile.am b/sca-cpp/trunk/components/queue/Makefile.am
index 2a6f83d5ce..cbd81a5993 100644
--- a/sca-cpp/trunk/components/queue/Makefile.am
+++ b/sca-cpp/trunk/components/queue/Makefile.am
@@ -19,13 +19,15 @@ if WANT_QUEUE
 
 INCLUDES = -I${QPIDC_INCLUDE}
 
-comp_SCRIPTS = qpidd-start qpidd-stop
+dist_comp_SCRIPTS = qpidd-start qpidd-stop
 compdir=$(prefix)/components/queue
 
 comp_DATA = qpidc.prefix
 qpidc.prefix: $(top_builddir)/config.status
 	echo ${QPIDC_PREFIX} >qpidc.prefix
 
+EXTRA_DIST = queue.composite *.scm
+
 comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
 noinst_DATA = libqueue-sender.so libqueue-listener.so
 
@@ -45,6 +47,7 @@ qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
 
+dist_noinst_SCRIPTS = send-test server-test
 noinst_PROGRAMS = qpid-test client-test
 TESTS = send-test server-test
 
diff --git a/sca-cpp/trunk/components/sqldb/Makefile.am b/sca-cpp/trunk/components/sqldb/Makefile.am
index 8abf252d92..d51b8aa7b1 100644
--- a/sca-cpp/trunk/components/sqldb/Makefile.am
+++ b/sca-cpp/trunk/components/sqldb/Makefile.am
@@ -19,13 +19,15 @@ if WANT_SQLDB
 
 INCLUDES = -I${PGSQL_INCLUDE}
 
-comp_SCRIPTS = pgsql-start pgsql-stop pgsql
+dist_comp_SCRIPTS = pgsql-start pgsql-stop pgsql
 compdir=$(prefix)/components/sqldb
 
 comp_DATA = pgsql.prefix
 pgsql.prefix: $(top_builddir)/config.status
 	echo ${PGSQL_PREFIX} >pgsql.prefix
 
+EXTRA_DIST = sqldb.composite
+
 comp_LTLIBRARIES = libsqldb.la
 noinst_DATA = libsqldb.so
 
@@ -40,6 +42,7 @@ pgsql_test_LDFLAGS = -L${PGSQL_LIB} -R${PGSQL_LIB} -lpq
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = sqldb-test server-test
 noinst_PROGRAMS = pgsql-test client-test
 TESTS = sqldb-test server-test
 
diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am
index accc098b79..4d659db44e 100644
--- a/sca-cpp/trunk/components/webservice/Makefile.am
+++ b/sca-cpp/trunk/components/webservice/Makefile.am
@@ -19,11 +19,13 @@ if WANT_WEBSERVICE
 
 INCLUDES = -I${AXIS2C_INCLUDE}
 
-comp_SCRIPTS = axis2-conf
+dist_comp_SCRIPTS = axis2-conf
 compdir=$(prefix)/components/webservice
 
 comp_DATA = axis2c.prefix axis2.xml services.xml module.xml
 
+EXTRA_DIST = webservice.composite axis2.xml services.xml module.xml *.scm
+
 axis2c.prefix: $(top_builddir)/config.status
 	echo ${AXIS2C_PREFIX} >axis2c.prefix
 
@@ -59,6 +61,7 @@ axis2_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxi
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
 
+dist_noinst_SCRIPTS = echo-test server-test
 noinst_PROGRAMS = axiom-test axis2-test client-test
 TESTS = axiom-test echo-test server-test