summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-01-19 16:13:02 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-01-20 13:19:06 +0100
commit41a7e11c7e3eb756a43316558d712eea33e11829 (patch)
tree0c29cdffb0e0cf60d5d768e6898ba3013affc4ed
parentf302ce578b49a00de31aacc0c5e845274de3deac (diff)
downloadpodman-41a7e11c7e3eb756a43316558d712eea33e11829.tar.gz
podman-41a7e11c7e3eb756a43316558d712eea33e11829.tar.bz2
podman-41a7e11c7e3eb756a43316558d712eea33e11829.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--Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e3cdb8a19..aed912ece 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -465,12 +464,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