Merge branch 'jc/blame' into jc/web-blame

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 20bda7d7973fdfbf4a32209c22f58df16b0b33dd..473ff271fe2fc3c4d7a5157460f6b837d9e97405 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ SCRIPT_SH = \
 SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
        git-shortlog.perl git-rerere.perl \
-       git-annotate.perl git-cvsserver.perl \
+       git-cvsserver.perl \
        git-svnimport.perl git-cvsexportcommit.perl \
        git-send-email.perl git-svn.perl
 
@@ -267,6 +267,7 @@ LIB_OBJS = \
 
 BUILTIN_OBJS = \
        builtin-add.o \
+       builtin-annotate.o \
        builtin-apply.o \
        builtin-archive.o \
        builtin-cat-file.o \