Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH
Christian Couder writes: > From: Junio C Hamano >> >> Christian Couder writes: >> >>> It looks like we are tracking the value of TCLTK_PATH in the main >>> Makefile for no good reason, as this is done in git-gui too and the >>> GIT-GUI-VARS is not used in the Makefile. >> >> This was added to the main Makefile when we slurped gitk to our >> project at the top-level, so I am not surprised if git-gui were >> not depending on it at all. >> >> A better explanation is that t62ba514 (Move gitk to its own >> subdirectory, 2007-11-17) should have moved these lines to >> gitk-git/Makefile (and I think we should move them there in a >> separate patch). > > Yeah, I just sent an updated patch series that does this. It still seems to talk about git-gui which the snippet you removed does not have anything to do with, though. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH
From: Junio C Hamano > > Christian Couder writes: > >> It looks like we are tracking the value of TCLTK_PATH in the main >> Makefile for no good reason, as this is done in git-gui too and the >> GIT-GUI-VARS is not used in the Makefile. > > This was added to the main Makefile when we slurped gitk to our > project at the top-level, so I am not surprised if git-gui were > not depending on it at all. > > A better explanation is that t62ba514 (Move gitk to its own > subdirectory, 2007-11-17) should have moved these lines to > gitk-git/Makefile (and I think we should move them there in a > separate patch). Yeah, I just sent an updated patch series that does this. Thanks, Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH
Christian Couder writes: > It looks like we are tracking the value of TCLTK_PATH in the main > Makefile for no good reason, as this is done in git-gui too and the > GIT-GUI-VARS is not used in the Makefile. This was added to the main Makefile when we slurped gitk to our project at the top-level, so I am not surprised if git-gui were not depending on it at all. A better explanation is that t62ba514 (Move gitk to its own subdirectory, 2007-11-17) should have moved these lines to gitk-git/Makefile (and I think we should move them there in a separate patch). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/2] 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, as this is done in git-gui too and the GIT-GUI-VARS is not used in the Makefile. This patch removes the useless code used to do this tracking. Signed-off-by: Christian Couder --- .gitignore | 1 - Makefile | 14 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f702415..6d69ae1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /GIT-BUILD-OPTIONS /GIT-CFLAGS /GIT-LDFLAGS -/GIT-GUI-VARS /GIT-PREFIX /GIT-SCRIPT-DEFINES /GIT-USER-AGENT diff --git a/Makefile b/Makefile index 4ad6fbd..585b2eb 100644 --- a/Makefile +++ b/Makefile @@ -2624,18 +2624,6 @@ ifdef GIT_PERF_MAKE_OPTS @echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@ 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)) all:: $(TEST_PROGRAMS) $(test_bindir_programs) @@ -2910,7 +2898,7 @@ ifndef NO_TCLTK $(MAKE) -C gitk-git clean $(MAKE) -C git-gui clean 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 .PHONY: all install profile-clean clean strip -- 1.8.1.rc1.2.g8740035 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
