Merge of http://members.cox.net/junkio/git-jc.git

diff --git a/Makefile b/Makefile
index ad31e8a2d61ea382f689cb7144ee16aa8a82e9f6..a8d41757b02e114826e0bdcbe3a00dcfd39e62f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,24 @@ CFLAGS=-g -O2 -Wall
 CC=gcc
 AR=ar
 
-SCRIPTS=git-merge-one-file-script git-prune-script git-pull-script \
-       git-tag-script
+SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
+       git-pull-script git-tag-script git-resolve-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
-       git-checkout-cache git-diff-tree git-rev-tree git-show-files \
+       git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-http-pull git-rpush git-rpull git-rev-list git-mktag \
-       git-diff-tree-helper git-tar-tree
+       git-diff-tree-helper git-tar-tree git-local-pull git-write-blob
 
 all: $(PROG)
 
 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 tag.o
+LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
+        tag.o date.o
 LIB_FILE=libgit.a
 LIB_H=cache.h object.h blob.h tree.h commit.h tag.h
 
@@ -59,7 +60,8 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 $(LIB_FILE): $(LIB_OBJS)
        $(AR) rcs $@ $(LIB_OBJS)
 
-init-db: init-db.o
+test-date: test-date.c date.o
+       $(CC) $(CFLAGS) -o $@ test-date.c date.o
 
 git-%: %.c $(LIB_FILE)
        $(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
@@ -75,7 +77,7 @@ git-fsck-cache: fsck-cache.c
 git-checkout-cache: checkout-cache.c
 git-diff-tree: diff-tree.c
 git-rev-tree: rev-tree.c
-git-show-files: show-files.c
+git-ls-files: ls-files.c
 git-check-files: check-files.c
 git-ls-tree: ls-tree.c
 git-merge-base: merge-base.c
@@ -84,13 +86,15 @@ git-unpack-file: unpack-file.c
 git-export: export.c
 git-diff-cache: diff-cache.c
 git-convert-cache: convert-cache.c
-git-http-pull: http-pull.c
+git-http-pull: http-pull.c pull.c
+git-local-pull: local-pull.c pull.c
 git-rpush: rsh.c
-git-rpull: rsh.c
+git-rpull: rsh.c pull.c
 git-rev-list: rev-list.c
 git-mktag: mktag.c
 git-diff-tree-helper: diff-tree-helper.c
 git-tar-tree: tar-tree.c
+git-write-blob: write-blob.c
 
 git-http-pull: LIBS += -lcurl
 
@@ -104,6 +108,7 @@ read-cache.o: $(LIB_H)
 sha1_file.o: $(LIB_H)
 usage.o: $(LIB_H)
 diff.o: $(LIB_H)
+strbuf.o: $(LIB_H)
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)