[PATCH] Fix broken diff-cache output on added files

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index b04c0d8..57e7023 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,71 +7,82 @@
 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 # break unless your underlying filesystem supports those sub-second times
 # (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
+CFLAGS=-g -O2 -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 git-export \
+       diff-cache convert-cache
 
 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
 
-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)
-
-show-diff: show-diff.o read-cache.o
-       $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-       $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-       $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-       $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
+LIBS = $(LIB_FILE)
+LIBS += -lz
 
-cat-file: cat-file.o read-cache.o
-       $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
+ifdef MOZILLA_SHA1
+  SHA1_HEADER="mozilla-sha1/sha1.h"
+  LIB_OBJS += mozilla-sha1/sha1.o
+else
+ifdef PPC_SHA1
+  SHA1_HEADER="ppc/sha1.h"
+  LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+else
+  SHA1_HEADER=<openssl/sha.h>
+  LIBS += -lssl
+endif
+endif
 
-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)
+CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
-checkout-cache: checkout-cache.o read-cache.o
-       $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
+$(LIB_FILE): $(LIB_OBJS)
+       $(AR) rcs $@ $(LIB_OBJS)
 
-diff-tree: diff-tree.o read-cache.o
-       $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.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)
-
-show-files: show-files.o read-cache.o
-       $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-       $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-       $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o
-       $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
+init-db: init-db.o
 
-read-cache.o: cache.h
-show-diff.o: cache.h
+%: %.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o $@ $< $(LIBS)
+
+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)
+convert-cache.o: $(LIB_H)
+diff-cache.o: $(LIB_H)
+diff-tree.o: $(LIB_H)
+fsck-cache.o: $(LIB_H)
+git-export.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 mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
 
 backup: clean
        cd .. ; tar czvf dircache.tar.gz dir-cache