[Xbox-linux-cvs] cromwell Makefile,1.109,1.110 Rules.make,1.8,1.9

[<dav...@us...>]

Update of /cvsroot/xbox-linux/cromwell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26936

Modified Files:
	Makefile Rules.make 
Log Message:
A few further tweaks.


Index: Makefile
===================================================================
RCS file: /cvsroot/xbox-linux/cromwell/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- Makefile	20 Dec 2004 18:52:31 -0000	1.109
+++ Makefile	20 Dec 2004 18:59:21 -0000	1.110
@@ -10,9 +10,13 @@
 	-I$(TOPDIR)/startuploader -I$(TOPDIR)/drivers/cpu \
 	-I$(TOPDIR)/lib/jpeg/ -I$(TOPDIR)/menu/actions -I$(TOPDIR)/menu/textmenu -I$(TOPDIR)/menu/iconmenu
 
-CROM_CFLAGS= -O2 -mcpu=pentium -Werror $(INCLUDE) -Wstrict-prototypes -fomit-frame-pointer -pipe
+#These are intended to be non-overridable.
+CROM_CFLAGS=$(INCLUDE)
 
-# add the option for gcc 3.3 only
+#You can override these if you wish.
+CFLAGS= -O2 -g -mcpu=pentium -Werror -pipe -fomit-frame-pointer -Wstrict-prototypes
+
+# add the option for gcc 3.3 only, again, non-overridable
 ifeq ($(GCC_3.3), 1)
 CROM_CFLAGS += -fno-zero-initialized-in-bss
 endif
@@ -159,7 +163,7 @@
 
 cromsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
 $(patsubst %, _dir_%, $(SUBDIRS)) : dummy
-	$(MAKE) CFLAGS="$(CROM_CFLAGS) $(CFLAGS)" -C $(patsubst _dir_%, %, $@)
+	$(MAKE) CFLAGS="$(CFLAGS) $(CROM_CFLAGS)" -C $(patsubst _dir_%, %, $@)
 
 dummy:
 

Index: Rules.make
===================================================================
RCS file: /cvsroot/xbox-linux/cromwell/Rules.make,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Rules.make	10 Sep 2004 17:32:25 -0000	1.8
+++ Rules.make	20 Dec 2004 18:59:21 -0000	1.9
@@ -2,8 +2,6 @@
 # This file contains rules which are shared between multiple Makefiles.
 #
 
-EXTRA_CFLAGS += -I$(TOPDIR)/include -I$(TOPDIR)/fs/cdrom -I$(TOPDIR)/drivers/video -I$(TOPDIR)/lib/eeprom -I$(TOPDIR)/lib/misc
-
 #
 # False targets.
 #
@@ -37,7 +35,7 @@
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $(TOPDIR)/obj/$@ -c $<
 
 %.o     : %.S
-	$(CC) -DASSEMBLER $(CFLAGS) $(EXTRA_CFLAGS) -o $(TOPDIR)/obj/$@ -c $<
+	$(CC) -DASSEMBLER $(CFLAGS)  -o $(TOPDIR)/obj/$@ -c $<
 
 all_targets: $(O_TARGET)