From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 12 Nov 2020 16:36:45 +0000 (-0700)
Subject: Makefile: fix fio version gen
X-Git-Tag: fio-3.24~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a05cfbe33aad7d76420d3e40c578e75d53972c30;p=fio.git

Makefile: fix fio version gen

A previous commit moved the cflags override, but neglected to move the
version generation that is being used by it.

Fixes: f4bd2c3d80bc ("fix dynamic engine build")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/Makefile b/Makefile
index 0d3c877e..ecfaa3e0 100644
--- a/Makefile
+++ b/Makefile
@@ -263,6 +263,10 @@ CFLAGS += $$($(1)_CFLAGS)
 endef
 endif
 
+FIO-VERSION-FILE: FORCE
+	@$(SHELL) $(SRCDIR)/FIO-VERSION-GEN
+-include FIO-VERSION-FILE
+
 override CFLAGS := -DFIO_VERSION='"$(FIO_VERSION)"' $(FIO_CFLAGS) $(CFLAGS)
 
 $(foreach eng,$(ENGINES),$(eval $(call engine_template,$(eng))))
@@ -433,10 +437,6 @@ all: $(PROGS) $(T_TEST_PROGS) $(UT_PROGS) $(SCRIPTS) $(ENGS_OBJS) FORCE
 .PHONY: all install clean test
 .PHONY: FORCE cscope
 
-FIO-VERSION-FILE: FORCE
-	@$(SHELL) $(SRCDIR)/FIO-VERSION-GEN
--include FIO-VERSION-FILE
-
 %.o : %.c
 	@mkdir -p $(dir $@)
 	$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<