git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Makefile: rebuild git.o on version change, clean up git$X flags

From
Matt McCutchen <hashproduct@gmail.com>
Date
Jul 10, 2007, 01:30 UTC
Message-ID
<1184031039.14364.11.camel@mattlaptop2>

Commit 334d28ae factored out git.o as an intermediate stage between git.c and git$X. However:

- It left some no-longer-relevant flags in the rule for git$X.
- It failed to replace git$X with git.o in the list of files that
  record GIT_VERSION.  This broke incorporation of a changed
  GIT_VERSION into git$X because, when GIT_VERSION changes, git.o isn't
  remade and git$X is relinked from the git.o that still contains the
  old GIT_VERSION.

This patch removes the irrelevant flags and fixes incorporation of a changed GIT_VERSION into git$X.

Signed-off-by: Matt McCutchen <hashproduct@gmail.com>
---
Amusingly, I found this because, when I formatted my previous patch for
submission, I noticed that the "-dirty" in the version at the bottom
wouldn't go away even though I had committed my changes to my
git-development repository.  (I was actually using the git tools from
that repository.)
 Makefile |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 5b30e5c..d7541b4 100644
--- a/Makefile
+++ b/Makefile
@@ -753,8 +753,7 @@ git.o: git.c common-cmds.h GIT-CFLAGS
 		$(ALL_CFLAGS) -c $(filter %.c,$^)
 
 git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
-	$(QUIET_LINK)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
-		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) git.o \
+	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
 		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 
 help.o: common-cmds.h
@@ -857,7 +856,7 @@ configure: configure.ac
 	rm -f $<+
 
 # These can record GIT_VERSION
-git$X git.spec \
+git.o git.spec \
 	$(patsubst %.sh,%,$(SCRIPT_SH)) \
 	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
 	: GIT-VERSION-FILE
-- 
1.5.3.rc0.83.gb18a6
Next: Junio C Hamano
Message 1 of 2 in “Makefile: rebuild git.o on version change, clean up git$X flags”
  1. Makefile: rebuild git.o on version change, clean up git$X flagsMatt McCutchen, Jul 10, 2007
  2. Junio C HamanoJul 10, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.