[PATCH] Makefile: limit specifying -DGIT_USER_AGENT=... to keep ccache efficient
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jun 24, 2012, 12:37 UTC
- Message-ID
- <1340541457-9056-1-git-send-email-pclouds@gmail.com>
GIT_USER_AGENT changes as HEAD changes. Defining it in BASIC_FLAGS means every time HEAD changes, the compiling options for every object file is changed, which defeats the purpose of using ccache.
As version.c is the only file that uses this definition, limit defining only when compiling this file.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index f62ca2a..b3ce00d 100644 --- a/Makefile +++ b/Makefile @@ -1929,7 +1929,6 @@ endif GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT)) GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))" GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ)) -BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)' ifdef DEFAULT_HELP_FORMAT BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' @@ -2000,7 +1999,8 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ '-DGIT_INFO_PATH="$(infodir_SQ)"' version.sp version.s version.o: EXTRA_CPPFLAGS = \ - '-DGIT_VERSION="$(GIT_VERSION)"' + '-DGIT_VERSION="$(GIT_VERSION)"' \ + '-DGIT_USER_AGENT="$(GIT_USER_AGENT)"' $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \
-- 1.7.8