From 7cbac83a7e8719cc33aa508788bb6694384a1097 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Sep 2021 05:06:17 -0600 Subject: [PATCH] Makefiles: Fix dependencies around ambassador.version Signed-off-by: Luke Shumaker --- Makefile | 4 +--- builder/builder.mk | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9f2ade65454..43f2f4a8f41 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,7 @@ OSS_HOME := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))) _git_remote_urls := $(shell git remote | xargs -n1 git remote get-url --all) IS_PRIVATE ?= $(findstring private,$(_git_remote_urls)) -images: python/ambassador.version -push: python/ambassador.version - +include $(OSS_HOME)/build-aux/tools.mk include $(OSS_HOME)/builder/builder.mk include $(OSS_HOME)/_cxx/envoy.mk include $(OSS_HOME)/charts/emissary-ingress/Makefile diff --git a/builder/builder.mk b/builder/builder.mk index 55ad860ec31..42415731ed3 100644 --- a/builder/builder.mk +++ b/builder/builder.mk @@ -235,9 +235,8 @@ raw-version: @$(BUILDER) raw-version .PHONY: raw-version -python/ambassador.version: - $(BUILDER) raw-version > python/ambassador.version -.PHONY: python/ambassador.version +python/ambassador.version: $(tools/write-ifchanged) FORCE + $(BUILDER) raw-version | $(tools/write-ifchanged) python/ambassador.version compile: sync @$(BUILDER) compile