Merge branch 'mm/makefile-developer-can-be-in-config-mak'
"make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in config.mak didn't. * mm/makefile-developer-can-be-in-config-mak: Makefile: add $(DEVELOPER_CFLAGS) variable Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
This commit is contained in:
commit
ec5ad66ee2
17
Makefile
17
Makefile
@ -375,13 +375,7 @@ GIT-VERSION-FILE: FORCE
|
||||
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
||||
|
||||
CFLAGS = -g -O2 -Wall
|
||||
LDFLAGS =
|
||||
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
||||
ALL_LDFLAGS = $(LDFLAGS)
|
||||
STRIP ?= strip
|
||||
|
||||
ifdef DEVELOPER
|
||||
CFLAGS += -Werror \
|
||||
DEVELOPER_CFLAGS = -Werror \
|
||||
-Wdeclaration-after-statement \
|
||||
-Wno-format-zero-length \
|
||||
-Wold-style-definition \
|
||||
@ -390,7 +384,10 @@ CFLAGS += -Werror \
|
||||
-Wstrict-prototypes \
|
||||
-Wunused \
|
||||
-Wvla
|
||||
endif
|
||||
LDFLAGS =
|
||||
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
||||
ALL_LDFLAGS = $(LDFLAGS)
|
||||
STRIP ?= strip
|
||||
|
||||
# Create as necessary, replace existing, make ranlib unneeded.
|
||||
ARFLAGS = rcs
|
||||
@ -951,6 +948,10 @@ include config.mak.uname
|
||||
-include config.mak.autogen
|
||||
-include config.mak
|
||||
|
||||
ifdef DEVELOPER
|
||||
CFLAGS += $(DEVELOPER_CFLAGS)
|
||||
endif
|
||||
|
||||
ifndef sysconfdir
|
||||
ifeq ($(prefix),/usr)
|
||||
sysconfdir = /etc
|
||||
|
Loading…
Reference in New Issue
Block a user