Skip to content

Commit 54350a2

Browse files
jrnspearce
authored andcommitted
git-gui: 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). Cc: Junio C Hamano <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent 60204dd commit 54350a2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ all::
77
# TCL_PATH must be vaild for this to work.
88
#
99

10-
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
10+
GIT-VERSION-FILE: FORCE
1111
@$(SHELL_PATH) ./GIT-VERSION-GEN
1212
-include GIT-VERSION-FILE
1313

@@ -270,7 +270,7 @@ TRACK_VARS = \
270270
GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \
271271
#end TRACK_VARS
272272

273-
GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
273+
GIT-GUI-VARS: FORCE
274274
@VARS='$(TRACK_VARS)'; \
275275
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
276276
echo 1>&2 " * new locations or Tcl/Tk interpreter"; \
@@ -340,5 +340,4 @@ ifdef GITGUI_WINDOWS_WRAPPER
340340
endif
341341

342342
.PHONY: all install uninstall dist-version clean
343-
.PHONY: .FORCE-GIT-VERSION-FILE
344-
.PHONY: .FORCE-GIT-GUI-VARS
343+
.PHONY: FORCE

0 commit comments

Comments
 (0)