Makefile: consolidate .FORCE-* targets
Providing multiple targets to force a rebuild is unnecessary complication. Avoid using a name that could conflict with future special targets in GNU make (a leading period followed by uppercase letters). The corresponding change to the git-gui Makefile is left for another patch. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Jan 6, 2010 at 02:06 UTC
13fca9f36b6dfa1a4a8bb3a67bb9a41705bea68a
2 files changed
+8
-11
Documentation/Makefile
+2
-2
@@ -204,7 +204,7 @@ install-pdf: pdf
204
install-html: html
205
'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
206
207
-../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
207
+../GIT-VERSION-FILE: FORCE
208
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
209
210
-include ../GIT-VERSION-FILE
@@ -337,4 +337,4 @@ quick-install-man:
337
quick-install-html:
338
'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
339
340
-.PHONY: .FORCE-GIT-VERSION-FILE
340
+.PHONY: FORCE
Makefile
+6
-9
@@ -222,7 +222,7 @@ all::
222
# DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',
223
# DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork'
224
225
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
225
+GIT-VERSION-FILE: FORCE
226
@$(SHELL_PATH) ./GIT-VERSION-GEN
227
-include GIT-VERSION-FILE
228
@@ -1632,7 +1632,7 @@ git.o git.spec \
1632
1633
%.o: %.c GIT-CFLAGS
1634
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
1635
-%.s: %.c GIT-CFLAGS .FORCE-LISTING
1635
+%.s: %.c GIT-CFLAGS FORCE
1636
$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
1637
%.o: %.S GIT-CFLAGS
1638
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
@@ -1723,7 +1723,7 @@ cscope:
1723
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
1724
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
1725
1726
-GIT-CFLAGS: .FORCE-GIT-CFLAGS
1726
+GIT-CFLAGS: FORCE
1727
@FLAGS='$(TRACK_CFLAGS)'; \
1728
if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
1729
echo 1>&2 " * new build flags or prefix"; \
@@ -1733,7 +1733,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
1733
# We need to apply sq twice, once to protect from the shell
1734
# that runs GIT-BUILD-OPTIONS, and then again to protect it
1735
# and the first level quoting from the shell that runs "echo".
1736
-GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
1736
+GIT-BUILD-OPTIONS: FORCE
1737
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
1738
@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
1739
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@@ -1745,14 +1745,12 @@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
1745
ifndef NO_TCLTK
1746
TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
1747
1748
-GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
1748
+GIT-GUI-VARS: FORCE
1749
@VARS='$(TRACK_VARS)'; \
1750
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
1751
echo 1>&2 " * new Tcl/Tk interpreter location"; \
1752
echo "$$VARS" >$@; \
1753
fi
1754
-
1755
-.PHONY: .FORCE-GIT-GUI-VARS
1754
endif
1755
1756
### Testing rules
@@ -1972,8 +1970,7 @@ endif
1970
1971
.PHONY: all install clean strip
1972
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
1975
-.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
1976
-.PHONY: .FORCE-GIT-BUILD-OPTIONS .FORCE-LISTING
1973
+.PHONY: FORCE TAGS tags cscope
1974
1975
### Check documentation
1976
#