X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=b02c234543dd3104a852821024df9c4a0cd2af5a;hb=d4f8b390a4326625f0c3d65a8d120336e38928d7;hp=d0f1cfa36cc45f8a46608ff11e4dbc14158e588e;hpb=12dccc165400beae564d2357ce86c71937e5cdc0;p=git.git diff --git a/Makefile b/Makefile index d0f1cfa3..b02c2345 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ INSTALL=install 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-log-script git-shortlog git-cvsimport-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,7 +32,8 @@ 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-get-tar-commit-id git-mkdelta git-apply git-stripspace \ + git-cvs2git all: $(PROG) @@ -40,9 +41,10 @@ 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 + tag.o delta.o date.o index.o diff-delta.o patch-delta.o entry.o \ + epoch.o refs.o LIB_FILE=libgit.a -LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h +LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h LIB_H += strbuf.h LIB_OBJS += strbuf.o @@ -114,8 +116,10 @@ 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-http-pull: LIBS += -lcurl +git-rev-list: LIBS += -lssl # Library objects.. blob.o: $(LIB_H) @@ -128,12 +132,14 @@ sha1_file.o: $(LIB_H) usage.o: $(LIB_H) strbuf.o: $(LIB_H) gitenv.o: $(LIB_H) +entry.o: $(LIB_H) 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 +epoch.o: $(LIB_H) test: all $(MAKE) -C t/ all