Improve build: add <unistd.h> and use -O2 instead of -O3

diff --git a/Makefile b/Makefile
index 424c4e43ef5ae4efc7f904b776fc6b0474b451ab..a244b27ac61489b7d7fa4246e82479897d3bb886 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # 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
@@ -15,7 +15,8 @@ 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 merge-cache
+       check-files ls-tree merge-base merge-cache unpack-file git-export \
+       diff-cache convert-cache
 
 all: $(PROG)
 
@@ -24,6 +25,7 @@ install: $(PROG)
 
 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)
@@ -77,8 +79,45 @@ merge-base: merge-base.o $(LIB_FILE) object.o commit.o tree.o blob.o
 merge-cache: merge-cache.o $(LIB_FILE)
        $(CC) $(CFLAGS) -o merge-cache merge-cache.o $(LIBS)
 
-read-cache.o: cache.h
-show-diff.o: cache.h
+unpack-file: unpack-file.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o unpack-file unpack-file.o $(LIBS)
+
+git-export: git-export.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o git-export git-export.o $(LIBS)
+
+diff-cache: diff-cache.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o diff-cache diff-cache.o $(LIBS)
+
+convert-cache: convert-cache.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o convert-cache convert-cache.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) $(LIB_FILE)