Fixes 'make distcheck' to run the test suite.

Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@833951 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 27 insertions, 17 deletions

diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 8c504dbc..fecaa64b 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -13,11 +13,18 @@
 couchlibdir = $(localerlanglibdir)/couch-$(version)
 couchprivdir = $(couchlibdir)/priv
 
-EXTRA_DIST = couchspawnkillable.sh stat_descriptions.cfg
+EXTRA_DIST = \
+	couchspawnkillable.sh \
+	stat_descriptions.cfg.in
+
+CLEANFILES = stat_descriptions.cfg
 
 couchpriv_DATA = stat_descriptions.cfg
 couchpriv_PROGRAMS = couchspawnkillable
 
+%.cfg: %.cfg.in
+	cp $< $@
+
 if WINDOWS
 couchspawnkillable_SOURCES = couchspawnkillable_win.c
 endif
diff --git a/src/couchdb/priv/stat_descriptions.cfg b/src/couchdb/priv/stat_descriptions.cfg.in
index 91a1540f..91a1540f 100644
--- a/src/couchdb/priv/stat_descriptions.cfg
+++ b/src/couchdb/priv/stat_descriptions.cfg.in
diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am
index c87d7f68..1d123396 100644
--- a/src/erlang-oauth/Makefile.am
+++ b/src/erlang-oauth/Makefile.am
@@ -16,6 +16,7 @@ oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
 # we add a ./configure option to enable it.
 
 oauth_file_collection = \
+	oauth.app.in \
     oauth.erl \
     oauth_hmac_sha1.erl \
     oauth_http.erl \
@@ -23,9 +24,8 @@ oauth_file_collection = \
     oauth_unix.erl \
     oauth_uri.erl
 
-oauthebin_static_file = oauth.app
-
 oauthebin_make_generated_file_list = \
+	oauth.app \
     oauth.beam \
     oauth_hmac_sha1.beam \
     oauth_http.beam \
@@ -34,15 +34,16 @@ oauthebin_make_generated_file_list = \
     oauth_uri.beam
 
 oauthebin_DATA = \
-    $(oauthebin_static_file) \
-    $(oauthebin_make_generated_file_list)
+	$(oauthebin_make_generated_file_list)
 
-EXTRA_DIST =  \
-    $(oauth_file_collection) \
-    $(oauthebin_static_file)
+EXTRA_DIST = \
+	$(oauth_file_collection)
 
 CLEANFILES = \
     $(oauthebin_make_generated_file_list)
 
+%.app: %.app.in
+	cp $< $@
+
 %.beam: %.erl
 	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/erlang-oauth/oauth.app b/src/erlang-oauth/oauth.app.in
index 6357b9b0..6357b9b0 100644
--- a/src/erlang-oauth/oauth.app
+++ b/src/erlang-oauth/oauth.app.in
diff --git a/src/ibrowse/Makefile.am b/src/ibrowse/Makefile.am
index 76262a6e..510f36a9 100644
--- a/src/ibrowse/Makefile.am
+++ b/src/ibrowse/Makefile.am
@@ -13,6 +13,7 @@
 ibrowseebindir = $(localerlanglibdir)/ibrowse-1.5.2/ebin
 
 ibrowse_file_collection = \
+	ibrowse.app.in \
     ibrowse.erl \
     ibrowse_app.erl \
     ibrowse_http_client.erl \
@@ -21,9 +22,8 @@ ibrowse_file_collection = \
     ibrowse_sup.erl \
     ibrowse_test.erl
 
-ibrowseebin_static_file = ibrowse.app
-
 ibrowseebin_make_generated_file_list = \
+	ibrowse.app \
     ibrowse.beam \
     ibrowse_app.beam \
     ibrowse_http_client.beam \
@@ -33,16 +33,17 @@ ibrowseebin_make_generated_file_list = \
     ibrowse_test.beam
 
 ibrowseebin_DATA = \
-    $(ibrowseebin_static_file) \
     $(ibrowseebin_make_generated_file_list)
 
 EXTRA_DIST =  \
     $(ibrowse_file_collection) \
-    $(ibrowseebin_static_file) \
     ibrowse.hrl
 
 CLEANFILES = \
     $(ibrowseebin_make_generated_file_list)
 
+%.app: %.app.in
+	cp $< $@
+
 %.beam: %.erl
 	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/ibrowse/ibrowse.app b/src/ibrowse/ibrowse.app.in
index 4f43dd92..4f43dd92 100644
--- a/src/ibrowse/ibrowse.app
+++ b/src/ibrowse/ibrowse.app.in
diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am
index db46ace3..608d4dcd 100644
--- a/src/mochiweb/Makefile.am
+++ b/src/mochiweb/Makefile.am
@@ -20,6 +20,7 @@ mochiweb_file_collection = \
     mochijson.erl \
     mochijson2.erl \
     mochinum.erl \
+	mochiweb.app.in \
     mochiweb.erl \
     mochiweb_app.erl \
     mochiweb_charref.erl \
@@ -37,8 +38,6 @@ mochiweb_file_collection = \
     mochiweb_util.erl \
     reloader.erl
 
-mochiwebebin_static_file = mochiweb.app
-
 mochiwebebin_make_generated_file_list = \
     mochifmt.beam \
     mochifmt_records.beam \
@@ -47,6 +46,7 @@ mochiwebebin_make_generated_file_list = \
     mochijson.beam \
     mochijson2.beam \
     mochinum.beam \
+	mochiweb.app \
     mochiweb.beam \
     mochiweb_app.beam \
     mochiweb_charref.beam \
@@ -65,15 +65,16 @@ mochiwebebin_make_generated_file_list = \
     reloader.beam
 
 mochiwebebin_DATA = \
-    $(mochiwebebin_static_file) \
     $(mochiwebebin_make_generated_file_list)
 
 EXTRA_DIST =  \
-    $(mochiweb_file_collection) \
-    $(mochiwebebin_static_file)
+    $(mochiweb_file_collection)
 
 CLEANFILES = \
     $(mochiwebebin_make_generated_file_list)
 
+%.app: %.app.in
+	cp $< $@
+
 %.beam: %.erl
 	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/mochiweb/mochiweb.app b/src/mochiweb/mochiweb.app.in
index cd8dbb25..cd8dbb25 100644
--- a/src/mochiweb/mochiweb.app
+++ b/src/mochiweb/mochiweb.app.in