[PATCH] Use diff-tree -p -r instead of "git diff" in git-export.

diff --git a/Makefile b/Makefile
index 57e70239503466fb3a77f1f2618ee64377e8e04b..2d2913b6b98ac836b43755b1304d2a838dad87dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,21 +12,29 @@ CFLAGS=-g -O2 -Wall
 CC=gcc
 AR=ar
 
+SCRIPTS=git-merge-one-file-script git-prune-script git-pull-script git-tag-script
 
 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
        cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
        check-files ls-tree merge-base merge-cache unpack-file git-export \
-       diff-cache convert-cache
+       diff-cache convert-cache http-pull rpush rpull rev-list git-mktag \
+       diff-tree-helper
 
 all: $(PROG)
 
-install: $(PROG)
-       install $(PROG) $(HOME)/bin/
+install: $(PROG) $(SCRIPTS)
+       install $(PROG) $(SCRIPTS) $(HOME)/bin/
 
 LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o
 LIB_FILE=libgit.a
 LIB_H=cache.h object.h
 
+LIB_H += strbuf.h
+LIB_OBJS += strbuf.o
+
+LIB_H += diff.h
+LIB_OBJS += diff.o
+
 LIBS = $(LIB_FILE)
 LIBS += -lz
 
@@ -50,8 +58,14 @@ $(LIB_FILE): $(LIB_OBJS)
 
 init-db: init-db.o
 
-%: %.o $(LIB_FILE)
-       $(CC) $(CFLAGS) -o $@ $< $(LIBS)
+%: %.c $(LIB_FILE)
+       $(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
+
+rpush: rsh.c
+
+rpull: rsh.c
+
+http-pull: LIBS += -lcurl
 
 blob.o: $(LIB_H)
 cat-file.o: $(LIB_H)
@@ -60,6 +74,7 @@ checkout-cache.o: $(LIB_H)
 commit.o: $(LIB_H)
 commit-tree.o: $(LIB_H)
 convert-cache.o: $(LIB_H)
+diff.o: $(LIB_H)
 diff-cache.o: $(LIB_H)
 diff-tree.o: $(LIB_H)
 fsck-cache.o: $(LIB_H)
@@ -80,6 +95,9 @@ update-cache.o: $(LIB_H)
 usage.o: $(LIB_H)
 unpack-file.o: $(LIB_H)
 write-tree.o: $(LIB_H)
+http-pull.o: $(LIB_H)
+rpull.o: $(LIB_H)
+rpush.o: $(LIB_H)
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)