5 files changed, 18 insertions, 21 deletions
diff --git a/sca-cpp/trunk/components/Makefile.am b/sca-cpp/trunk/components/Makefile.am
index e4a0f051f0..ad006ee798 100644
--- a/sca-cpp/trunk/components/Makefile.am
+++ b/sca-cpp/trunk/components/Makefile.am
@@ -20,5 +20,3 @@ SUBDIRS = cache chat log queue store webservice
 includedir = $(prefix)/include/components
 nobase_include_HEADERS = */*.hpp
 
-compdir = $(prefix)/components
-nobase_comp_DATA = */*.composite
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am
index 69946a13fb..d9ab3f805b 100644
--- a/sca-cpp/trunk/components/cache/Makefile.am
+++ b/sca-cpp/trunk/components/cache/Makefile.am
@@ -15,11 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = mcache-test client-test
-
+comp_SCRIPTS = memcached-start memcached-stop
 compdir=$(prefix)/components/cache
-comp_LTLIBRARIES = libmcache.la
 
+comp_LTLIBRARIES = libmcache.la
 libmcache_la_SOURCES = mcache.cpp
 
 mcache_test_SOURCES = mcache-test.cpp
@@ -28,4 +27,5 @@ mcache_test_LDFLAGS = -lxml2
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+noinst_PROGRAMS = mcache-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 11e3179e8a..944484946e 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -17,13 +17,10 @@
 
 if WANT_CHAT
 
-noinst_PROGRAMS = xmpp-test client-test
-
 INCLUDES = -I${LIBSTROPHE_INCLUDE} -I${LIBSTROPHE_INCLUDE}/src
 
-compdir=$(prefix)/components/chat
 comp_LTLIBRARIES = libchatter.la
-
+compdir=$(prefix)/components/chat
 libchatter_la_SOURCES = chatter.cpp
 libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
 
@@ -33,4 +30,6 @@ xmpp_test_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -l
 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
+
 endif
diff --git a/sca-cpp/trunk/components/queue/Makefile.am b/sca-cpp/trunk/components/queue/Makefile.am
index 09ff0e54a4..f814629bce 100644
--- a/sca-cpp/trunk/components/queue/Makefile.am
+++ b/sca-cpp/trunk/components/queue/Makefile.am
@@ -17,13 +17,16 @@
 
 if WANT_QUEUE
 
-noinst_PROGRAMS = qpid-test client-test
-
 INCLUDES = -I${QPIDC_INCLUDE}
 
+comp_SCRIPTS = qpidd-start qpidd-stop
 compdir=$(prefix)/components/queue
-comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
+
 comp_DATA = qpidc.prefix
+qpidc.prefix: $(top_builddir)/config.status
+	echo ${QPIDC_PREFIX} >qpidc.prefix
+
+comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
 
 libqueue_sender_la_SOURCES = queue-sender.cpp
 libqueue_sender_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
@@ -37,9 +40,7 @@ qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
 
-qpidc.prefix: $(top_builddir)/config.status
-	echo ${QPIDC_PREFIX} >qpidc.prefix
-
+noinst_PROGRAMS = qpid-test client-test
 TESTS = send-test server-test
 
 endif
diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am
index 264b150c93..3f0ef3373e 100644
--- a/sca-cpp/trunk/components/webservice/Makefile.am
+++ b/sca-cpp/trunk/components/webservice/Makefile.am
@@ -17,13 +17,14 @@
 
 if WANT_WEBSERVICE
 
-noinst_PROGRAMS = axiom-test axis2-test client-test
-
 INCLUDES = -I${AXIS2C_INCLUDE}
 
+comp_DATA = axis2c.prefix
 compdir=$(prefix)/components/webservice
+axis2c.prefix: $(top_builddir)/config.status
+	echo ${AXIS2C_PREFIX} >axis2c.prefix
+
 comp_LTLIBRARIES = libwebservice-client.la libwebservice-listener.la libaxis2-dispatcher.la libaxis2-service.la
-comp_DATA = axis2c.prefix
 
 libwebservice_client_la_SOURCES = webservice-client.cpp
 libwebservice_client_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
@@ -46,9 +47,7 @@ axis2_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
 
-axis2c.prefix: $(top_builddir)/config.status
-	echo ${AXIS2C_PREFIX} >axis2c.prefix
-
+noinst_PROGRAMS = axiom-test axis2-test client-test
 TESTS = axiom-test echo-test server-test
 
 endif