You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/07/30 17:59:52 UTC
mesos git commit: Fixed rapidjson make install directory structure.
Repository: mesos
Updated Branches:
refs/heads/master 077f122d5 -> 62d4ff53b
Fixed rapidjson make install directory structure.
The rapidjson headers were getting flattened into the same top-level
include directory. The `no_base` prefix will preserve the directory
strucutre of the headers, however we would need a Makefile further
down for this to work (as done with stout and libprocess). Instead,
we use separate variables as suggested here:
https://www.gnu.org/software/automake/manual/html_node/Alternative.html
Review: https://reviews.apache.org/r/68098
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/62d4ff53
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/62d4ff53
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/62d4ff53
Branch: refs/heads/master
Commit: 62d4ff53b1952012c6e8e14d167023df0b4e1a85
Parents: 077f122
Author: Benjamin Mahler <bm...@apache.org>
Authored: Sun Jul 29 14:40:02 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Sun Jul 29 14:43:14 2018 -0700
----------------------------------------------------------------------
3rdparty/Makefile.am | 48 +++++++++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/62d4ff53/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 26e5d55..e7005fb 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -324,25 +324,16 @@ endif
if WITH_BUNDLED_RAPIDJSON
# Stout depends on rapidjson. Install rapidjson into $PREFIX/include
# but don't add it to the source tarball.
+#
+# We need to use a variable per sub-directory in order to preserve
+# the subdirectory structure:
+# https://www.gnu.org/software/automake/manual/html_node/Alternative.html
rapidjsondir = $(includedir)/rapidjson
+rapidjsonerrordir = $(includedir)/rapidjson/error
+rapidjsoninternaldir = $(includedir)/rapidjson/internal
+rapidjsonmsinttypesdir = $(includedir)/rapidjson/msinttypes
nodist_rapidjson_HEADERS = \
- $(RAPIDJSON)/include/rapidjson/error/en.h \
- $(RAPIDJSON)/include/rapidjson/error/error.h \
- $(RAPIDJSON)/include/rapidjson/internal/biginteger.h \
- $(RAPIDJSON)/include/rapidjson/internal/diyfp.h \
- $(RAPIDJSON)/include/rapidjson/internal/dtoa.h \
- $(RAPIDJSON)/include/rapidjson/internal/ieee754.h \
- $(RAPIDJSON)/include/rapidjson/internal/itoa.h \
- $(RAPIDJSON)/include/rapidjson/internal/meta.h \
- $(RAPIDJSON)/include/rapidjson/internal/pow10.h \
- $(RAPIDJSON)/include/rapidjson/internal/regex.h \
- $(RAPIDJSON)/include/rapidjson/internal/stack.h \
- $(RAPIDJSON)/include/rapidjson/internal/strfunc.h \
- $(RAPIDJSON)/include/rapidjson/internal/strtod.h \
- $(RAPIDJSON)/include/rapidjson/internal/swap.h \
- $(RAPIDJSON)/include/rapidjson/msinttypes/inttypes.h \
- $(RAPIDJSON)/include/rapidjson/msinttypes/stdint.h \
$(RAPIDJSON)/include/rapidjson/allocators.h \
$(RAPIDJSON)/include/rapidjson/document.h \
$(RAPIDJSON)/include/rapidjson/encodedstream.h \
@@ -363,7 +354,32 @@ nodist_rapidjson_HEADERS = \
$(RAPIDJSON)/include/rapidjson/stringbuffer.h \
$(RAPIDJSON)/include/rapidjson/writer.h
+nodist_rapidjsonerror_HEADERS = \
+ $(RAPIDJSON)/include/rapidjson/error/en.h \
+ $(RAPIDJSON)/include/rapidjson/error/error.h
+
+nodist_rapidjsoninternal_HEADERS = \
+ $(RAPIDJSON)/include/rapidjson/internal/biginteger.h \
+ $(RAPIDJSON)/include/rapidjson/internal/diyfp.h \
+ $(RAPIDJSON)/include/rapidjson/internal/dtoa.h \
+ $(RAPIDJSON)/include/rapidjson/internal/ieee754.h \
+ $(RAPIDJSON)/include/rapidjson/internal/itoa.h \
+ $(RAPIDJSON)/include/rapidjson/internal/meta.h \
+ $(RAPIDJSON)/include/rapidjson/internal/pow10.h \
+ $(RAPIDJSON)/include/rapidjson/internal/regex.h \
+ $(RAPIDJSON)/include/rapidjson/internal/stack.h \
+ $(RAPIDJSON)/include/rapidjson/internal/strfunc.h \
+ $(RAPIDJSON)/include/rapidjson/internal/strtod.h \
+ $(RAPIDJSON)/include/rapidjson/internal/swap.h
+
+nodist_rapidjsonmsinttypes_HEADERS = \
+ $(RAPIDJSON)/include/rapidjson/msinttypes/inttypes.h \
+ $(RAPIDJSON)/include/rapidjson/msinttypes/stdint.h
+
$(nodist_rapidjson_HEADERS): $(RAPIDJSON)-stamp
+$(nodist_rapidjsonerror_HEADERS): $(RAPIDJSON)-stamp
+$(nodist_rapidjsoninternal_HEADERS): $(RAPIDJSON)-stamp
+$(nodist_rapidjsonmsinttypes_HEADERS): $(RAPIDJSON)-stamp
ALL_LOCAL += $(RAPIDJSON)-stamp
endif