From 8d7de8631c61448d69082aaa08f718d3d1462ede Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 25 Jan 2017 16:47:11 -0800 Subject: [PATCH 1/2] Makefile: Add .install.esc and make it part of install.tools So we can 'make schema-fs' in Travis. Signed-off-by: W. Trevor King --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b69329c67..88d6314ec 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,10 @@ else git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD endif -install.tools: .install.gitvalidation .install.glide .install.glide-vc +install.tools: .install.esc .install.gitvalidation .install.glide .install.glide-vc + +.install.esc: + go get -u github.com/mjibson/esc .install.gitvalidation: go get -u github.com/vbatts/git-validation From 92f6ce6315c6242cbc553339d1bb6511c6b8beaf Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 28 Jan 2017 20:57:36 -0800 Subject: [PATCH 2/2] Makefile: Add .install.* to .PHONY Also consolidate the install.tools entry in the .PHONY block at the end of the Makefile. The $(var:pattern=replacement) syntax is documented in [1]. [1]: https://www.gnu.org/software/make/manual/html_node/Text-Functions.html#index-patsubst-1 Signed-off-by: W. Trevor King --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 88d6314ec..7fa1a8319 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,8 @@ DOC_FILENAME ?= oci-image-spec EPOCH_TEST_COMMIT ?= v0.2.0 +TOOLS := esc gitvalidation glide glide-vc + default: check-license lint test help: @@ -111,7 +113,7 @@ else git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD endif -install.tools: .install.esc .install.gitvalidation .install.glide .install.glide-vc +install.tools: $(TOOLS:%=.install.%) .install.esc: go get -u github.com/mjibson/esc @@ -129,6 +131,7 @@ clean: rm -rf *~ $(OUTPUT_DIRNAME) header.html .PHONY: \ + $(TOOLS:%=.install.%) \ validate-examples \ check-license \ clean \