X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=92b7cdf7665d0654b25c65b7ebd17ab0e51fcad1;hb=1bb4624417dc7a9a73454fae471e6d2b195ae84d;hp=3e3463b50b67f2b4c42530e60015c3b3144c7847;hpb=29c2cce41bc623e0a0d770a2634bf6c544345ea7;p=git.git diff --git a/Makefile b/Makefile index 3e3463b5..92b7cdf7 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,8 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-check-files git-ls-tree git-merge-base git-merge-cache \ 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-tree-helper git-tar-tree git-local-pull git-write-blob + git-diff-tree-helper git-tar-tree git-local-pull git-write-blob \ + git-get-tar-commit-id all: $(PROG) @@ -45,6 +46,8 @@ LIB_OBJS += strbuf.o LIB_H += diff.h LIB_OBJS += diff.o +LIB_OBJS += gitenv.o + LIBS = $(LIB_FILE) LIBS += -lz @@ -57,7 +60,7 @@ ifdef PPC_SHA1 LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o else SHA1_HEADER= - LIBS += -lssl + LIBS += -lcrypto endif endif @@ -115,6 +118,10 @@ sha1_file.o: $(LIB_H) usage.o: $(LIB_H) diff.o: $(LIB_H) strbuf.o: $(LIB_H) +gitenv.o: $(LIB_H) + +test: + make -C t/ all clean: rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)