You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/04/16 20:13:18 UTC
[09/35] couchdb commit: updated refs/heads/Query-UI-Cleanup to 7a37026
Fix automake subdir-objects warnings on Mac OS X
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ed000eea
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ed000eea
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ed000eea
Branch: refs/heads/Query-UI-Cleanup
Commit: ed000eea295897fc521a7f224a2371f54dd92c4d
Parents: 0b31731
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Apr 13 04:40:16 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Apr 13 04:40:16 2014 +0400
----------------------------------------------------------------------
src/couchdb/priv/Makefile.am | 2 ++
src/ejson/Makefile.am | 2 ++
src/snappy/Makefile.am | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ed000eea/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 9a24222..a7973ba 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -10,6 +10,8 @@
## License for the specific language governing permissions and limitations under
## the License.
+AUTOMAKE_OPTIONS = subdir-objects
+
MAKE_SAFE = $(MAKE)
couchlibdir = $(localerlanglibdir)/couch-$(version)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ed000eea/src/ejson/Makefile.am
----------------------------------------------------------------------
diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am
index c1e07db..60dacc2 100644
--- a/src/ejson/Makefile.am
+++ b/src/ejson/Makefile.am
@@ -10,6 +10,8 @@
## License for the specific language governing permissions and limitations under
## the License.
+AUTOMAKE_OPTIONS = subdir-objects
+
ejsonebindir = $(localerlanglibdir)/ejson-0.1.0/ebin
ejsonprivdir = $(localerlanglibdir)/ejson-0.1.0/priv
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ed000eea/src/snappy/Makefile.am
----------------------------------------------------------------------
diff --git a/src/snappy/Makefile.am b/src/snappy/Makefile.am
index ff75f07..4bcfaea 100644
--- a/src/snappy/Makefile.am
+++ b/src/snappy/Makefile.am
@@ -10,6 +10,8 @@
## License for the specific language governing permissions and limitations under
## the License.
+AUTOMAKE_OPTIONS = subdir-objects
+
snappyebindir = $(localerlanglibdir)/snappy-1.0.5/ebin
snappyprivdir = $(localerlanglibdir)/snappy-1.0.5/priv