Repository: mesos Updated Branches: refs/heads/master db8d097c9 -> fc48ed697
Fixed the problem that stout cannot be built standalone. Changed the `%-stamp` rule in stouts Makefile.am so it can build `googletest-*/googlemock-build-stamp` and fixed the dependency error for gmock_sources.cc. Review: https://reviews.apache.org/r/61489/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fc48ed69 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fc48ed69 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fc48ed69 Branch: refs/heads/master Commit: fc48ed6976b29efa259af8cd0e2d4fb24e7e906b Parents: 55ed042 Author: Chun-Hung Hsiao <chhs...@mesosphere.io> Authored: Wed Aug 9 22:01:13 2017 +0200 Committer: Till Toenshoff <toensh...@me.com> Committed: Thu Aug 10 00:43:27 2017 +0200 ---------------------------------------------------------------------- 3rdparty/stout/3rdparty/Makefile.am | 2 +- 3rdparty/stout/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fc48ed69/3rdparty/stout/3rdparty/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/stout/3rdparty/Makefile.am b/3rdparty/stout/3rdparty/Makefile.am index 88a4b02..cc831a9 100644 --- a/3rdparty/stout/3rdparty/Makefile.am +++ b/3rdparty/stout/3rdparty/Makefile.am @@ -121,7 +121,7 @@ libgmock_la_CPPFLAGS = \ -I$(GTEST)/include -I$(GTEST) -I$(GTEST)/src \ -I$(GMOCK)/include -I$(GMOCK) -I$(GMOCK)/src - gmock_sources.cc: $(GMOCK)-stamp + gmock_sources.cc: $(GOOGLETEST)-stamp $(GMOCK)-build-stamp: libgmock.la touch $@ http://git-wip-us.apache.org/repos/asf/mesos/blob/fc48ed69/3rdparty/stout/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am index 3ecafee..4386017 100644 --- a/3rdparty/stout/Makefile.am +++ b/3rdparty/stout/Makefile.am @@ -62,7 +62,7 @@ BUNDLED_DEPS = # Initialize BUNDLED_DEPS so we can add to it. # Ensure bundled software is build properly. %-stamp: - @cd $(BUNDLED_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F) + @cd $(BUNDLED_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@:$(BUNDLED_DIR)/%=%) # We use "-isystem" instead of "-I" to add Boost to the include search # path. This disables compiler warnings inside Boost headers since we
