Skip to content

Commit

Permalink
Merge pull request cri-o#1590 from wking/drop-find-godeps
Browse files Browse the repository at this point in the history
Makefile: Drop find-godeps.sh for bin/crio target and make it .PHONY
  • Loading branch information
Mrunal Patel authored Jun 5, 2018
2 parents 055eb1e + 6a9ece0 commit 763baf7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 42 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test/copyimg/copyimg: .gopathok $(wildcard test/copyimg/*.go)
test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
$(GO) build -i $(LDFLAGS) -tags "$(BUILDTAGS) containers_image_ostree_stub" -o $@ $(PROJECT)/test/checkseccomp

bin/crio: .gopathok $(shell hack/find-godeps.sh $(GOPKGDIR) cmd/crio $(PROJECT))
bin/crio: .gopathok
$(GO) build -i $(LDFLAGS) -tags "$(BUILDTAGS) containers_image_ostree_stub" -o $@ $(PROJECT)/cmd/crio

crio.conf: bin/crio
Expand Down Expand Up @@ -234,6 +234,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins

.PHONY: \
bin/conmon \
bin/crio \
bin/pause \
binaries \
clean \
Expand Down
41 changes: 0 additions & 41 deletions hack/find-godeps.sh

This file was deleted.

0 comments on commit 763baf7

Please sign in to comment.