Merge with gitk.

diff --git a/Makefile b/Makefile
index 425e9a4ace88efe3c90aea80f21ea0e38b5a28be..e0ea88fbae386ed17e0c0ff2c4882e8dc71f36c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,15 +32,14 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.3
+GIT_VERSION=0.99.4
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 prefix=$(HOME)
 bindir=$(prefix)/bin
-etcdir=$(prefix)/etc
-etcgitdir=$(etcdir)/git-core
+template_dir=$(prefix)/share/git-core/templates/
 # dest=
 
 CC?=gcc
@@ -70,7 +69,8 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-request-pull-script git-bisect-script
 
 SCRIPTS += git-count-objects-script
-SCRIPTS += git-send-email-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 \
@@ -147,7 +147,6 @@ endif
 endif
 
 CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
-CFLAGS += '-DDEFAULT_GIT_TEMPLATE_ENVIRONMENT="$(etcgitdir)/templates"'
 
 
 
@@ -155,8 +154,12 @@ CFLAGS += '-DDEFAULT_GIT_TEMPLATE_ENVIRONMENT="$(etcgitdir)/templates"'
 
 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)
 
@@ -168,7 +171,11 @@ git-ssh-push: rsh.o
 git-http-pull: LIBS += -lcurl
 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)
@@ -228,17 +235,17 @@ 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 git-core_$(GIT_VERSION)-*.deb
+       rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean