Makefile: add $(DEVELOPER_CFLAGS) variable
This does not change the behavior, but allows the user to tweak DEVELOPER_CFLAGS on the command-line or in a config.mak* file if needed. This also makes the code somewhat cleaner as it follows the pattern <initialisation of variables> <include statements> <actual build logic> by specifying which flags to activate in the first part, and actually activating them in the last one. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d615628c35
commit
51dd3e81d4
19
Makefile
19
Makefile
@ -375,6 +375,15 @@ GIT-VERSION-FILE: FORCE
|
|||||||
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
||||||
|
|
||||||
CFLAGS = -g -O2 -Wall
|
CFLAGS = -g -O2 -Wall
|
||||||
|
DEVELOPER_CFLAGS = -Werror \
|
||||||
|
-Wdeclaration-after-statement \
|
||||||
|
-Wno-format-zero-length \
|
||||||
|
-Wold-style-definition \
|
||||||
|
-Woverflow \
|
||||||
|
-Wpointer-arith \
|
||||||
|
-Wstrict-prototypes \
|
||||||
|
-Wunused \
|
||||||
|
-Wvla
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
||||||
ALL_LDFLAGS = $(LDFLAGS)
|
ALL_LDFLAGS = $(LDFLAGS)
|
||||||
@ -941,15 +950,7 @@ include config.mak.uname
|
|||||||
-include config.mak
|
-include config.mak
|
||||||
|
|
||||||
ifdef DEVELOPER
|
ifdef DEVELOPER
|
||||||
CFLAGS += -Werror \
|
CFLAGS += $(DEVELOPER_CFLAGS)
|
||||||
-Wdeclaration-after-statement \
|
|
||||||
-Wno-format-zero-length \
|
|
||||||
-Wold-style-definition \
|
|
||||||
-Woverflow \
|
|
||||||
-Wpointer-arith \
|
|
||||||
-Wstrict-prototypes \
|
|
||||||
-Wunused \
|
|
||||||
-Wvla
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef sysconfdir
|
ifndef sysconfdir
|
||||||
|
Loading…
Reference in New Issue
Block a user