Merge with Linus' current tree

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index b02c234..233d24a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,18 @@ CC=gcc
 AR=ar
 INSTALL=install
 
+#
+# sparse is architecture-neutral, which means that we need to tell it
+# explicitly what architecture to check for. Fix this up for yours..
+#
+SPARSE_FLAGS=-D__BIG_ENDIAN__ -D__powerpc__
+
 SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
-       git-deltafy-script git-fetch-script git-status-script git-commit-script \
-       git-log-script git-shortlog git-cvsimport-script
+       git-fetch-script git-status-script git-commit-script \
+       git-log-script git-shortlog git-cvsimport-script git-diff-script \
+       git-reset-script git-add-script git-checkout-script git-clone-script \
+       gitk git-cherry git-rebase-script git-relink-script git-repack-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 \
@@ -32,8 +40,10 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-write-blob \
-       git-get-tar-commit-id git-mkdelta git-apply git-stripspace \
-       git-cvs2git
+       git-get-tar-commit-id git-apply git-stripspace \
+       git-diff-stages git-rev-parse git-patch-id git-pack-objects \
+       git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
+       git-prune-packed git-fetch-pack git-upload-pack
 
 all: $(PROG)
 
@@ -41,10 +51,11 @@ install: $(PROG) $(SCRIPTS)
        $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
 
 LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
-        tag.o delta.o date.o index.o diff-delta.o patch-delta.o entry.o \
-        epoch.o refs.o
+        tag.o date.o index.o diff-delta.o patch-delta.o entry.o \
+        epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o
 LIB_FILE=libgit.a
-LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h
+LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
+       pack.h pkt-line.h refs.h
 
 LIB_H += strbuf.h
 LIB_OBJS += strbuf.o
@@ -76,6 +87,9 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 $(LIB_FILE): $(LIB_OBJS)
        $(AR) rcs $@ $(LIB_OBJS)
 
+check:
+       for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
+
 test-date: test-date.c date.o
        $(CC) $(CFLAGS) -o $@ test-date.c date.o
 
@@ -114,9 +128,17 @@ git-mktag: mktag.c
 git-diff-helper: diff-helper.c
 git-tar-tree: tar-tree.c
 git-write-blob: write-blob.c
-git-mkdelta: mkdelta.c
 git-stripspace: stripspace.c
-git-cvs2git: cvs2git.c
+git-diff-stages: diff-stages.c
+git-rev-parse: rev-parse.c
+git-patch-id: patch-id.c
+git-pack-objects: pack-objects.c
+git-unpack-objects: unpack-objects.c
+git-verify-pack: verify-pack.c
+git-receive-pack: receive-pack.c
+git-send-pack: send-pack.c
+git-prune-packed: prune-packed.c
+git-fetch-pack: fetch-pack.c
 
 git-http-pull: LIBS += -lcurl
 git-rev-list: LIBS += -lssl