X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=e8441af577cca50ba13369a8e3cb98b3a7ea0268;hb=0d62fb5672c7b6e3fc6c5418d61ff39bf6034741;hp=c0463c6215acd53782740e6481396fae654953e1;hpb=9e44f8980b8f41fbeea0a68035865e5778e4dc7d;p=git.git

diff --git a/Makefile b/Makefile
index c0463c62..e8441af5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@
 # Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
 # miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
 #
+# Define NO_CURL if you do not have curl installed.  git-http-pull is not
+# built, and you cannot use http:// and https:// transports.
+#
 # Define PPC_SHA1 environment variable when running make to make use of
 # a bundled SHA1 routine optimized for PowerPC.
 
@@ -29,13 +32,14 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.2
+GIT_VERSION=0.99.4
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 prefix=$(HOME)
 bindir=$(prefix)/bin
+template_dir=$(prefix)/share/git-core/templates/
 # dest=
 
 CC?=gcc
@@ -62,14 +66,18 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
 	git-format-patch-script git-sh-setup-script git-push-script \
 	git-branch-script git-parse-remote git-verify-tag-script \
 	git-ls-remote-script git-clone-dumb-http git-rename-script \
-	git-request-pull-script
+	git-request-pull-script git-bisect-script
+
+SCRIPTS += git-count-objects-script
+# SCRIPTS += git-send-email-script
+SCRIPTS += git-revert-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 \
 	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-ls-tree git-merge-base git-merge-cache \
 	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-ssh-push git-ssh-pull git-rev-list git-mktag \
 	git-diff-helper git-tar-tree git-local-pull git-hash-object \
 	git-get-tar-commit-id git-apply git-stripspace \
 	git-diff-stages git-rev-parse git-patch-id git-pack-objects \
@@ -78,16 +86,24 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
 	git-show-index git-daemon git-var git-peek-remote \
 	git-update-server-info git-show-rev-cache git-build-rev-cache
 
+ifndef NO_CURL
+PROG+= git-http-pull
+endif
+
 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_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
 	 tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
-	 refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o
+	 refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
+	 sha1_name.o
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
 
+LIB_H += run-command.h
+LIB_OBJS += run-command.o
+
 LIB_H += strbuf.h
 LIB_OBJS += strbuf.o
 
@@ -107,9 +123,11 @@ LIBS += -lz
 
 ifndef NO_OPENSSL
 	LIB_OBJS += epoch.o
+	OPENSSL_LIBSSL=-lssl
 else
 	CFLAGS += '-DNO_OPENSSL'
 	MOZILLA_SHA1=1
+	OPENSSL_LIBSSL=
 endif
 ifdef MOZILLA_SHA1
   SHA1_HEADER="mozilla-sha1/sha1.h"
@@ -136,8 +154,12 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
 all: $(PROG)
 
+all:
+	$(MAKE) -C templates
 
-.PRECIOUS: %.o
+.SECONDARY: %.o
+.c.o:
+	$(CC) $(CFLAGS) -o $*.o -c $*.c
 git-%: %.o $(LIB_FILE)
 	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
@@ -147,9 +169,13 @@ git-ssh-pull: rsh.o pull.o
 git-ssh-push: rsh.o
 
 git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
+
+init-db.o: init-db.c
+	$(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
 
 $(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -181,6 +207,7 @@ check:
 install: $(PROG) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(dest)$(bindir)
 	$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+	$(MAKE) -C templates install
 
 install-tools:
 	$(MAKE) -C tools install
@@ -208,16 +235,19 @@ dist: git-core.spec git-tar-tree
 rpm: dist
 	$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
+deb: dist
+	rm -rf $(GIT_TARNAME)
+	tar zxf $(GIT_TARNAME).tar.gz
+	cd $(GIT_TARNAME) && fakeroot debian/rules binary
 
 ### Cleaning rules
 
 clean:
 	rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-	rm -f git-core-*.tar.gz git-core.spec
+	rm -f $(GIT_TARNAME).tar.gz git-core.spec
+	rm -f git-core_$(GIT_VERSION)-*.deb git-tk_$(GIT_VERSION)-*.deb
+	rm -rf $(GIT_TARNAME)
 	$(MAKE) -C tools/ clean
 	$(MAKE) -C Documentation/ clean
+	$(MAKE) -C templates/ clean
+	$(MAKE) -C t/ clean