opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

make bindings generation explicit

Browse Source 
Instead of implicitly generating the bindings, make it explicit, similar
to `make vendor`.  This should prevent redundant and possibly error
prone generations.  A following commit will shield CI.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2021-01-19 16:13:02 +01:00
parent f302ce578b
commit 41a7e11c7e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -208,7 +208,7 @@ endif
podman: bin/podman podman: bin/podman
.PHONY: bin/podman-remote .PHONY: bin/podman-remote
bin/podman-remote: .gopathok .generate-bindings $(SOURCES) go.mod go.sum ## Build with podman on remote environment bin/podman-remote: .gopathok $(SOURCES) go.mod go.sum ## Build with podman on remote environment
$(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "${REMOTETAGS}" -o $@ ./cmd/podman $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "${REMOTETAGS}" -o $@ ./cmd/podman
.PHONY: bin/podman-remote-static .PHONY: bin/podman-remote-static
@ -279,7 +279,6 @@ clean: ## Clean artifacts
libpod/container_easyjson.go \ libpod/container_easyjson.go \
libpod/pod_easyjson.go \ libpod/pod_easyjson.go \
.install.goimports \ .install.goimports \
.generate-bindings \
docs/build docs/build
make -C docs clean make -C docs clean
@ -465,12 +464,10 @@ podman-remote-%-release:
rm -f release.txt rm -f release.txt
$(MAKE) podman-remote-release-$*.zip $(MAKE) podman-remote-release-$*.zip
BINDINGS_SOURCE = $(wildcard pkg/bindings/**/types.go) generate-bindings:
.generate-bindings: $(BINDINGS_SOURCE)
ifneq ($(shell uname -s), Darwin) ifneq ($(shell uname -s), Darwin)
GO111MODULE=off $(GO) generate ./pkg/bindings/... ; GO111MODULE=off $(GO) generate ./pkg/bindings/... ;
endif endif
touch .generate-bindings
.PHONY: docker-docs .PHONY: docker-docs
docker-docs: docs docker-docs: docs