[RCF/PATCH] Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- May 31, 2016, 13:24 UTC
- Message-ID
- <20160531132443.5033-1-Matthieu.Moy@imag.fr>
The DEVELOPER knob was introduced in 658df95 (add DEVELOPER makefile knob to check for acknowledged warnings, 2016-02-25), and works well when used as "make DEVELOPER=1", and when the configure script was not used.
However, the advice given in CodingGuidelines to add DEVELOPER=1 to config.mak does not: config.mak is included after testing for DEVELOPER in the Makefile, and at least GNU Make's manual specifies "Conditional directives are parsed immediately", hence the config.mak declaration is not visible at the time the conditional is evaluated.
Also, when using the configure script to generate a config.mak.autogen, the later file contained a "CFLAGS = <flags>" initialization, which overrode the "CFLAGS += -W..." triggered by DEVELOPER.
This patch fixes both issues.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- I'm surprised that no one noticed the issue. Probably because the Makefile is silent by default. Did I miss anything obvious?
Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile index 15fcd57..2226319 100644 --- a/Makefile +++ b/Makefile @@ -380,18 +380,6 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) STRIP ?= strip -ifdef DEVELOPER -CFLAGS += -Werror \ - -Wdeclaration-after-statement \ - -Wno-format-zero-length \ - -Wold-style-definition \ - -Woverflow \ - -Wpointer-arith \ - -Wstrict-prototypes \ - -Wunused \ - -Wvla -endif - # Create as necessary, replace existing, make ranlib unneeded. ARFLAGS = rcs @@ -952,6 +940,18 @@ include config.mak.uname -include config.mak.autogen -include config.mak +ifdef DEVELOPER +CFLAGS += -Werror \ + -Wdeclaration-after-statement \ + -Wno-format-zero-length \ + -Wold-style-definition \ + -Woverflow \ + -Wpointer-arith \ + -Wstrict-prototypes \ + -Wunused \ + -Wvla +endif + ifndef sysconfdir ifeq ($(prefix),/usr) sysconfdir = /etc
-- 2.8.2.397.gbe91ebf.dirty