Merge branch 'jc/mktree' into sb/opt-filename

[thirdparty/git.git] / Makefile

diff --git a/Makefile b/Makefile
index eaae45db7cded397eb109d81f6dbf6b8c8a2bc69..ab6f6e14ebba10641348c3562094ac27032caf87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,6 @@ PROGRAMS += git-index-pack$X
 PROGRAMS += git-merge-index$X
 PROGRAMS += git-merge-tree$X
 PROGRAMS += git-mktag$X
-PROGRAMS += git-mktree$X
 PROGRAMS += git-pack-redundant$X
 PROGRAMS += git-patch-id$X
 PROGRAMS += git-shell$X
@@ -590,6 +589,7 @@ BUILTIN_OBJS += builtin-merge-base.o
 BUILTIN_OBJS += builtin-merge-file.o
 BUILTIN_OBJS += builtin-merge-ours.o
 BUILTIN_OBJS += builtin-merge-recursive.o
+BUILTIN_OBJS += builtin-mktree.o
 BUILTIN_OBJS += builtin-mv.o
 BUILTIN_OBJS += builtin-name-rev.o
 BUILTIN_OBJS += builtin-pack-objects.o