summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-01-06 08:04:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-06 09:33:02 (GMT)
commit31838b4dcd27961b13e46ffd126233b208a29530 (patch)
tree70f4483f7277266ef3ce4f6fd48e4ba1d51a4704 /Makefile
parent4ecbc65fa7decb2aa271d68d54e8563a679e6ec1 (diff)
downloadgit-31838b4dcd27961b13e46ffd126233b208a29530.zip
git-31838b4dcd27961b13e46ffd126233b208a29530.tar.gz
git-31838b4dcd27961b13e46ffd126233b208a29530.tar.bz2
Makefile: regenerate assembler listings when asked
'make var.s' fails to regenerate an assembler listing if var.c has not changed but a header it includes has: $ make var.s CC var.s $ touch cache.h $ make var.s $ The corresponding problem for 'make var.o' does not occur because the Makefile lists dependencies for each .o target explicitly; analogous dependency rules for the .s targets are not present. Rather than add some, it seems better to force 'make' to always regenerate assembler listings, since the assembler listing targets are only invoked when specifically requested on the make command line. Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 015bfab..36e6f81 100644
--- a/Makefile
+++ b/Makefile
@@ -1633,7 +1633,7 @@ git.o git.spec \
%.o: %.c GIT-CFLAGS
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
-%.s: %.c GIT-CFLAGS
+%.s: %.c GIT-CFLAGS .FORCE-LISTING
$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
%.o: %.S GIT-CFLAGS
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
@@ -1978,7 +1978,7 @@ endif
.PHONY: all install clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
-.PHONY: .FORCE-GIT-BUILD-OPTIONS
+.PHONY: .FORCE-GIT-BUILD-OPTIONS .FORCE-LISTING
### Check documentation
#