summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-08-17 07:07:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-18 17:20:36 (GMT)
commit960160b061a29a4a4ae637e035c3892da72326ac (patch)
tree9db37d02eae61caa1896e7f9a4bf9b5675dc47f4 /contrib/subtree
parentda33a97998f6d6206c08bd72a527f5b8e6e26d33 (diff)
downloadgit-960160b061a29a4a4ae637e035c3892da72326ac.zip
git-960160b061a29a4a4ae637e035c3892da72326ac.tar.gz
git-960160b061a29a4a4ae637e035c3892da72326ac.tar.bz2
subtree: make "all" default target of Makefile
You should be able to run "make" in contrib/subtree with no arguments and get the "all" target. This was broken by 8e2a5cc (contrib/subtree/Makefile: use GIT-VERSION-FILE, 2014-05-06), which put the rule for GIT-VERSION-FILE higher in the file. We can fix this by putting an empty "all::" target at the top of the file, just like our main Makefile does, and document that fact. That fixes this instance and future-proofs against it happening again. Reported-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index d9a0ce2..c2bd703 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -1,3 +1,6 @@
+# The default target of this Makefile is...
+all::
+
-include ../../config.mak.autogen
-include ../../config.mak
@@ -34,7 +37,7 @@ GIT_SUBTREE_XML := git-subtree.xml
GIT_SUBTREE_TXT := git-subtree.txt
GIT_SUBTREE_HTML := git-subtree.html
-all: $(GIT_SUBTREE)
+all:: $(GIT_SUBTREE)
$(GIT_SUBTREE): $(GIT_SUBTREE_SH)
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' $< >$@