mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
bdd478d620
commit
8f26aa44af
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,7 +1,6 @@
|
||||||
/GIT-BUILD-OPTIONS
|
/GIT-BUILD-OPTIONS
|
||||||
/GIT-CFLAGS
|
/GIT-CFLAGS
|
||||||
/GIT-LDFLAGS
|
/GIT-LDFLAGS
|
||||||
/GIT-GUI-VARS
|
|
||||||
/GIT-PREFIX
|
/GIT-PREFIX
|
||||||
/GIT-SCRIPT-DEFINES
|
/GIT-SCRIPT-DEFINES
|
||||||
/GIT-USER-AGENT
|
/GIT-USER-AGENT
|
||||||
|
@ -170,7 +169,6 @@
|
||||||
/git-whatchanged
|
/git-whatchanged
|
||||||
/git-write-tree
|
/git-write-tree
|
||||||
/git-core-*/?*
|
/git-core-*/?*
|
||||||
/gitk-git/gitk-wish
|
|
||||||
/gitweb/GITWEB-BUILD-OPTIONS
|
/gitweb/GITWEB-BUILD-OPTIONS
|
||||||
/gitweb/gitweb.cgi
|
/gitweb/gitweb.cgi
|
||||||
/gitweb/static/gitweb.js
|
/gitweb/static/gitweb.js
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -2608,18 +2608,6 @@ ifdef GIT_PERF_MAKE_OPTS
|
||||||
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
|
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
### Detect Tck/Tk interpreter path changes
|
|
||||||
ifndef NO_TCLTK
|
|
||||||
TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
|
|
||||||
|
|
||||||
GIT-GUI-VARS: FORCE
|
|
||||||
@VARS='$(TRACK_VARS)'; \
|
|
||||||
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
|
|
||||||
echo 1>&2 " * new Tcl/Tk interpreter location"; \
|
|
||||||
echo "$$VARS" >$@; \
|
|
||||||
fi
|
|
||||||
endif
|
|
||||||
|
|
||||||
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
|
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
|
||||||
|
|
||||||
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
|
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
|
||||||
|
@ -2894,7 +2882,7 @@ ifndef NO_TCLTK
|
||||||
$(MAKE) -C gitk-git clean
|
$(MAKE) -C gitk-git clean
|
||||||
$(MAKE) -C git-gui clean
|
$(MAKE) -C git-gui clean
|
||||||
endif
|
endif
|
||||||
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
|
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
|
||||||
$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES
|
$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES
|
||||||
|
|
||||||
.PHONY: all install profile-clean clean strip
|
.PHONY: all install profile-clean clean strip
|
||||||
|
|
Loading…
Reference in a new issue