From b340985b27d8a06fecee2f28307dc689f2eea5b4 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 23 Jan 2003 15:36:00 +0000
Subject: Cleanup makefiles and make clean a bit

---
 Rules.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Rules.mak')

diff --git a/Rules.mak b/Rules.mak
index efc9f38fc..eaaafdb7a 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -166,12 +166,12 @@ endif
 
 
 # Add a bunch of extra pedantic annoyingly strict checks
-XWARNINGS=-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS)))
 CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y)))
 # Some nice CFLAGS to work with
-CFLAGS:=$(subst ",, $(strip $(WARNINGS))) $(XWARNINGS) $(OPTIMIZATION) \
-	-fno-builtin -nostdinc $(CPUFLAGS) -D_LIBC $(CPU_CFLAGS) \
-	$(subst ",, $(strip $(ARCH_CFLAGS))) -I$(TOPDIR)include -I.
+CFLAGS:=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) \
+	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
 
 ifeq ($(DODEBUG),y)
     CFLAGS += -g
-- 
cgit v1.2.3