[PATCH] git-tar-tree: add a test case

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 7a22989..a5e7552 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@
 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 # enough guarantees about no collisions between objects ever hapenning.
 #
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
+# -DUSE_NSEC if you want git to care about sub-second file mtimes and ctimes.
+# -DUSE_STDEV if you want git to care about st_dev changing
+#
 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 # break unless your underlying filesystem supports those sub-second times
@@ -18,9 +20,10 @@ CC=gcc
 AR=ar
 INSTALL=install
 
-SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
+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-deltafy-script git-fetch-script git-status-script git-commit-script \
+       git-log-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 \
@@ -29,7 +32,7 @@ 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-rpush git-rpull 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-get-tar-commit-id git-mkdelta git-apply git-stripspace
 
 all: $(PROG)
 
@@ -44,8 +47,9 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h
 LIB_H += strbuf.h
 LIB_OBJS += strbuf.o
 
-LIB_H += diff.h
-LIB_OBJS += diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o
+LIB_H += diff.h count-delta.h
+LIB_OBJS += diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
+       count-delta.o diffcore-break.o diffcore-order.o
 
 LIB_OBJS += gitenv.o
 
@@ -109,6 +113,7 @@ 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-http-pull: LIBS += -lcurl
 
@@ -127,13 +132,15 @@ diff.o: $(LIB_H) diffcore.h
 diffcore-rename.o : $(LIB_H) diffcore.h
 diffcore-pathspec.o : $(LIB_H) diffcore.h
 diffcore-pickaxe.o : $(LIB_H) diffcore.h
+diffcore-break.o : $(LIB_H) diffcore.h
+diffcore-order.o : $(LIB_H) diffcore.h
 
 test: all
-       make -C t/ all
+       $(MAKE) -C t/ all
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       make -C Documentation/ clean
+       $(MAKE) -C Documentation/ clean
 
 backup: clean
        cd .. ; tar czvf dircache.tar.gz dir-cache