Makefile: remove tracking of TCLTK_PATH
It looks like we are tracking the value of TCLTK_PATH in the main Makefile for no good reason. This patch removes the useless code used to do this tracking. Maybe this code should have been moved to gitk-git/Makefile by 62ba514 (Move gitk to its own subdirectory, 2007-11-17). A patch to do that has just been sent to Paul Mackerras, the gitk maintainer. While at it, this patch removes /gitk-git/gitk-wish from .gitignore as it should be in /gitk-git/.gitignore and the patch sent to Paul put it there. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Dec 18, 2012 at 16:26 UTC
8f26aa44afab5455c911c9e15dd610758113d21c
2 files changed
+1
-15
.gitignore
-2
@@ -1,7 +1,6 @@
1
/GIT-BUILD-OPTIONS
2
/GIT-CFLAGS
3
/GIT-LDFLAGS
4
-/GIT-GUI-VARS
4
/GIT-PREFIX
5
/GIT-SCRIPT-DEFINES
6
/GIT-USER-AGENT
@@ -170,7 +169,6 @@
169
/git-whatchanged
170
/git-write-tree
171
/git-core-*/?*
173
-/gitk-git/gitk-wish
172
/gitweb/GITWEB-BUILD-OPTIONS
173
/gitweb/gitweb.cgi
174
/gitweb/static/gitweb.js
Makefile
+1
-13
@@ -2608,18 +2608,6 @@ ifdef GIT_PERF_MAKE_OPTS
2608
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
2609
endif
2610
2611
-### Detect Tck/Tk interpreter path changes
2612
-ifndef NO_TCLTK
2613
-TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
2614
-
2615
-GIT-GUI-VARS: FORCE
2616
- @VARS='$(TRACK_VARS)'; \
2617
- if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
2618
- echo 1>&2 " * new Tcl/Tk interpreter location"; \
2619
- echo "$$VARS" >$@; \
2620
- fi
2621
-endif
2622
-
2611
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
2612
2613
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
@@ -2894,7 +2882,7 @@ ifndef NO_TCLTK
2882
$(MAKE) -C gitk-git clean
2883
$(MAKE) -C git-gui clean
2884
endif
2897
- $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
2885
+ $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
2886
$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES
2887
2888
.PHONY: all install profile-clean clean strip