couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [06/12] oauth commit: updated refs/heads/import-master to db23ab2
Date Wed, 12 Feb 2014 06:22:24 GMT
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


Project: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/commit/66f41489
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/tree/66f41489
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-oauth/diff/66f41489

Branch: refs/heads/import-master
Commit: 66f41489a155b6382f0a30091210c6e1eedb7522
Parents: 7cc148b
Author: Paul Joseph Davis <davisp@apache.org>
Authored: Mon Nov 9 00:39:16 2009 +0000
Committer: Paul Joseph Davis <davisp@apache.org>
Committed: Mon Nov 9 00:39:16 2009 +0000

----------------------------------------------------------------------
 Makefile.am  | 15 ++++++++-------
 oauth.app    | 20 --------------------
 oauth.app.in | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/66f41489/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index c87d7f6..1d12339 100644
--- a/Makefile.am
+++ b/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) $<

http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/66f41489/oauth.app
----------------------------------------------------------------------
diff --git a/oauth.app b/oauth.app
deleted file mode 100644
index 6357b9b..0000000
--- a/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
-  ]}
-]}.

http://git-wip-us.apache.org/repos/asf/couchdb-oauth/blob/66f41489/oauth.app.in
----------------------------------------------------------------------
diff --git a/oauth.app.in b/oauth.app.in
new file mode 100644
index 0000000..6357b9b
--- /dev/null
+++ b/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
+  ]}
+]}.


Mime
View raw message