Merge pull request #802 from wking/minimal-phony

Makefile: Remove unnecessary .PHONY entries
This commit is contained in:
Michael Crosby 2017-05-10 17:16:48 -07:00 committed by GitHub
commit 02a936a402
2 changed files with 0 additions and 12 deletions

View File

@ -33,7 +33,6 @@ DOC_FILES := \
default: docs
.PHONY: docs
docs: $(OUTPUT_DIRNAME)/$(DOC_FILENAME).pdf $(OUTPUT_DIRNAME)/$(DOC_FILENAME).html
ifeq "$(strip $(PANDOC))" ''
@ -56,8 +55,6 @@ HOST_GOLANG_VERSION = $(shell go version | cut -d ' ' -f3 | cut -c 3-)
# this variable is used like a function. First arg is the minimum version, Second arg is the version to be checked.
ALLOWED_GO_VERSION = $(shell test '$(shell /bin/echo -e "$(1)\n$(2)" | sort -V | head -n1)' = '$(1)' && echo 'true')
.PHONY: test .govet .golint .gitvalidation
test: .govet .golint .gitvalidation
.govet:
@ -80,8 +77,6 @@ else
git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD
endif
.PHONY: install.tools
install.tools: .install.golint .install.gitvalidation
# golint does not even build for <go1.6
@ -93,8 +88,6 @@ endif
.install.gitvalidation:
go get -u github.com/vbatts/git-validation
.PHONY: clean
clean:
rm -rf $(OUTPUT_DIRNAME) *~
rm -f version.md

View File

@ -1,10 +1,8 @@
GOOD_TESTS = $(wildcard test/good/*.json)
BAD_TESTS = $(wildcard test/bad/*.json)
.PHONY: default
default: validate
.PHONY: help
help:
@echo "Usage: make [target]"
@echo
@ -12,7 +10,6 @@ help:
@echo " * 'help' - show this help information"
@echo " * 'validate' - build the validation tool"
.PHONY: fmt
fmt:
find . -name '*.json' -exec bash -c 'jq --indent 4 -M . {} > xx && mv xx {} || echo "skipping invalid {}"' \;
@ -21,7 +18,6 @@ validate: validate.go
go get -d ./...
go build ./validate.go
.PHONY: test
test: validate $(TESTS)
for TYPE in $$(ls test); \
do \
@ -50,6 +46,5 @@ test: validate $(TESTS)
done; \
done
.PHONY: clean
clean:
rm -f validate