Makefiles: Fix dependencies around ambassador.version

Signed-off-by: Luke Shumaker <[email protected]>
emissary-ingress · Sep 17, 2021 · 7cbac83 · 7cbac83
1 parent 81cf458
commit 7cbac83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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