diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-01-19 16:13:02 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-01-29 15:27:11 -0500 |
| commit | 6bf4d6195a02fcd39b6d1f7220b4e8ab4f3c2cb5 (patch) | |
| tree | 171038ff30291b1cac175d2c77a9453226aeda3c | |
| parent | 960baf1a0966794779ffe88b1e3f77f02993d764 (diff) | |
| download | podman-6bf4d6195a02fcd39b6d1f7220b4e8ab4f3c2cb5.tar.gz podman-6bf4d6195a02fcd39b6d1f7220b4e8ab4f3c2cb5.tar.bz2 podman-6bf4d6195a02fcd39b6d1f7220b4e8ab4f3c2cb5.zip | |
make bindings generation explicit
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>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -208,7 +208,7 @@ endif podman: bin/podman .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 .PHONY: bin/podman-remote-static @@ -279,7 +279,6 @@ clean: ## Clean artifacts libpod/container_easyjson.go \ libpod/pod_easyjson.go \ .install.goimports \ - .generate-bindings \ docs/build make -C docs clean @@ -461,12 +460,10 @@ podman-remote-%-release: rm -f release.txt $(MAKE) podman-remote-release-$*.zip -BINDINGS_SOURCE = $(wildcard pkg/bindings/**/types.go) -.generate-bindings: $(BINDINGS_SOURCE) +generate-bindings: ifneq ($(shell uname -s), Darwin) GO111MODULE=off $(GO) generate ./pkg/bindings/... ; endif - touch .generate-bindings .PHONY: docker-docs docker-docs: docs |