Makefile: move -DPAGER_ENV from BASIC_CFLAGS to EXTRA_CPPFLAGS
Remove -DPAGER_ENV from the BASIC_CFLAGS and instead have it passed via the EXTRA_CPPFLAGS passed when compiling pager.c. This doesn't change anything except to make it clear that only pager.c needs this, as it's the only user of this define. See 995bc22d7f8 (pager: move pager-specific setup into the build, 2016-08-04) for the commit that originally added this. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 17, 2021 at 01:19 UTC
451a7dbe28b1832468568b9d64609d81e7ee343e
1 file changed
+6
-5
Makefile
+6
-5
@@ -2104,11 +2104,6 @@ ifdef DEFAULT_HELP_FORMAT
2104
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
2105
endif
2106
2107
-PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
2108
-PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
2109
-PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
2110
-BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
2111
-
2107
ALL_CFLAGS += $(BASIC_CFLAGS)
2108
ALL_LDFLAGS += $(BASIC_LDFLAGS)
2109
@@ -2223,6 +2218,12 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
2218
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
2219
'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
2220
2221
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
2222
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
2223
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
2224
+pager.sp pager.s pager.o: EXTRA_CPPFLAGS = \
2225
+ -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
2226
+
2227
version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
2228
version.sp version.s version.o: EXTRA_CPPFLAGS = \
2229
'-DGIT_VERSION="$(GIT_VERSION)"' \