[2/2] mesos git commit: Stout: Fixed 'make dist'.

[ti...@apache.org]

Stout: Fixed 'make dist'.

Review: https://reviews.apache.org/r/49648/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/147adeda
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/147adeda
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/147adeda

Branch: refs/heads/master
Commit: 147adedae1151dfa14ab6678326f1867bf4cc814
Parents: 6fd4e9a
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Jul 5 22:25:31 2016 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Wed Jul 6 00:08:30 2016 +0200

----------------------------------------------------------------------
 3rdparty/stout/Makefile.am | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/147adeda/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index 44ce5c4..fc2d2b2 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -200,3 +200,17 @@ EXTRA_DIST = $(stout_tests_SOURCES)
 if !OS_LINUX
 EXTRA_DIST += tests/proc_tests.cpp
 endif
+
+# Make sure we don't recurse into 3rdparty when creating the distribution
+# tarball.
+# When recursing into 3rdparty, it tries to distribute the bundled dependencies
+# such as boost and glog even though they have already been included as part of
+# top-level 3rdparty.
+DIST_SUBDIRS=$(SUBDIRS)
+
+# Explicitly include 3rdparty directory in the distribution tarball since we
+# exclude it from DIST_SUBDIRS (when building it as part of Mesos).
+dist-hook:
+if !STANDALONE_STOUT
+	cp -r $(srcdir)/3rdparty $(distdir)/
+endif