new SOURCES file that specifies which files to build in each dir, use

config.h preprocessor symbols to make conditionals

use the GCCOPTS now specified in the root Makefile by configure


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5158 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 65 insertions, 13 deletions

diff --git a/firmware/Makefile b/firmware/Makefile
index bb4a30f..e3364d4 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -9,19 +9,12 @@
 
 INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers
 
-CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes	\
-$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
-
-ifdef DEBUG
-CFLAGS += -g -DDEBUG
-else
-CFLAGS += -fomit-frame-pointer -fschedule-insns
-endif
-
-SRC := $(wildcard drivers/*.c common/*.c *.c)
-SRC_S := $(wildcard drivers/*.S common/*.S *.S)
-SOURCES = $(SRC) $(SRC_S)
-OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(SRC_S:%.S=$(OBJDIR)/%.o) $(OBJDIR)/sysfont.o
+CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
+
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
+SOURCES = $(SRC)
+OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o
+OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DIRS:=. drivers common
 OUTPUT = $(OBJDIR)/librockbox.a
 DEPFILE = $(OBJDIR)/dep-firmware
diff --git a/firmware/SOURCES b/firmware/SOURCES
new file mode 100644
index 0000000..04fa25d
--- /dev/null
+++ b/firmware/SOURCES
@@ -0,0 +1,59 @@
+backlight.c
+buffer.c
+common/atoi.c
+common/ctype.c
+common/dir.c
+common/disk.c
+common/errno.c
+common/file.c
+common/memcmp.c
+common/qsort.c
+common/random.c
+common/sprintf.c
+common/strcasecmp.c
+common/strcat.c
+common/strchr.c
+common/strcmp.c
+common/strcpy.c
+common/strlen.c
+common/strncmp.c
+common/strncpy.c
+common/strrchr.c
+common/strtok.c
+common/timefuncs.c
+debug.c
+drivers/adc.c
+drivers/ata.c
+drivers/ata_mmc.c
+drivers/button.c
+drivers/dac.c
+drivers/fat.c
+drivers/fmradio.c
+drivers/i2c.c
+drivers/lcd-player-charset.c
+drivers/lcd-player.c
+drivers/lcd-recorder.c
+drivers/led.c
+drivers/mas.c
+drivers/power.c
+drivers/rtc.c
+drivers/serial.c
+font.c
+hwcompat.c
+id3.c
+kernel.c
+mp3_playback.c
+mp3data.c
+mpeg.c
+panic.c
+powermgmt.c
+rolo.c
+system.c
+thread.c
+usb.c
+bitswap.S
+common/memcpy.S
+common/memset.S
+crt0.S
+descramble.S
+drivers/lcd.S