14 files changed, 62 insertions, 54 deletions
diff --git a/sca-cpp/trunk/modules/atom/Makefile.am b/sca-cpp/trunk/modules/atom/Makefile.am
index c39caa34c3..6eccee83c7 100644
--- a/sca-cpp/trunk/modules/atom/Makefile.am
+++ b/sca-cpp/trunk/modules/atom/Makefile.am
@@ -15,9 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = atom-test
-
 atom_test_SOURCES = atom-test.cpp
 atom_test_LDFLAGS = -lxml2
 
+noinst_PROGRAMS = atom-test
 TESTS = atom-test
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index b522113423..6d477c2946 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -15,17 +15,18 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = curl-test
-
 INCLUDES = -I${HTTPD_INCLUDE}
 
-httpdir=$(prefix)/modules/http
-http_DATA = httpd.prefix
+moddir=$(prefix)/modules/http
+mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart
 
 curl_test_SOURCES = curl-test.cpp
 curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+prefix_DATA = httpd.prefix
+prefixdir=$(prefix)/modules/http
 httpd.prefix: $(top_builddir)/config.status
 	echo ${HTTPD_PREFIX} >httpd.prefix
 
+noinst_PROGRAMS = curl-test
 TESTS = httpd-test http-test
diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am
index 5402ab495e..458a8f977b 100644
--- a/sca-cpp/trunk/modules/java/Makefile.am
+++ b/sca-cpp/trunk/modules/java/Makefile.am
@@ -15,19 +15,27 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+libdir = $(prefix)/modules/java
 JAVAROOT = $(top_builddir)/modules/java
-libdir = $(prefix)/lib
 
 if WANT_JAVA
 
-noinst_PROGRAMS = java-test java-shell client-test
+INCLUDES = -I${JAVA_INCLUDE}
 
-lib_LTLIBRARIES = libmod_tuscany_java.la
+mod_SCRIPTS = java-conf
+moddir = $(prefix)/modules/java
 
-INCLUDES = -I${JAVA_INCLUDE}
+prefix_DATA = java.prefix
+prefixdir = $(prefix)/modules/java
+java.prefix: $(top_builddir)/config.status
+	echo ${JAVA_PREFIX} >java.prefix
 
+lib_LTLIBRARIES = libmod_tuscany_java.la
 libmod_tuscany_java_la_SOURCES = mod-java.cpp
 libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava
+noinst_DATA = libmod_tuscany_java.so
+libmod_tuscany_java.so:
+	ln -s .libs/libmod_tuscany_java.so libmod_tuscany_java.so
 
 java_test_SOURCES = java-test.cpp
 java_test_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava
@@ -36,11 +44,9 @@ java_shell_SOURCES = java-shell.cpp
 java_shell_LDFLAGS = -L${JAVA_LIB} -R${JAVA_LIB} -R${JAVA_LIB}/server -ljava
 
 noinst_JAVA = org/apache/tuscany/*.java test/*.java
-
+jardir = ${prefix}/modules/java
 jarfile = libmod-tuscany-java-${PACKAGE_VERSION}.jar
-jardir = ${libdir}
 jar_DATA = ${jarfile}
-
 ${jarfile}: ${noinst_JAVA}
 	${JAR} cf $@ org/apache/tuscany/*.class
 
@@ -49,12 +55,7 @@ CLEANFILES = ${jarfile} org/apache/tuscany/*.class	test/*.class
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-prefixdir = $(top_builddir)/modules/java
-prefix_DATA = java.prefix
-
-java.prefix: $(top_builddir)/config.status
-	echo ${JAVA_PREFIX} >java.prefix
-
+noinst_PROGRAMS = java-test java-shell client-test
 TESTS = java-test server-test
 
 endif
diff --git a/sca-cpp/trunk/modules/java/java-conf b/sca-cpp/trunk/modules/java/java-conf
index fb02f7fe57..823bd38ce9 100755
--- a/sca-cpp/trunk/modules/java/java-conf
+++ b/sca-cpp/trunk/modules/java/java-conf
@@ -22,6 +22,6 @@ here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
 cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_java.so
+LoadModule mod_tuscany_eval $here/libmod_tuscany_java.so
 EOF
 
diff --git a/sca-cpp/trunk/modules/json/Makefile.am b/sca-cpp/trunk/modules/json/Makefile.am
index 5bd435fe99..fd00ebb4af 100644
--- a/sca-cpp/trunk/modules/json/Makefile.am
+++ b/sca-cpp/trunk/modules/json/Makefile.am
@@ -15,9 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = json-test
-
 json_test_SOURCES = json-test.cpp
 json_test_LDFLAGS = -lmozjs 
 
+noinst_PROGRAMS = json-test
 TESTS = json-test
diff --git a/sca-cpp/trunk/modules/python/Makefile.am b/sca-cpp/trunk/modules/python/Makefile.am
index 43f7cab5b9..55b4b8f7e7 100644
--- a/sca-cpp/trunk/modules/python/Makefile.am
+++ b/sca-cpp/trunk/modules/python/Makefile.am
@@ -15,25 +15,29 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-datadir=$(prefix)/modules/python
-libdir=$(prefix)/lib
+libdir=$(prefix)/modules/python
 
 if WANT_PYTHON
 
-noinst_PROGRAMS = python-test python-shell client-test
+INCLUDES = -I${PYTHON_INCLUDE}
 
-lib_LTLIBRARIES = libmod_tuscany_python.la
+mod_SCRIPTS = python-conf
+moddir = $(prefix)/modules/python
 
-nobase_data_DATA = *.xsd
-data_DATA = python.prefix
-
-INCLUDES = -I${PYTHON_INCLUDE}
+nobase_xsd_DATA = *.xsd
+xsddir = $(prefix)/xsd
 
+prefix_DATA = python.prefix
+prefixdir=$(prefix)/modules/python
 python.prefix: $(top_builddir)/config.status
 	echo ${PYTHON_PREFIX} >python.prefix
 
+lib_LTLIBRARIES = libmod_tuscany_python.la
 libmod_tuscany_python_la_SOURCES = mod-python.cpp
 libmod_tuscany_python_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
+noinst_DATA = libmod_tuscany_python.so
+libmod_tuscany_python.so:
+	ln -s .libs/libmod_tuscany_python.so libmod_tuscany_python.so
 
 python_test_SOURCES = python-test.cpp
 python_test_LDFLAGS = -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
@@ -44,6 +48,7 @@ python_shell_LDFLAGS = -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+noinst_PROGRAMS = python-test python-shell client-test
 TESTS = python-test server-test
 
 endif
diff --git a/sca-cpp/trunk/modules/python/python-conf b/sca-cpp/trunk/modules/python/python-conf
index 9bc99e2bbe..82decd8eb4 100755
--- a/sca-cpp/trunk/modules/python/python-conf
+++ b/sca-cpp/trunk/modules/python/python-conf
@@ -22,5 +22,5 @@ here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
 cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_python.so
+LoadModule mod_tuscany_eval $here/libmod_tuscany_python.so
 EOF
diff --git a/sca-cpp/trunk/modules/scdl/Makefile.am b/sca-cpp/trunk/modules/scdl/Makefile.am
index afbd35a8a7..542ce4be20 100644
--- a/sca-cpp/trunk/modules/scdl/Makefile.am
+++ b/sca-cpp/trunk/modules/scdl/Makefile.am
@@ -15,9 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = scdl-test
-
 scdl_test_SOURCES = scdl-test.cpp
 scdl_test_LDFLAGS = -lxml2
 
+noinst_PROGRAMS = scdl-test
 TESTS = scdl-test
diff --git a/sca-cpp/trunk/modules/scheme/Makefile.am b/sca-cpp/trunk/modules/scheme/Makefile.am
index f9bfe4e392..03556d0c45 100644
--- a/sca-cpp/trunk/modules/scheme/Makefile.am
+++ b/sca-cpp/trunk/modules/scheme/Makefile.am
@@ -15,13 +15,12 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = eval-test eval-shell
-
-datadir=$(prefix)/modules/eval
-nobase_data_DATA = *.xsd
+xsddir=$(prefix)/xsd
+nobase_xsd_DATA = *.xsd
 
 eval_test_SOURCES = eval-test.cpp
 
 eval_shell_SOURCES = eval-shell.cpp
 
+noinst_PROGRAMS = eval-test eval-shell
 TESTS = eval-test
diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index 9c18b45dad..39135d2212 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -15,25 +15,32 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = client-test
+INCLUDES = -I${HTTPD_INCLUDE}
 
-libdir=$(prefix)/lib
-lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
+mod_SCRIPTS = cpp-conf scheme-conf server-conf
+moddir = $(prefix)/modules/server
 
-INCLUDES = -I${HTTPD_INCLUDE}
+lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
+libdir=$(prefix)/modules/server
+noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
 
 libmod_tuscany_eval_la_SOURCES = mod-eval.cpp
 libmod_tuscany_eval_la_LDFLAGS = -lxml2 -lcurl -lmozjs
+libmod_tuscany_eval.so:
+	ln -s .libs/libmod_tuscany_eval.so libmod_tuscany_eval.so
 
 libmod_tuscany_wiring_la_SOURCES = mod-wiring.cpp
 libmod_tuscany_wiring_la_LDFLAGS = -lxml2 -lcurl -lmozjs
+libmod_tuscany_wiring.so:
+	ln -s .libs/libmod_tuscany_wiring.so libmod_tuscany_wiring.so
 
-testdir=$(prefix)/test
-test_LTLIBRARIES = libimpl-test.la
-
+noinst_testdir = $(prefix)/test
+noinst_test_LTLIBRARIES = libimpl-test.la
 libimpl_test_la_SOURCES = impl-test.cpp
 
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+noinst_PROGRAMS = client-test
 TESTS = httpd-test server-test wiring-test
+
diff --git a/sca-cpp/trunk/modules/server/cpp-conf b/sca-cpp/trunk/modules/server/cpp-conf
index b376585f8c..77e79c5fd8 100755
--- a/sca-cpp/trunk/modules/server/cpp-conf
+++ b/sca-cpp/trunk/modules/server/cpp-conf
@@ -22,5 +22,5 @@ here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
 cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
+LoadModule mod_tuscany_eval $here/libmod_tuscany_eval.so
 EOF
diff --git a/sca-cpp/trunk/modules/server/scheme-conf b/sca-cpp/trunk/modules/server/scheme-conf
index 248255608e..85984fadf0 100755
--- a/sca-cpp/trunk/modules/server/scheme-conf
+++ b/sca-cpp/trunk/modules/server/scheme-conf
@@ -22,5 +22,5 @@ here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
 cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
+LoadModule mod_tuscany_eval $here/libmod_tuscany_eval.so
 EOF
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf
index ae175ee2f8..c5cf6be437 100755
--- a/sca-cpp/trunk/modules/server/server-conf
+++ b/sca-cpp/trunk/modules/server/server-conf
@@ -25,5 +25,5 @@ mkdir -p $root
 mkdir -p $root/logs
 mkdir -p $root/conf
 cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_wiring $here/.libs/libmod_tuscany_wiring.so
+LoadModule mod_tuscany_wiring $here/libmod_tuscany_wiring.so
 EOF
diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am
index 24769eb222..d6e2a6f957 100644
--- a/sca-cpp/trunk/modules/wsgi/Makefile.am
+++ b/sca-cpp/trunk/modules/wsgi/Makefile.am
@@ -15,19 +15,17 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-datadir=$(prefix)/modules/wsgi
-
 if WANT_PYTHON
 
-noinst_PROGRAMS = client-test
-
-nobase_data_DATA = *.yaml
-
 INCLUDES = -I${PYTHON_INCLUDE}
 
+mod_SCRIPTS = composite.py runtime.py scdl.py util.py wsgi-start wsgi-stop
+moddir = $(prefix)/modules/wsgi
+
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-TESTS = server-test
+noinst_PROGRAMS = client-test
+#TESTS = server-test
 
 endif