From e29a1924afe9e6051369f7bcbf44ccdf53de536a Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Mon, 9 Nov 2009 00:39:16 +0000
Subject: 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
---
 src/erlang-oauth/Makefile.am  | 15 ++++++++-------
 src/erlang-oauth/oauth.app    | 20 --------------------
 src/erlang-oauth/oauth.app.in | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 27 deletions(-)
 delete mode 100644 src/erlang-oauth/oauth.app
 create mode 100644 src/erlang-oauth/oauth.app.in

(limited to 'src/erlang-oauth')

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
deleted file mode 100644
index 6357b9b0..00000000
--- a/src/erlang-oauth/oauth.app
+++ /dev/null
@@ -1,20 +0,0 @@
-{application, oauth, [
-  {description, "Erlang OAuth implementation"},
-  {vsn, "dev"},
-  {modules, [
-    oauth,
-    oauth_hmac_sha1,
-    oauth_http,
-    oauth_plaintext,
-    oauth_rsa_sha1,
-    oauth_unix,
-    oauth_uri
-  ]},
-  {registered, []},
-  {applications, [
-    kernel,
-    stdlib,
-    crypto,
-    inets
-  ]}
-]}.
diff --git a/src/erlang-oauth/oauth.app.in b/src/erlang-oauth/oauth.app.in
new file mode 100644
index 00000000..6357b9b0
--- /dev/null
+++ b/src/erlang-oauth/oauth.app.in
@@ -0,0 +1,20 @@
+{application, oauth, [
+  {description, "Erlang OAuth implementation"},
+  {vsn, "dev"},
+  {modules, [
+    oauth,
+    oauth_hmac_sha1,
+    oauth_http,
+    oauth_plaintext,
+    oauth_rsa_sha1,
+    oauth_unix,
+    oauth_uri
+  ]},
+  {registered, []},
+  {applications, [
+    kernel,
+    stdlib,
+    crypto,
+    inets
+  ]}
+]}.
-- 
cgit v1.2.3