X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=8ce27a65fb822afe34374a719ac552ff79a45074;hb=935e714204fe167aa6172a733e7131ee5b4577f4;hp=a83c5029f468b74e50da489451a6b6449d800a8b;hpb=70827b15bfb11f7aea52c6995956be9d149233e1;p=git.git

diff --git a/Makefile b/Makefile
index a83c5029..8ce27a65 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
 
@@ -470,6 +470,8 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
 		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
 		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 
+builtin-help.o: common-cmds.h
+
 $(BUILT_INS): git$X
 	rm -f $@ && ln git$X $@
 
@@ -573,12 +575,12 @@ $(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
-	$(AR) rcs $@ $(LIB_OBJS)
+	rm -f $@ && $(AR) rcs $@ $(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: