X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=d0f1cfa36cc45f8a46608ff11e4dbc14158e588e;hb=12dccc165400beae564d2357ce86c71937e5cdc0;hp=92d0e87535ecaa5e52a6503c43dd30dd546ea6b7;hpb=85976974581060716311d6807b03a671cb71cbde;p=git.git diff --git a/Makefile b/Makefile index 92d0e875..d0f1cfa3 100644 --- a/Makefile +++ b/Makefile @@ -20,18 +20,19 @@ 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-fetch-script + git-deltafy-script git-fetch-script git-status-script git-commit-script \ + git-log-script git-shortlog 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 \ git-checkout-cache git-diff-tree git-rev-tree git-ls-files \ 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-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-get-tar-commit-id git-mkdelta git-apply git-stripspace all: $(PROG) @@ -39,7 +40,7 @@ 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 + tag.o delta.o date.o index.o diff-delta.o patch-delta.o entry.o LIB_FILE=libgit.a LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h @@ -48,7 +49,7 @@ LIB_OBJS += strbuf.o LIB_H += diff.h count-delta.h LIB_OBJS += diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \ - count-delta.o + count-delta.o diffcore-break.o diffcore-order.o LIB_OBJS += gitenv.o @@ -104,14 +105,15 @@ git-diff-cache: diff-cache.c git-convert-cache: convert-cache.c git-http-pull: http-pull.c pull.c git-local-pull: local-pull.c pull.c -git-rpush: rsh.c -git-rpull: rsh.c pull.c +git-ssh-push: rsh.c +git-ssh-pull: rsh.c pull.c git-rev-list: rev-list.c 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-http-pull: LIBS += -lcurl @@ -130,6 +132,8 @@ 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