Skip to content

Commit 31838b4

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4ecbc65 commit 31838b4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ git.o git.spec \
16331633

16341634
%.o: %.c GIT-CFLAGS
16351635
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
1636-
%.s: %.c GIT-CFLAGS
1636+
%.s: %.c GIT-CFLAGS .FORCE-LISTING
16371637
$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
16381638
%.o: %.S GIT-CFLAGS
16391639
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
@@ -1978,7 +1978,7 @@ endif
19781978
.PHONY: all install clean strip
19791979
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
19801980
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
1981-
.PHONY: .FORCE-GIT-BUILD-OPTIONS
1981+
.PHONY: .FORCE-GIT-BUILD-OPTIONS .FORCE-LISTING
19821982

19831983
### Check documentation
19841984
#

0 commit comments

Comments
 (0)