From d42901c4ad11aa565ff793534f228f9577e0e956 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 12 May 2014 16:41:06 +0100 Subject: [PATCH] [build] Fix version.o dependency upon git index Commit 8540300 ("[build] Disable ccache for all relevant build targets") attempted to generalise the rule for $(BIN)/version.o to $(BIN)/version.% in order to apply the dependency to all relevant build targets (debug objects, assembly listings, etc). This generalisation appears to work for the ccache override directives, but seems to cause make (at least, GNU make 4.0) to simply ignore the dependency upon the git index. Since version.c contains only some string constants, there is unlikely to be a substantive need for its debug objects, assembly listings, etc. Restore the previous form of the dependency and accept that hypothetical builds with e.g. DEBUG=version will not be handled correctly. Signed-off-by: Michael Brown --- src/Makefile.housekeeping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index e240a7386..33283b18c 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -705,7 +705,7 @@ CFLAGS_version += -DVERSION_MAJOR=$(VERSION_MAJOR) \ -DVERSION="\"$(VERSION)\"" # Make sure the version number gets updated on every git checkout ifneq ($(GITVERSION),) -$(BIN)/version.% : ../.git/index +$(BIN)/version.o : ../.git/index endif # We automatically generate rules for any file mentioned in AUTO_SRCS