From 5184fe49c0964b6e16b462df610f353a3b7ea416 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Sun, 19 Jun 2011 14:37:34 +0200
Subject: Split CFLAGS to ease compilation on other platforms

---
 ext2load/Makefile | 12 +++++++-----
 tip22/Makefile    |  9 +++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ext2load/Makefile b/ext2load/Makefile
index 932582b..2292152 100644
--- a/ext2load/Makefile
+++ b/ext2load/Makefile
@@ -19,12 +19,14 @@ OBJECTS = loader.o ext2io.o conffile.o
 LIBS = $(EXT2LIB) $(ARCLIB)
 TARGETS = ext2load 
 
-CFLAGS = -O2 -I$(COMMONDIR) -I$(ARCINCLUDEDIR) -I$(E2FSINCLUDEDIR) 	\
-         -Wextra -Wall -mno-abicalls -G 0 -fno-pic			\
-	 -DSUBARCH=${SUBARCH} -fno-strict-aliasing
-
+MIPS_CFLAGS = -mno-abicalls -G 0 -fno-pic
+WARN_CFLAGS = -Wextra -Wall
 # uncomment for debugging
-#CFLAGS+=-DDEBUG
+#DEBUG_CFLAGS = -DDEBUG
+
+CFLAGS = -O2 -I$(COMMONDIR) -I$(ARCINCLUDEDIR) -I$(E2FSINCLUDEDIR) \
+	 -DSUBARCH=${SUBARCH} -fno-strict-aliasing \
+	 $(WARN_CFLAGS) $(MIPS_CFLAGS) $(DEBUG_CFLAGS)
 
 LD = ld
 LDFLAGS = -N -T ld.script
diff --git a/tip22/Makefile b/tip22/Makefile
index 16031e5..8293a87 100644
--- a/tip22/Makefile
+++ b/tip22/Makefile
@@ -7,8 +7,13 @@ ARCLIB = $(ARCLIBDIR)/libarc.a
 
 COMMONDIR = ../common
 
-CFLAGS += -O2 -I$(COMMONDIR) -I$(ARCLIBDIR) -Wall -mno-abicalls -G 0 \
-	-fno-pic -DSUBARCH=${SUBARCH}
+MIPS_CFLAGS = -mno-abicalls -G 0 -fno-pic
+WARN_CFLAGS = -Wextra -Wall
+# uncomment for debugging
+#DEBUG_CFLAGS = -DDEBUG
+CFLAGS += -O2 -I$(COMMONDIR) -I$(ARCLIBDIR) \
+	  -DSUBARCH=${SUBARCH} \
+	  $(WARN_CFLAGS) $(MIPS_CFLAGS) $(DEBUG_CFLAGS)
 
 ASFLAGS = -O2 -mno-abicalls -G 0 -fno-pic
 
-- 
cgit v1.2.3