Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
+.server.o: CFLAGS=$(if $(DARWIN),$(filter-out -Wredundant-decls,$(filter-out -Wshadow,$(CFLAGSBASE))),$(CFLAGSBASE))
+
endif
# Use pipes and not temp files.
endif
# Use pipes and not temp files.
# let the type char be unsigned by default
# let the type char be unsigned by default
-CFLAGS += -funsigned-char
-CFLAGS += -fstrict-aliasing
+CFLAGSBASE += -funsigned-char
+CFLAGSBASE += -fstrict-aliasing
# turn on all common warnings
# turn on all common warnings
-CFLAGS += $(if $(GCC4),-Wextra,-W)
+CFLAGSBASE += $(if $(GCC4),-Wextra,-W)
# treat warnings as errors
# treat warnings as errors
-CFLAGS += -Werror
-CFLAGS += -Wchar-subscripts
+CFLAGSBASE += -Werror
+CFLAGSBASE += -Wchar-subscripts
# warn about undefined preprocessor identifiers
# warn about undefined preprocessor identifiers
# warn about local variable shadowing another local variable
# # disabled on Darwin because of warnings in ev.h
# warn about local variable shadowing another local variable
# # disabled on Darwin because of warnings in ev.h
-CFLAGS += $(if $(DARWIN),,-Wshadow)
# warn about casting of pointers to increased alignment requirements
# warn about casting of pointers to increased alignment requirements
+CFLAGSBASE += -Wcast-align
# make string constants const
# make string constants const
-CFLAGS += -Wwrite-strings
+CFLAGSBASE += -Wwrite-strings
# warn about implicit conversions with side effects
# fgets, calloc and friends take an int, not size_t...
# warn about implicit conversions with side effects
# fgets, calloc and friends take an int, not size_t...
+#CFLAGSBASE += -Wconversion
# warn about comparisons between signed and unsigned values
# warn about comparisons between signed and unsigned values
-CFLAGS += -Wsign-compare
+CFLAGSBASE += -Wsign-compare
# warn about unused declared stuff
# warn about unused declared stuff
-CFLAGS += -Wunused
-CFLAGS += -Wno-unused-parameter
+CFLAGSBASE += -Wunused
+CFLAGSBASE += -Wno-unused-parameter
# warn about variable use before initialization
# warn about variable use before initialization
-CFLAGS += -Wuninitialized
+CFLAGSBASE += -Wuninitialized
# warn about variables which are initialized with themselves
# warn about variables which are initialized with themselves
-CFLAGS += $(if $(GCC4),-Winit-self)
+CFLAGSBASE += $(if $(GCC4),-Winit-self)
# warn about pointer arithmetic on void* and function pointers
# warn about pointer arithmetic on void* and function pointers
-CFLAGS += -Wpointer-arith
+CFLAGSBASE += -Wpointer-arith
# warn about multiple declarations
# #disabled on Darwin because of warnings in ev.h
# warn about multiple declarations
# #disabled on Darwin because of warnings in ev.h
-CFLAGS += $(if $(DARWIN),,-Wredundant-decls)
+CFLAGSBASE += -Wredundant-decls
# warn if the format string is not a string literal
# warn if the format string is not a string literal
-CFLAGS += -Wformat-nonliteral
+CFLAGSBASE += -Wformat-nonliteral
# do not warn about zero-length formats.
# do not warn about zero-length formats.
-CFLAGS += -Wno-format-zero-length
+CFLAGSBASE += -Wno-format-zero-length
# do not warn about strftime format with y2k issues
# do not warn about strftime format with y2k issues
-CFLAGS += -Wno-format-y2k
+CFLAGSBASE += -Wno-format-y2k
# warn about functions without format attribute that should have one
# warn about functions without format attribute that should have one
-CFLAGS += -Wmissing-format-attribute
+CFLAGSBASE += -Wmissing-format-attribute
+
+CFLAGS=$(CFLAGSBASE)
+LDFLAGS=$(LDFLAGSBASE)
include ../mk/cflags.mk
prefix ?= /usr/local
include ../mk/cflags.mk
prefix ?= /usr/local
-LDFLAGS += $(if $(DARWIN),-L/opt/local/lib,-Wl,-warn-common)
-CFLAGS += --std=gnu99 -I../ -I../common $(if $(DARWIN),-I/opt/local/include,)
+LDFLAGSBASE += $(if $(DARWIN),-L/opt/local/lib,-Wl,-warn-common)
+CFLAGSBASE += --std=gnu99 -I../ -I../common $(if $(DARWIN),-I/opt/local/include,)
INSTALL_PROGS = $(addprefix install-,$(PROGRAMS))
INSTALL_PROGS = $(addprefix install-,$(PROGRAMS))