Skip to content

Makefile: Add a pattern rule for oci-* commands #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbatts merged 2 commits into from
Oct 6, 2016
Merged

Makefile: Add a pattern rule for oci-* commands #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
160abf9
Makefile: Add a pattern rule for oci-* commands
wking Sep 16, 2016
2d06368
Makefile: Always rebuild oci-* tools
wking Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ export GO15VENDOREXPERIMENT
COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)

EPOCH_TEST_COMMIT ?= v0.2.0
TOOLS := \
oci-create-runtime-bundle \
oci-image-validate \
oci-unpack

default: help

Expand All @@ -20,10 +24,10 @@ check-license:
@echo "checking license headers"
@./.tool/check-license

tools:
go build -ldflags "-X main.gitCommit=${COMMIT}" ./cmd/oci-create-runtime-bundle
go build -ldflags "-X main.gitCommit=${COMMIT}" ./cmd/oci-unpack
go build -ldflags "-X main.gitCommit=${COMMIT}" ./cmd/oci-image-validate
tools: $(TOOLS)

$(TOOLS): oci-%:
Copy link
Member

@vbatts vbatts Sep 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the oci-% is looking for dependencies of the target that have the oci-% pattern. Is that intended?

go build -ldflags "-X main.gitCommit=${COMMIT}" ./cmd/$@

lint:
@echo "checking lint"
Expand Down Expand Up @@ -69,13 +73,11 @@ install.tools: .install.gitvalidation .install.glide .install.glide-vc .install.
gometalinter --install --update

clean:
rm -rf *~ $(OUTPUT_DIRNAME)
rm -f oci-create-runtime-bundle
rm -f oci-unpack
rm -f oci-image-validate
rm -rf *~ $(OUTPUT_DIRNAME) $(TOOLS)

.PHONY: \
tools \
$(TOOLS) \
Copy link
Member

@vbatts vbatts Sep 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is somewhat redundant

Copy link
Member

@vbatts vbatts Sep 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, not true. When those binaries are built from the subdirectory, then the executable by those names is present.

check-license \
clean \
lint \
Expand Down