{"thread":{"id":"32359","subject":"[PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH","startedAt":"2012-12-16T19:38:48Z","lastAt":"2012-12-17T07:32:16Z","messageCount":4,"participants":["Christian Couder","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"204984","messageId":"20121216193850.23461.28099.chriscool@tuxfamily.org","threadId":"32359","inReplyTo":null,"subject":"[PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2012-12-16T19:38:48Z","receivedAt":"2012-12-16T19:38:48Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"It looks like we are tracking the value of TCLTK_PATH in the main\nMakefile for no good reason, as this is done in git-gui too and the\nGIT-GUI-VARS is not used in the Makefile.\n\nThis patch removes the useless code used to do this tracking.\n\nSigned-off-by: Christian Couder \n---\n .gitignore | 1 -\n Makefile | 14 +-------------\n 2 files changed, 1 insertion(+), 14 deletions(-)\n\ndiff --git a/.gitignore b/.gitignore\nindex f702415..6d69ae1 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,7 +1,6 @@\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\n /GIT-LDFLAGS\n-/GIT-GUI-VARS\n /GIT-PREFIX\n /GIT-SCRIPT-DEFINES\n /GIT-USER-AGENT\ndiff --git a/Makefile b/Makefile\nindex 4ad6fbd..585b2eb 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2624,18 +2624,6 @@ ifdef GIT_PERF_MAKE_OPTS\n \t@echo GIT_PERF_MAKE_OPTS=\\''$(subst ','\\'',$(subst ','\\'',$(GIT_PERF_MAKE_OPTS)))'\\' >>$@\n endif\n \n-### Detect Tck/Tk interpreter path changes\n-ifndef NO_TCLTK\n-TRACK_VARS = $(subst ','\\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')\n-\n-GIT-GUI-VARS: FORCE\n-\t@VARS='$(TRACK_VARS)'; \\\n-\t if test x\"$$VARS\" != x\"`cat $@ 2>/dev/null`\" ; then \\\n-\t\techo 1>&2 \" * new Tcl/Tk interpreter location\"; \\\n-\t\techo \"$$VARS\" >$@; \\\n- fi\n-endif\n-\n test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))\n \n all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n@@ -2910,7 +2898,7 @@ ifndef NO_TCLTK\n \t$(MAKE) -C gitk-git clean\n \t$(MAKE) -C git-gui clean\n endif\n-\t$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS\n+\t$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS\n \t$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES\n \n .PHONY: all install profile-clean clean strip\n-- \n1.8.1.rc1.2.g8740035\n"},{"id":"205002","messageId":"7v4njlpaet.fsf@alter.siamese.dyndns.org","threadId":"32359","inReplyTo":"20121216193850.23461.28099.chriscool@tuxfamily.org","subject":"Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-17T04:31:06Z","receivedAt":"2012-12-17T04:31:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder writes:\n\n> It looks like we are tracking the value of TCLTK_PATH in the main\n> Makefile for no good reason, as this is done in git-gui too and the\n> GIT-GUI-VARS is not used in the Makefile.\n\nThis was added to the main Makefile when we slurped gitk to our\nproject at the top-level, so I am not surprised if git-gui were\nnot depending on it at all.\n\nA better explanation is that t62ba514 (Move gitk to its own\nsubdirectory, 2007-11-17) should have moved these lines to\ngitk-git/Makefile (and I think we should move them there in a\nseparate patch).\n"},{"id":"205024","messageId":"20121217.082241.794967023844368825.chriscool@tuxfamily.org","threadId":"32359","inReplyTo":"7v4njlpaet.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2012-12-17T07:22:41Z","receivedAt":"2012-12-17T07:22:41Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"From: Junio C Hamano \n>\n> Christian Couder writes:\n> \n>> It looks like we are tracking the value of TCLTK_PATH in the main\n>> Makefile for no good reason, as this is done in git-gui too and the\n>> GIT-GUI-VARS is not used in the Makefile.\n> \n> This was added to the main Makefile when we slurped gitk to our\n> project at the top-level, so I am not surprised if git-gui were\n> not depending on it at all.\n> \n> A better explanation is that t62ba514 (Move gitk to its own\n> subdirectory, 2007-11-17) should have moved these lines to\n> gitk-git/Makefile (and I think we should move them there in a\n> separate patch).\n\nYeah, I just sent an updated patch series that does this.\n\nThanks,\nChristian. \n"},{"id":"205027","messageId":"7vzk1dm8vz.fsf@alter.siamese.dyndns.org","threadId":"32359","inReplyTo":"20121217.082241.794967023844368825.chriscool@tuxfamily.org","subject":"Re: [PATCH v2 1/2] Makefile: remove tracking of TCLTK_PATH","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-17T07:32:16Z","receivedAt":"2012-12-17T07:32:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder writes:\n\n> From: Junio C Hamano \n>>\n>> Christian Couder writes:\n>> \n>>> It looks like we are tracking the value of TCLTK_PATH in the main\n>>> Makefile for no good reason, as this is done in git-gui too and the\n>>> GIT-GUI-VARS is not used in the Makefile.\n>> \n>> This was added to the main Makefile when we slurped gitk to our\n>> project at the top-level, so I am not surprised if git-gui were\n>> not depending on it at all.\n>> \n>> A better explanation is that t62ba514 (Move gitk to its own\n>> subdirectory, 2007-11-17) should have moved these lines to\n>> gitk-git/Makefile (and I think we should move them there in a\n>> separate patch).\n>\n> Yeah, I just sent an updated patch series that does this.\n\nIt still seems to talk about git-gui which the snippet you removed\ndoes not have anything to do with, though.\n"}]}