From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 01:02:39 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e764a10b17610ed9b3969bdb351e09f9635eb0ab?hp=-c

Merge with master.

This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
jit-merge command.
---

e764a10b17610ed9b3969bdb351e09f9635eb0ab
diff --combined Makefile
index c01327c1c6,3335d1adda..e574f44faf
--- a/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION=0.99.3
 +GIT_VERSION=0.99.4
  
  COPTS?=-g -O2
  CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@@ -156,9 -156,7 +156,9 @@@ 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)
  
@@@ -174,6 -172,7 +174,7 @@@ init-db.o: init-db.
  	$(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)
@@@ -233,17 -232,17 +234,17 @@@ dist: git-core.spec git-tar-tre
  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