Skip to content

Commit

Permalink
Merge pull request cri-o#3322 from openSUSE/rebuild
Browse files Browse the repository at this point in the history
Rebuild bin/* targets on *.go file changes
  • Loading branch information
openshift-merge-robot committed Feb 25, 2020
2 parents f95e802 + 917c3e7 commit 878375f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ unexport GOBIN
endif
GOPKGDIR := $(GOPATH)/src/$(PROJECT)
GOPKGBASEDIR := $(shell dirname "$(GOPKGDIR)")
GO_FILES := $(shell find . -type f -name '*.go' -not -name '*_test.go')

# Update VPATH so make finds .gopathok
VPATH := $(VPATH):$(GOPATH)
Expand Down Expand Up @@ -128,16 +129,16 @@ lint: .gopathok ${GOLANGCI_LINT}
bin/pinns:
$(MAKE) -C pinns

test/copyimg/copyimg: .gopathok $(wildcard test/copyimg/*.go)
test/copyimg/copyimg: $(GO_FILES) .gopathok
$(GO_BUILD) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg

test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
test/checkseccomp/checkseccomp: $(GO_FILES) .gopathok
$(GO_BUILD) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/checkseccomp

bin/crio: .gopathok
bin/crio: $(GO_FILES) .gopathok
$(GO_BUILD) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio

bin/crio-status: .gopathok
bin/crio-status: $(GO_FILES) .gopathok
$(GO_BUILD) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status

build-static:
Expand Down

0 comments on commit 878375f

Please sign in to comment.