X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=e92518f857f650fed6a0a2abc632bb93a7072835;hb=b7e438f951f68be704b001343811e9ff89da07f7;hp=4bc3665f2d1970cbbdfeece53e7346bd79b8536c;hpb=aed022ab4ca1055e1c962b73e14dbf41380f84a9;p=git.git diff --git a/Makefile b/Makefile index 4bc3665f..e92518f8 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly # break unless your underlying filesystem supports those sub-second times # (my ext3 doesn't). -GIT_VERSION=0.99 +GIT_VERSION=0.99.1 COPTS=-O2 CFLAGS=-g $(COPTS) -Wall @@ -21,6 +21,7 @@ bin=$(prefix)/bin CC=gcc AR=ar INSTALL=install +RPMBUILD=rpmbuild # # sparse is architecture-neutral, which means that we need to tell it @@ -35,7 +36,8 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-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 \ git-format-patch-script git-sh-setup-script git-push-script \ - git-branch-script + git-branch-script git-parse-remote git-verify-tag-script \ + git-ls-remote-script git-clone-dumb-http git-rename-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 \ @@ -48,7 +50,8 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ 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 git-clone-pack \ - git-show-index git-daemon git-var + git-show-index git-daemon git-var git-peek-remote \ + git-update-server-info git-show-rev-cache git-build-rev-cache all: $(PROG) @@ -63,6 +66,9 @@ LIB_FILE=libgit.a 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 += rev-cache.h +LIB_OBJS += rev-cache.o + LIB_H += strbuf.h LIB_OBJS += strbuf.o @@ -74,6 +80,7 @@ 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 +LIB_OBJS += server-info.o LIBS = $(LIB_FILE) LIBS += -lz @@ -149,6 +156,10 @@ git-send-pack: send-pack.c git-prune-packed: prune-packed.c git-fetch-pack: fetch-pack.c git-var: var.c +git-peek-remote: peek-remote.c +git-update-server-info: update-server-info.c +git-build-rev-cache: build-rev-cache.c +git-show-rev-cache: show-rev-cache.c git-http-pull: LIBS += -lcurl git-rev-list: LIBS += -lssl @@ -162,6 +173,7 @@ object.o: $(LIB_H) read-cache.o: $(LIB_H) sha1_file.o: $(LIB_H) usage.o: $(LIB_H) +rev-cache.o: $(LIB_H) strbuf.o: $(LIB_H) gitenv.o: $(LIB_H) entry.o: $(LIB_H) @@ -173,7 +185,7 @@ diffcore-break.o : $(LIB_H) diffcore.h diffcore-order.o : $(LIB_H) diffcore.h epoch.o: $(LIB_H) -git-core.spec: git-core.spec.in +git-core.spec: git-core.spec.in Makefile sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@ GIT_TARNAME=git-core-$(GIT_VERSION) @@ -183,17 +195,27 @@ dist: git-core.spec git-tar-tree @cp git-core.spec $(GIT_TARNAME) tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec @rm -rf $(GIT_TARNAME) - gzip -9 $(GIT_TARNAME).tar + gzip -f -9 $(GIT_TARNAME).tar rpm: dist - rpmbuild -ta git-core-$(GIT_VERSION).tar.gz + $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz test: all $(MAKE) -C t/ all +doc: + $(MAKE) -C Documentation all + +install-tools: + $(MAKE) -C tools install + +install-doc: + $(MAKE) -C Documentation install + clean: rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE) rm -f git-core-*.tar.gz git-core.spec + $(MAKE) -C tools/ clean $(MAKE) -C Documentation/ clean backup: clean