From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:44:35 +0000 (-0800)
Subject: Merge branch 'ab/makefile-track-cc' into maint
X-Git-Tag: v1.7.3.3~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5d2901d48c4ea50de1f7f3f10946ce61b7d101e?ds=inline;hp=-c

Merge branch 'ab/makefile-track-cc' into maint

* ab/makefile-track-cc:
Makefile: add CC to TRACK_CFLAGS
---

c5d2901d48c4ea50de1f7f3f10946ce61b7d101e
diff --combined Makefile
index cd98c59271,3bed8956ea..cd0f648172
--- a/Makefile
+++ b/Makefile
@@@ -390,8 -390,6 +390,8 @@@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH
  	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	  git-instaweb
  
 +ETAGS_TARGET = TAGS
 +
  # Empty...
  EXTRA_PROGRAMS =
  
@@@ -1124,7 -1122,6 +1124,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_REGEX = YesPlease
  	NO_PYTHON = YesPlease
  	BLK_SHA1 = YesPlease
 +	ETAGS_TARGET = ETAGS
  	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
@@@ -1921,7 -1918,7 +1921,7 @@@ git-%$X: %.o $(GITLIBS
  
  git-imap-send$X: imap-send.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 -		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
 +		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
  
  git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
@@@ -1964,11 -1961,11 +1964,11 @@@ info
  pdf:
  	$(MAKE) -C Documentation pdf
  
 -TAGS:
 -	$(RM) TAGS
 -	$(FIND) . -name '*.[hcS]' -print | xargs etags -a
 +$(ETAGS_TARGET): FORCE
 +	$(RM) $(ETAGS_TARGET)
 +	$(FIND) . -name '*.[hcS]' -print | xargs etags -a -o $(ETAGS_TARGET)
  
 -tags:
 +tags: FORCE
  	$(RM) tags
  	$(FIND) . -name '*.[hcS]' -print | xargs ctags -a
  
@@@ -1977,7 -1974,7 +1977,7 @@@ cscope
  	$(FIND) . -name '*.[hcS]' -print | xargs cscope -b
  
  ### Detect prefix changes
- TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
+ TRACK_CFLAGS = $(CC):$(subst ','\'',$(ALL_CFLAGS)):\
               $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
  
  GIT-CFLAGS: FORCE
@@@ -2238,7 -2235,7 +2238,7 @@@ clean
  	$(RM) $(TEST_PROGRAMS)
  	$(RM) -r bin-wrappers
  	$(RM) -r $(dep_dirs)
 -	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
 +	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
  	$(RM) -r autom4te.cache
  	$(RM) config.log config.mak.autogen config.mak.append config.status config.cache
  	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
@@@ -2262,7 -2259,7 +2262,7 @@@ endi
  
  .PHONY: all install clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
 -.PHONY: FORCE TAGS tags cscope
 +.PHONY: FORCE cscope
  
  ### Check documentation
  #