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@xxxxxxxxx>
---
A new trivial fix that wasn't in the ab/make-dependency topic.
This one doesn't really matter for now, before we over-provided
pager_env, now we don't. We can know we this change is OK because if
we get it wrong we'd get a compile error.
But in general these -D variables are broken in various ways, either
through bad escaping, or us not re-building things when they
change. I've got some later fixes to address those, and having a
starting point where variables map to they files they're needed in
will help make those changes smaller and easier to review.
Range-diff:
1: 1621ca72c1d < -: ----------- Makefile: don't invoke msgfmt with --statistics
2: b7c36c9fea0 < -: ----------- Makefile: don't set up "perl/build" rules under NO_PERL=Y
3: 29b000eb0f1 < -: ----------- Makefile: use "=" not ":=" for po/* and perl/*
4: daead5ec293 < -: ----------- Makefile: clean perl/build/ even with NO_PERL=Y
5: 3c987590740 < -: ----------- Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR
6: b57f582ccd3 < -: ----------- Makefile: guard Perl-only variable assignments
7: fcdee92f64c < -: ----------- Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL"
8: 1e25b532ca2 < -: ----------- Makefile: adjust Perl-related comments & whitespace
9: 77d9855bfcf < -: ----------- Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph
10: 6004cdcd8d9 < -: ----------- Makefile: create a GIT-PYTHON-DEFINES, like "PERL"
11: 17b30e96057 < -: ----------- Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts
12: 30ddf7da2c8 < -: ----------- Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
13: f378a7dc35e < -: ----------- Makefile: move $(comma), $(empty) and $(space) to shared.mak
14: 13cbb851d32 < -: ----------- Makefile: re-add and use the "shellquote" macros
15: 337953e4994 < -: ----------- Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}
16: 5bb597c1993 < -: ----------- Makefile: add "$(QUIET)" boilerplate to shared.mak
17: 3c4d0589667 < -: ----------- Makefile: use $(wspfx) for $(QUIET...) in shared.mak
18: be5882b2c99 < -: ----------- Makefiles: add and use wildcard "mkdir -p" template
19: 2710f8af6cd < -: ----------- Makefile: correct the dependency graph of hook-list.h
20: 59f22a0269a < -: ----------- Makefile: use $(file) I/O instead of "FORCE" when possible
21: dd569a59c74 < -: ----------- Makefile: disable GNU make built-in wildcard rules
22: 4168a7e3b30 < -: ----------- Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
23: 48a3927d972 < -: ----------- Makefile: move ".SUFFIXES" rule to shared.mak
-: ----------- > 1: 90d1e77ad5e Makefile: remove -DPAGER_ENV from BASIC_CFLAGS
Makefile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 9c00a793e47..af0bbfb5d2f 100644
--- a/Makefile
+++ b/Makefile
@@ -2111,11 +2111,6 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
-PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
-PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
-PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
-BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
-
ALL_CFLAGS += $(BASIC_CFLAGS)
ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -2230,6 +2225,12 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+pager.sp pager.s pager.o: EXTRA_CPPFLAGS = \
+ -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
version.sp version.s version.o: EXTRA_CPPFLAGS = \
'-DGIT_VERSION="$(GIT_VERSION)"' \
--
2.34.1.1119.g7a3fc8778ee
