X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=8d5122bdd518e6d85d15304f7e7638b84c9b00e7;hb=e23d2d6b765162902bd8b722e1659f002b97a302;hp=809383c51b6512d9c33773ba9d35278b8d1ccdf4;hpb=71459c193d04870076efa0a387c317390b53e3e2;p=git.git

diff --git a/Makefile b/Makefile
index 809383c5..8d5122bd 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ LIB_H = \
 	tree-walk.h log-tree.h
 
 DIFF_OBJS = \
-	diff-lib.o diffcore-break.o diffcore-order.o \
+	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
 	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 	diffcore-delta.o log-tree.o
 
@@ -214,7 +214,7 @@ LIB_OBJS = \
 	$(DIFF_OBJS)
 
 BUILTIN_OBJS = \
-	builtin-log.o builtin-help.o
+	builtin-log.o builtin-help.o builtin-grep.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz
@@ -580,7 +580,7 @@ $(LIB_FILE): $(LIB_OBJS)
 XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
 
 $(XDIFF_LIB): $(XDIFF_OBJS)
-	$(AR) rcs $@ $(XDIFF_OBJS)
+	rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
 
 
 doc: