X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=390bd32639a241d648c84ae3b2b0893a029bdda8;hb=e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4;hp=0c3ba2eb8bda000f1062414de093dd9aa7a240d9;hpb=b5039db6d25ae25f1cb2db541ed13602784fafc3;p=git.git

diff --git a/Makefile b/Makefile
index 0c3ba2eb..390bd326 100644
--- a/Makefile
+++ b/Makefile
@@ -10,68 +10,104 @@
 CFLAGS=-g -O3 -Wall
 
 CC=gcc
+AR=ar
 
 
 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
+	check-files ls-tree merge-base merge-cache unpack-file
 
 all: $(PROG)
 
 install: $(PROG)
 	install $(PROG) $(HOME)/bin/
 
-LIBS= -lssl -lz
+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_FILE): $(LIB_OBJS)
+	$(AR) rcs $@ $(LIB_OBJS)
+
+LIBS= $(LIB_FILE) -lssl -lz
 
 init-db: init-db.o
 
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
+update-cache: update-cache.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o update-cache update-cache.o $(LIBS)
+
+show-diff: show-diff.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o show-diff show-diff.o $(LIBS)
+
+write-tree: write-tree.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o write-tree write-tree.o $(LIBS)
 
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
+read-tree: read-tree.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o read-tree read-tree.o $(LIBS)
 
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
+commit-tree: commit-tree.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o commit-tree commit-tree.o $(LIBS)
 
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
+cat-file: cat-file.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o cat-file cat-file.o $(LIBS)
 
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
+fsck-cache: fsck-cache.o $(LIB_FILE) object.o commit.o tree.o blob.o
+	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o $(LIBS)
 
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
+checkout-cache: checkout-cache.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o $(LIBS)
 
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
+diff-tree: diff-tree.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o diff-tree diff-tree.o $(LIBS)
 
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
+rev-tree: rev-tree.o $(LIB_FILE) object.o commit.o tree.o blob.o
+	$(CC) $(CFLAGS) -o rev-tree rev-tree.o $(LIBS)
 
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
+show-files: show-files.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o show-files show-files.o $(LIBS)
 
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
+check-files: check-files.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o check-files check-files.o $(LIBS)
 
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
+ls-tree: ls-tree.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o ls-tree ls-tree.o $(LIBS)
 
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
+merge-base: merge-base.o $(LIB_FILE) object.o commit.o tree.o blob.o
+	$(CC) $(CFLAGS) -o merge-base merge-base.o $(LIBS)
 
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
+merge-cache: merge-cache.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o merge-cache merge-cache.o $(LIBS)
 
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
+unpack-file: unpack-file.o $(LIB_FILE)
+	$(CC) $(CFLAGS) -o unpack-file unpack-file.o $(LIBS)
 
-read-cache.o: cache.h
-show-diff.o: cache.h
+blob.o: $(LIB_H)
+cat-file.o: $(LIB_H)
+check-files.o: $(LIB_H)
+checkout-cache.o: $(LIB_H)
+commit.o: $(LIB_H)
+commit-tree.o: $(LIB_H)
+diff-tree.o: $(LIB_H)
+fsck-cache.o: $(LIB_H)
+init-db.o: $(LIB_H)
+ls-tree.o: $(LIB_H)
+merge-base.o: $(LIB_H)
+merge-cache.o: $(LIB_H)
+object.o: $(LIB_H)
+read-cache.o: $(LIB_H)
+read-tree.o: $(LIB_H)
+rev-tree.o: $(LIB_H)
+sha1_file.o: $(LIB_H)
+show-diff.o: $(LIB_H)
+show-files.o: $(LIB_H)
+tree.o: $(LIB_H)
+update-cache.o: $(LIB_H)
+usage.o: $(LIB_H)
+unpack-file.o: $(LIB_H)
+write-tree.o: $(LIB_H)
 
 clean:
-	rm -f *.o $(PROG)
+	rm -f *.o $(PROG) $(LIB_FILE)
 
 backup: clean
 	cd .. ; tar czvf dircache.tar.gz dir-cache