From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2010 19:10:29 +0000 (-0700)
Subject: Merge branch 'ab/makefile-track-cc'
X-Git-Tag: v1.7.4-rc0~190
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ee79b21778cb6b20451f2357ede33f3f5760338c?ds=inline;hp=-c

Merge branch 'ab/makefile-track-cc'

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

ee79b21778cb6b20451f2357ede33f3f5760338c
diff --combined Makefile
index 8a56b9ab49,3bed8956ea..1f1ce04edf
--- a/Makefile
+++ b/Makefile
@@@ -270,7 -270,6 +270,7 @@@ STRIP ?= stri
  #   infodir
  #   htmldir
  #   ETC_GITCONFIG (but not sysconfdir)
 +#   ETC_GITATTRIBUTES
  # can be specified as a relative path some/where/else;
  # this is interpreted as relative to $(prefix) and "git" at
  # runtime figures out where they are based on the path to the executable.
@@@ -289,11 -288,9 +289,11 @@@ htmldir = share/doc/git-do
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
 +ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  else
  sysconfdir = $(prefix)/etc
  ETC_GITCONFIG = etc/gitconfig
 +ETC_GITATTRIBUTES = etc/gitattributes
  endif
  lib = lib
  # DESTDIR=
@@@ -393,8 -390,6 +393,8 @@@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH
  	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	  git-instaweb
  
 +ETAGS_TARGET = TAGS
 +
  # Empty...
  EXTRA_PROGRAMS =
  
@@@ -1127,7 -1122,6 +1127,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 \
@@@ -1526,7 -1520,6 +1526,7 @@@ endi
  
  SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
  ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
 +ETC_GITATTRIBUTES_SQ = $(subst ','\'',$(ETC_GITATTRIBUTES))
  
  DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
  bindir_SQ = $(subst ','\'',$(bindir))
@@@ -1905,8 -1898,6 +1905,8 @@@ builtin/init-db.s builtin/init-db.o: EX
  
  config.s config.o: EXTRA_CPPFLAGS = -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
 +attr.s attr.o: EXTRA_CPPFLAGS = -DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"'
 +
  http.s http.o: EXTRA_CPPFLAGS = -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
  
  ifdef NO_EXPAT
@@@ -1970,11 -1961,11 +1970,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
  
@@@ -1983,7 -1974,7 +1983,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
@@@ -2244,7 -2235,7 +2244,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
@@@ -2268,7 -2259,7 +2268,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
  #