Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A03811F68 for ; Mon, 28 Apr 2014 12:43:11 +0000 (UTC) Received: (qmail 56081 invoked by uid 500); 28 Apr 2014 12:41:51 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 55612 invoked by uid 500); 28 Apr 2014 12:41:43 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 55160 invoked by uid 99); 28 Apr 2014 12:41:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Apr 2014 12:41:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 10E1A995994; Mon, 28 Apr 2014 12:41:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org Date: Mon, 28 Apr 2014 12:41:37 -0000 Message-Id: <332037776c20475fb5f693b71d53fea1@git.apache.org> In-Reply-To: <8eb79567b3b740e8a9c3ed07ee666767@git.apache.org> References: <8eb79567b3b740e8a9c3ed07ee666767@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] couchdb commit: updated refs/heads/2200-feature-support-erlang-17.0 to c81eb6d 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/2200-feature-support-erlang-17.0 Commit: ed000eea295897fc521a7f224a2371f54dd92c4d Parents: 0b31731 Author: Alexander Shorin Authored: Sun Apr 13 04:40:16 2014 +0400 Committer: Alexander Shorin 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