summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-02-19 20:16:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-20 00:55:38 (GMT)
commit2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc (patch)
tree5b74f7ad5ef86e64a800c7e7b2936568ab36141c /Makefile
parent39c015c556f285106931e0500f301de462b0e46e (diff)
downloadgit-2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc.zip
git-2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc.tar.gz
git-2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc.tar.bz2
avoid makefile override warning
Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b43d66f..080651e 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
# The ones that do not have to link with lcrypto nor lz.
SIMPLE_PROGRAMS = \
- git-get-tar-commit-id$X git-mailinfo$X git-mailsplit$X \
+ git-get-tar-commit-id$X git-mailsplit$X \
git-stripspace$X git-daemon$X
# ... and all the rest that could be moved out of bindir to gitexecdir
@@ -146,8 +146,8 @@ PROGRAMS = \
git-convert-objects$X git-diff-files$X \
git-diff-index$X git-diff-stages$X \
git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
- git-hash-object$X git-index-pack$X git-init-db$X \
- git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$X \
+ git-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
+ git-ls-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
git-merge-index$X git-mktag$X git-pack-objects$X git-patch-id$X \
git-peek-remote$X git-prune-packed$X git-read-tree$X \
git-receive-pack$X git-rev-list$X git-rev-parse$X \