8 files changed, 21 insertions, 6 deletions
diff --git a/sca-cpp/trunk/components/Makefile.am b/sca-cpp/trunk/components/Makefile.am
index bce570da90..e0e5f5e935 100644
--- a/sca-cpp/trunk/components/Makefile.am
+++ b/sca-cpp/trunk/components/Makefile.am
@@ -17,6 +17,3 @@
 
 SUBDIRS = cache chat log nosqldb queue sqldb webservice
 
-includedir = $(prefix)/include/components
-nobase_include_HEADERS = */*.hpp
-
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am
index df802babab..4af8acd6bf 100644
--- a/sca-cpp/trunk/components/cache/Makefile.am
+++ b/sca-cpp/trunk/components/cache/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/cache
+
 dist_comp_SCRIPTS = memcached-start memcached-stop
 compdir=$(prefix)/components/cache
 
diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am
index 5e48f74065..64b1e070d3 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -21,6 +21,9 @@ if WANT_CHAT
 
 INCLUDES = -I${LIBSTROPHE_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/chat
+
 dist_comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
 compdir=$(prefix)/components/chat
 
diff --git a/sca-cpp/trunk/components/log/Makefile.am b/sca-cpp/trunk/components/log/Makefile.am
index 6b03c215c9..0408607b59 100644
--- a/sca-cpp/trunk/components/log/Makefile.am
+++ b/sca-cpp/trunk/components/log/Makefile.am
@@ -19,6 +19,9 @@ if WANT_LOG
 
 INCLUDES = -I${THRIFT_INCLUDE} -I${FB303_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/log
+
 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
 
diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am
index 99a21d7607..30beaccdbf 100644
--- a/sca-cpp/trunk/components/nosqldb/Makefile.am
+++ b/sca-cpp/trunk/components/nosqldb/Makefile.am
@@ -15,10 +15,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-if WANT_NOSQLDB
-
 INCLUDES = -I${TINYCDB_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/nosqldb
+
 dist_comp_SCRIPTS = tinycdb
 compdir=$(prefix)/components/nosqldb
 
@@ -46,4 +47,3 @@ dist_noinst_SCRIPTS = nosqldb-test server-test
 noinst_PROGRAMS = tinycdb-test client-test
 TESTS = nosqldb-test server-test
 
-endif
diff --git a/sca-cpp/trunk/components/queue/Makefile.am b/sca-cpp/trunk/components/queue/Makefile.am
index cbd81a5993..ef96cd7107 100644
--- a/sca-cpp/trunk/components/queue/Makefile.am
+++ b/sca-cpp/trunk/components/queue/Makefile.am
@@ -19,6 +19,9 @@ if WANT_QUEUE
 
 INCLUDES = -I${QPIDC_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/queue
+
 dist_comp_SCRIPTS = qpidd-start qpidd-stop
 compdir=$(prefix)/components/queue
 
diff --git a/sca-cpp/trunk/components/sqldb/Makefile.am b/sca-cpp/trunk/components/sqldb/Makefile.am
index d51b8aa7b1..e5c03f5190 100644
--- a/sca-cpp/trunk/components/sqldb/Makefile.am
+++ b/sca-cpp/trunk/components/sqldb/Makefile.am
@@ -19,6 +19,9 @@ if WANT_SQLDB
 
 INCLUDES = -I${PGSQL_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/sqldb
+
 dist_comp_SCRIPTS = pgsql-start pgsql-stop pgsql
 compdir=$(prefix)/components/sqldb
 
diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am
index 4d659db44e..d53b7e6d0c 100644
--- a/sca-cpp/trunk/components/webservice/Makefile.am
+++ b/sca-cpp/trunk/components/webservice/Makefile.am
@@ -19,6 +19,9 @@ if WANT_WEBSERVICE
 
 INCLUDES = -I${AXIS2C_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/components/webservice
+
 dist_comp_SCRIPTS = axis2-conf
 compdir=$(prefix)/components/webservice