From: Junio C Hamano <junkio@cox.net>
Date: Wed, 26 Apr 2006 06:12:21 +0000 (-0700)
Subject: Merge branch 'jc/diff'
X-Git-Tag: v1.4.0-rc1~216
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9b5b75ca87f45292de8ecde5d4d0512ac9542cd?ds=inline;hp=-c

Merge branch 'jc/diff'

* jc/diff:
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
---

e9b5b75ca87f45292de8ecde5d4d0512ac9542cd
diff --combined Makefile
index 809383c51b,0924f84c4f..087ff27c28
--- a/Makefile
+++ b/Makefile
@@@ -199,7 -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
  
@@@ -575,7 -575,7 +575,7 @@@ $(patsubst git-%$X,%.o,$(PROGRAMS)): $(
  $(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