From: Junio C Hamano <junkio@cox.net>
Date: Sat, 22 Apr 2006 05:25:16 +0000 (-0700)
Subject: Merge branch 'jc/color' into next
X-Git-Tag: v1.4.1-rc1~193
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/076d1d6adcfe81d3419b0ce2afa1bbc348e51be1?hp=-c

Merge branch 'jc/color' into next

* jc/color:
Add colordiff for git to contrib/colordiff.
Makefile: dependency for builtin-help.o
---

076d1d6adcfe81d3419b0ce2afa1bbc348e51be1
diff --combined Makefile
index ab021eddbd,d9a3a82fe2..25b99e62d1
--- a/Makefile
+++ b/Makefile
@@@ -470,6 -470,8 +470,8 @@@ git$X: git.c common-cmds.h $(BUILTIN_OB
  		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
+ builtin-help.o: common-cmds.h
+ 
  $(BUILT_INS): git$X
  	rm -f $@ && ln git$X $@
  
@@@ -609,9 -611,6 +611,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -660,7 -659,6 +662,7 @@@ clean
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f test-date$X test-delta$X test-gsimm$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz