summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shorin <kxepal@apache.org>2014-04-13 04:40:16 +0400
committerAlexander Shorin <kxepal@apache.org>2014-04-13 04:40:16 +0400
commited000eea295897fc521a7f224a2371f54dd92c4d (patch)
tree00c6afb548fe59dd61595f598b2ed06f1114f5c9
parent0b31731982f8edf1ec52166d4b7fc54f21723951 (diff)
downloadcouchdb-ed000eea295897fc521a7f224a2371f54dd92c4d.tar.gz
Fix automake subdir-objects warnings on Mac OS X
-rw-r--r--src/couchdb/priv/Makefile.am2
-rw-r--r--src/ejson/Makefile.am2
-rw-r--r--src/snappy/Makefile.am2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 9a24222f1..a7973ba13 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)
diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am
index c1e07db27..60dacc26d 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
diff --git a/src/snappy/Makefile.am b/src/snappy/Makefile.am
index ff75f0705..4bcfaead0 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