Use EXTRA_CFLAGS intead of CFLAGS. Remove -Werror

[madwifi/.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 0b2197d440de4de59b289bfd6f099c04d9cb3659..9c4ab3a70f1b913d8a2ab269379064b5fb36b91b 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -174,33 +174,37 @@ export HAL_DEBUG=0
 endif
 
 ifndef ALQ
-ALQ=0
+export ALQ=0
+endif
+
+ifndef ATH_DEBUG
+export ATH_DEBUG=1
 endif
 
 ifndef MMIOTRACE
-MMIOTRACE=0
+export MMIOTRACE=0
 endif
 
-ifneq ($(strip $(MMIOTRACE)),0)
+ifeq ($(strip $(MMIOTRACE)),1)
 EXTRA_CFLAGS += -DMMIOTRACE=1
 endif
 
-ifneq ($(strip $(ATH_DEBUG_SPINLOCKS)),0)
+ifeq ($(strip $(ATH_DEBUG_SPINLOCKS)),1)
 COPTS+= -DATH_DEBUG_SPINLOCKS=1
 endif
 
-ifneq ($(strip $(IEEE80211_DEBUG_REFCNT)),0)
+ifeq ($(strip $(IEEE80211_DEBUG_REFCNT)),1)
 COPTS+= -DIEEE80211_DEBUG_REFCNT=1
 endif
 
 # HAL_DEBUG enables HAL debugging code
 # At the moment this consists of wrappers around HAL functions so that 
 # stack traces are more decipherable.
-ifneq ($(strip $(HAL_DEBUG)),0)
+ifeq ($(strip $(HAL_DEBUG)),1)
 COPTS+= -fno-inline -DAH_DEBUG=1
 endif
 
-ifneq ($(strip $(ALQ)),0)
+ifeq ($(strip $(ALQ)),1)
 obj-m += alq.o
 alq-objs := kern_alq.o
 EXTRA_CFLAGS += -DAH_DEBUG_ALQ -DAH_DEBUG
@@ -224,26 +228,24 @@ NM := $(save_NM)
 
 include $(TOP)/BuildCaps.inc
 
-# At present, these are defined all over the sources but it will not build without it
-ifndef ATH_DEBUG
-export ATH_DEBUG=1
-endif
-
-ifneq ($(strip $(ATH_DEBUG)),0)
-CFLAGS += -DAR_DEBUG -DIEEE80211_DEBUG -DIEEE80211_DEBUG 
+ifeq ($(strip $(ATH_DEBUG)),1)
+EXTRA_CFLAGS += -DAR_DEBUG -DIEEE80211_DEBUG 
 endif
 
-ifneq ($(strip $(ATH_DEBUG_SPINLOCKS)),0)
-CFLAGS += -DATH_DEBUG_SPINLOCKS
+ifeq ($(strip $(ATH_DEBUG_SPINLOCKS)),1)
+EXTRA_CFLAGS += -DATH_DEBUG_SPINLOCKS
 endif
 
-ifneq ($(strip $(IEEE80211_DEBUG_REFCNT)),0)
-CFLAGS += -DIEEE80211_DEBUG_REFCNT
+ifeq ($(strip $(IEEE80211_DEBUG_REFCNT)),1)
+EXTRA_CFLAGS += -DIEEE80211_DEBUG_REFCNT
 endif
 
 # Ensure correct endianess
 LDFLAGS += $(LDOPTS)
 
+# Be pedantic
+EXTRA_CFLAGS += -Wall
+
 # Filter out compiler options that are not supported by all compilers
 # and that are not needed to ensure compatible architecture and calling
 # conventions.