{"thread":{"id":"2624","subject":"[PATCH] Fix git.c compilation target","startedAt":"2005-11-21T08:10:29Z","lastAt":"2005-11-22T08:08:27Z","messageCount":6,"participants":["Alex Riesen","Junio C Hamano","Andreas Ericsson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"12417","messageId":"81b0412b0511210010m66a3f898q6d108a799de023d9@mail.gmail.com","threadId":"2624","inReplyTo":null,"subject":"[PATCH] Fix git.c compilation target","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2005-11-21T08:10:29Z","receivedAt":"2005-11-21T08:10:29Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"The target for \"git\" was missing $(X), strangely essential for some\nexotic platform.\n\nSigned-off-by: Alex Riesen \n\n\nSubject: [PATCH] fix compilation of git(.exe)\n(cherry picked from b0911b2af7c52639a2c6ae8f038ba5753f886a28 commit)\n\nSigned-off-by: Alex Riesen \n\n\n---\n\n Makefile | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\napplies-to: e12ceef6841365e64bb765294235a67e9263d7de\n2323c0467c437c337c0ad59e9660ccea920ff866\ndiff --git a/Makefile b/Makefile\nindex 092931a..65b948b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -342,15 +342,15 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)\n export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir\n ### Build rules\n \n-all: $(PROGRAMS) $(SCRIPTS) git\n+all: $(PROGRAMS) $(SCRIPTS) git$(X)\n \n all:\n \t$(MAKE) -C templates\n \n # Only use $(CFLAGS). We don't need anything else.\n-git: git.c Makefile\n+git$(X): git.c Makefile\n \t$(CC) -DGIT_EXEC_PATH='\"$(bindir)\"' -DGIT_VERSION='\"$(GIT_VERSION)\"' \\\n-\t\t$(CFLAGS) $@.c -o $@\n+\t\t$(CFLAGS) $< -o $@\n \n $(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh\n \trm -f $@\n---\n0.99.9.GIT\n"},{"id":"12422","messageId":"81b0412b0511210124u5cc0d4efv2045123d92872c66@mail.gmail.com","threadId":"2624","inReplyTo":"81b0412b0511210010m66a3f898q6d108a799de023d9@mail.gmail.com","subject":"Re: [PATCH] Fix git.c compilation target","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2005-11-21T09:24:17Z","receivedAt":"2005-11-21T09:24:17Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"There was more to it.\nThe patch removes a reference to git.sh from Makefile and installs\n_all_ programs and scripts.\n\nSigned-off-by: Alex Riesen \n\n\nSubject: [PATCH] forget git.sh and install all programs and scripts\n\nSigned-off-by: Alex Riesen \n\n\n---\n\n Makefile | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\napplies-to: 0d9013b9e1804aa68afbc6328d9cf93f36a6bebe\nc32490dd373e0fb8b963aa0d2aa31f8a209e09b1\ndiff --git a/Makefile b/Makefile\nindex 65b948b..f6f4b87 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -352,7 +352,7 @@ git$(X): git.c Makefile\n \t$(CC) -DGIT_EXEC_PATH='\"$(bindir)\"' -DGIT_VERSION='\"$(GIT_VERSION)\"' \\\n \t\t$(CFLAGS) $< -o $@\n \n-$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh\n+$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh\n \trm -f $@\n \tsed -e '1s|#!.*/sh|#!$(call shq,$(SHELL_PATH))|' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n@@ -436,9 +436,9 @@ check:\n \n ### Installation rules\n \n-install: $(PROGRAMS) $(SCRIPTS) git\n+install: $(PROGRAMS) $(SCRIPTS) git$(X)\n \t$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))\n-\t$(INSTALL) git $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))\n+\t$(INSTALL) $+ $(call shellquote,$(DESTDIR)$(bindir))\n \t$(MAKE) -C templates install\n \t$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))\n \t$(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))\n---\n0.99.9.GIT\n"},{"id":"12490","messageId":"7vlkzhmwq4.fsf@assigned-by-dhcp.cox.net","threadId":"2624","inReplyTo":"81b0412b0511210124u5cc0d4efv2045123d92872c66@mail.gmail.com","subject":"Re: [PATCH] Fix git.c compilation target","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-21T23:01:39Z","receivedAt":"2005-11-21T23:01:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Riesen writes:\n\n> There was more to it.\n> The patch removes a reference to git.sh from Makefile and installs\n> _all_ programs and scripts.\n>\n\nThanks; the filter-out should go, but I am wondering if it makes\nmore sense to:\n\n - make git$(X) part of PROGRAMS (probably it is a\n SIMPLE_PROGRAM that does not link with many extra stuff, or a\n class on its own);\n\n - have \"install\" target depend on \"all\".\n"},{"id":"12492","messageId":"43825BCF.8040402@op5.se","threadId":"2624","inReplyTo":"7vlkzhmwq4.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Re: [PATCH] Fix git.c compilation target","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2005-11-21T23:44:15Z","receivedAt":"2005-11-21T23:44:15Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> \n> - make git$(X) part of PROGRAMS (probably it is a\n> SIMPLE_PROGRAM that does not link with many extra stuff, or a\n> class on its own);\n> \n> - have \"install\" target depend on \"all\".\n> \n\nSomething like this?\n\n##########\nIntroduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.\n\nRemove $(SIMPLE_PROGRAMS) from $(PROGRAMS) so buildrules don't have\nto be overridden.\n\nPut $(SCRIPTS) with the other target-macros so it doesn't get lonely.\n\nSigned-off-by: Andreas Ericsson \n\n---\n\n Makefile | 22 ++++++++++++----------\n 1 files changed, 12 insertions(+), 10 deletions(-)\n\napplies-to: 339319e60db7b3f96f8c711407b135a54da7aa2e\nbf68baa57babbff57761a802fde801e71e85807e\ndiff --git a/Makefile b/Makefile\nindex d6dad19..0e2f65d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -102,6 +102,11 @@ SCRIPT_PERL = \\\n SCRIPT_PYTHON = \\\n \tgit-merge-recursive.py\n\n+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \\\n+\t $(patsubst %.perl,%,$(SCRIPT_PERL)) \\\n+\t $(patsubst %.py,%,$(SCRIPT_PYTHON)) \\\n+\t gitk git-cherry-pick\n+\n # The ones that do not have to link with lcrypto nor lz.\n SIMPLE_PROGRAMS = \\\n \tgit-get-tar-commit-id$X git-mailinfo$X git-mailsplit$X \\\n@@ -125,8 +130,10 @@ PROGRAMS = \\\n \tgit-unpack-objects$X git-update-index$X git-update-server-info$X \\\n \tgit-upload-pack$X git-verify-pack$X git-write-tree$X \\\n \tgit-update-ref$X git-symbolic-ref$X git-check-ref-format$X \\\n-\tgit-name-rev$X git-pack-redundant$X git-config-set$X git-var$X \\\n-\t$(SIMPLE_PROGRAMS)\n+\tgit-name-rev$X git-pack-redundant$X git-config-set$X git-var$X\n+\n+# what 'all' will build and 'install' will install.\n+ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) git$X\n\n # Backward compatibility -- to be removed after 1.0\n PROGRAMS += git-ssh-pull$X git-ssh-push$X\n@@ -339,15 +346,10 @@ endif\n\n ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER))\n\n-SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \\\n-\t $(patsubst %.perl,%,$(SCRIPT_PERL)) \\\n-\t $(patsubst %.py,%,$(SCRIPT_PYTHON)) \\\n-\t gitk git-cherry-pick\n-\n export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir\n ### Build rules\n\n-all: $(PROGRAMS) $(SCRIPTS) git\n+all: $(ALL_PROGRAMS)\n\n all:\n \t$(MAKE) -C templates\n@@ -441,9 +443,9 @@ check:\n\n ### Installation rules\n\n-install: $(PROGRAMS) $(SCRIPTS) git\n+install: all\n \t$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))\n-\t$(INSTALL) git $(PROGRAMS) $(SCRIPTS) $(call \nshellquote,$(DESTDIR)$(bindir))\n+\t$(INSTALL) $(ALL_PROGRAMS) $(call shellquote,$(DESTDIR)$(bindir))\n \t$(MAKE) -C templates install\n \t$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))\n \t$(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))\n---\n0.99.9.GIT\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"12524","messageId":"81b0412b0511212347n6f478824i7ad0ffdaa78285f3@mail.gmail.com","threadId":"2624","inReplyTo":"43825BCF.8040402@op5.se","subject":"Re: [PATCH] Re: [PATCH] Fix git.c compilation target","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2005-11-22T07:47:50Z","receivedAt":"2005-11-22T07:47:50Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 11/22/05, Andreas Ericsson wrote:\n> > - make git$(X) part of PROGRAMS (probably it is a\n> > SIMPLE_PROGRAM that does not link with many extra stuff, or a\n> > class on its own);\n> >\n> > - have \"install\" target depend on \"all\".\n> >\n>\n> Something like this?\n>\n> ##########\n> Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.\n>\n\nYes, that's what I _actually_ mean :)\n"},{"id":"12525","messageId":"7v1x19gl50.fsf@assigned-by-dhcp.cox.net","threadId":"2624","inReplyTo":"81b0412b0511212347n6f478824i7ad0ffdaa78285f3@mail.gmail.com","subject":"Re: [PATCH] Re: [PATCH] Fix git.c compilation target","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-22T08:08:27Z","receivedAt":"2005-11-22T08:08:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Riesen writes:\n\n> On 11/22/05, Andreas Ericsson wrote:\n>> > - make git$(X) part of PROGRAMS (probably it is a\n>> > SIMPLE_PROGRAM that does not link with many extra stuff, or a\n>> > class on its own);\n>> >\n>> > - have \"install\" target depend on \"all\".\n>> >\n>>\n>> Something like this?\n>>\n>> ##########\n>> Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.\n>\n> Yes, that's what I _actually_ mean :)\n\nThanks, both. Applied with minor clean-ups for the \"clean\"\ntarget on top (forgot to remove SIMPLE_PROGRAM), and will push\nout.\n"}]}