summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-04 06:40:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-04 06:40:39 (GMT)
commitd820f918711446a74cc74577f6f2535a78752708 (patch)
treeb46ae3884e9fa20eb0c8083d90a316e3631ab6f3 /Makefile
parent5dfde8715664d389de640d9475fb1678b8403596 (diff)
parent80fe7d2b54b1aebde6c067694cdbf3ba40ad0c39 (diff)
downloadgit-d820f918711446a74cc74577f6f2535a78752708.zip
git-d820f918711446a74cc74577f6f2535a78752708.tar.gz
git-d820f918711446a74cc74577f6f2535a78752708.tar.bz2
Merge branch 'jc/count'
* jc/count: builtin-count-objects: open packs when running -v builtin-count-objects: make it official. built-in count-objects.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9cb40a8..67559c9 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
SCRIPT_SH = \
git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
- git-count-objects.sh git-diff.sh git-fetch.sh \
+ git-diff.sh git-fetch.sh \
git-format-patch.sh git-ls-remote.sh \
git-merge-one-file.sh git-parse-remote.sh \
git-prune.sh git-pull.sh git-rebase.sh \
@@ -168,7 +168,7 @@ PROGRAMS = \
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
BUILT_INS = git-log$X \
- git-push$X
+ git-count-objects$X git-push$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -215,7 +215,7 @@ LIB_OBJS = \
$(DIFF_OBJS)
BUILTIN_OBJS = \
- builtin-log.o builtin-help.o builtin-push.o
+ builtin-log.o builtin-help.o builtin-count.o builtin-push.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
LIBS = $(GITLIBS) -lz