Merge with git://kernel.org/pub/scm/git/git.git

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 809383c..8ce27a6 100644 (file)
--- 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
 
@@ -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: