7 files changed, 31 insertions, 13 deletions
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index 04a60dbd0d..724d001cb8 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -17,19 +17,22 @@
 
 INCLUDES = -I${HTTPD_INCLUDE}
 
-mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf
+dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf
 moddir=$(prefix)/modules/http
 
 curl_test_SOURCES = curl-test.cpp
 curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 mod_DATA = httpd.prefix curl.prefix
-nobase_mod_DATA = conf/*
+nobase_dist_mod_DATA = conf/*
+
+EXTRA_DIST = htdocs/index.html
 
 httpd.prefix: $(top_builddir)/config.status
 	echo ${HTTPD_PREFIX} >httpd.prefix
 curl.prefix: $(top_builddir)/config.status
 	echo ${CURL_PREFIX} >curl.prefix
 
+dist_noinst_SCRIPTS = httpd-test http-test
 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 d377f570c6..0369121b73 100644
--- a/sca-cpp/trunk/modules/java/Makefile.am
+++ b/sca-cpp/trunk/modules/java/Makefile.am
@@ -22,7 +22,7 @@ if WANT_JAVA
 
 INCLUDES = -I${JAVA_INCLUDE}
 
-mod_SCRIPTS = java-conf
+dist_mod_SCRIPTS = java-conf
 moddir = $(prefix)/modules/java
 
 prefix_DATA = java.prefix
@@ -30,6 +30,8 @@ prefixdir = $(prefix)/modules/java
 java.prefix: $(top_builddir)/config.status
 	echo ${JAVA_PREFIX} >java.prefix
 
+EXTRA_DIST = domain-test.composite
+
 lib_LTLIBRARIES = libmod_tuscany_java.la
 libmod_tuscany_java_la_SOURCES = mod-java.cpp
 libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs ${JAVA_LDFLAGS}
@@ -46,7 +48,7 @@ java_test_LDFLAGS = ${JAVA_LDFLAGS}
 java_shell_SOURCES = java-shell.cpp
 java_shell_LDFLAGS = ${JAVA_LDFLAGS}
 
-noinst_JAVA = org/apache/tuscany/*.java test/*.java
+dist_noinst_JAVA = org/apache/tuscany/*.java test/*.java
 jardir = ${prefix}/modules/java
 jarfile = libmod-tuscany-java-${PACKAGE_VERSION}.jar
 jar_DATA = ${jarfile}
@@ -58,6 +60,7 @@ CLEANFILES = classnoinst.stamp ${jarfile} org/apache/tuscany/*.class	test/*.clas
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = server-test wiring-test
 noinst_PROGRAMS = jni-test java-test java-shell client-test
 TESTS = jni-test java-test server-test
 
diff --git a/sca-cpp/trunk/modules/python/Makefile.am b/sca-cpp/trunk/modules/python/Makefile.am
index 0e49cdfaad..62998b2bd8 100644
--- a/sca-cpp/trunk/modules/python/Makefile.am
+++ b/sca-cpp/trunk/modules/python/Makefile.am
@@ -21,10 +21,10 @@ if WANT_PYTHON
 
 INCLUDES = -I${PYTHON_INCLUDE}
 
-mod_SCRIPTS = python-conf
+dist_mod_SCRIPTS = python-conf
 moddir = $(prefix)/modules/python
 
-nobase_xsd_DATA = *.xsd
+nobase_dist_xsd_DATA = *.xsd
 xsddir = $(prefix)/xsd
 
 prefix_DATA = python.prefix
@@ -32,6 +32,8 @@ prefixdir = $(prefix)/modules/python
 python.prefix: $(top_builddir)/config.status
 	echo ${PYTHON_PREFIX} >python.prefix
 
+EXTRA_DIST = domain-test.composite client-test.py server-test.py
+
 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
@@ -48,6 +50,7 @@ python_shell_LDFLAGS = -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = server-test wiring-test
 noinst_PROGRAMS = python-test python-shell client-test
 TESTS = python-test server-test
 
diff --git a/sca-cpp/trunk/modules/scdl/Makefile.am b/sca-cpp/trunk/modules/scdl/Makefile.am
index 542ce4be20..8ad68a1bb5 100644
--- a/sca-cpp/trunk/modules/scdl/Makefile.am
+++ b/sca-cpp/trunk/modules/scdl/Makefile.am
@@ -18,5 +18,7 @@
 scdl_test_SOURCES = scdl-test.cpp
 scdl_test_LDFLAGS = -lxml2
 
+EXTRA_DIST = test.composite
+
 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 03556d0c45..19a37077d6 100644
--- a/sca-cpp/trunk/modules/scheme/Makefile.am
+++ b/sca-cpp/trunk/modules/scheme/Makefile.am
@@ -16,7 +16,7 @@
 #  under the License.
 
 xsddir=$(prefix)/xsd
-nobase_xsd_DATA = *.xsd
+nobase_dist_xsd_DATA = *.xsd
 
 eval_test_SOURCES = eval-test.cpp
 
diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index a14382e114..d68a288d52 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -17,9 +17,11 @@
 
 INCLUDES = -I${HTTPD_INCLUDE}
 
-mod_SCRIPTS = cpp-conf scheme-conf server-conf
+dist_mod_SCRIPTS = cpp-conf scheme-conf server-conf
 moddir = $(prefix)/modules/server
 
+EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.xml htdocs/*.txt htdocs/*.html
+
 lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
 libdir = $(prefix)/modules/server
 noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
@@ -45,6 +47,7 @@ libimpl-test.so:
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
+dist_noinst_SCRIPTS = httpd-test server-test wiring-test
 noinst_PROGRAMS = client-test
 TESTS = httpd-test server-test wiring-test
 
diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am
index 9a8895bcab..9f67ab37c0 100644
--- a/sca-cpp/trunk/modules/wsgi/Makefile.am
+++ b/sca-cpp/trunk/modules/wsgi/Makefile.am
@@ -19,10 +19,10 @@ if WANT_PYTHON
 
 INCLUDES = -I${PYTHON_INCLUDE}
 
-mod_SCRIPTS = composite.py wsgi-start wsgi-stop gae-start gae-stop
+dist_mod_SCRIPTS = composite.py wsgi-start wsgi-stop gae-start gae-stop
 moddir = $(prefix)/modules/wsgi
 
-mod_DATA = app.yaml scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py
+dist_mod_DATA = app.yaml scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py
 
 noinst_DATA = target.stamp
 
@@ -40,15 +40,19 @@ prefixdir=$(prefix)/modules/wsgi
 gae.prefix: $(top_builddir)/config.status
 	echo ${GAE_PREFIX} >gae.prefix
 
+EXTRA_DIST = domain-test.composite *.py htdocs/*.xml htdocs/*.txt htdocs/*.html
+
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 noinst_PROGRAMS = client-test
 
-if WANT_GAE
-TESTS = util-test wsgi-test wiring-test http-test server-test gae-test
-else
+dist_noinst_SCRIPTS = util-test wsgi-test wiring-test http-test server-test
 TESTS = util-test wsgi-test wiring-test http-test server-test
+
+if WANT_GAE
+dist_noinst_SCRIPTS += gae-test
+TESTS += gae-test
 endif
 
 endif