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

6 files changed, 123 insertions, 11 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 912b5ed143..12d4c85fd9 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -18,21 +18,19 @@ ifdef DEBUG
     CFLAGS += -g
 endif
 
-SRC := $(wildcard *.c)
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 DIRS = .
 
 # set the ROMTARGET here
 ROMTARGET := $(ARCHOSROM)
 
 ifdef APPEXTRA
-   SRC += $(wildcard $(APPEXTRA)/*.c)
    DIRS += $(APPEXTRA)
    INCLUDES += -I$(APPEXTRA)
 endif
 
-CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes   \
--fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES)  \
--DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
+CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES)                    \
+ -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
 OBJS := $(OBJDIR)/lang.o $(SRC:%.c=$(OBJDIR)/%.o)
 SOURCES = $(SRC)
diff --git a/apps/SOURCES b/apps/SOURCES
new file mode 100644
index 0000000000..9cc336c4ef
--- /dev/null
+++ b/apps/SOURCES
@@ -0,0 +1,42 @@
+alarm_menu.c
+bookmark.c
+credits.c
+debug_menu.c
+filetypes.c
+language.c
+main.c
+main_menu.c
+menu.c
+misc.c
+onplay.c
+playlist.c
+playlist_menu.c
+playlist_viewer.c
+plugin.c
+screens.c
+settings.c
+settings_menu.c
+sleeptimer.c
+sound_menu.c
+status.c
+talk.c
+tree.c
+wps-display.c
+wps.c
+#ifdef HAVE_LCD_CHARCELLS
+player/icons.c
+player/keyboard.c
+#endif
+#ifdef HAVE_LCD_BITMAP
+recorder/bmp.c
+recorder/icons.c
+recorder/keyboard.c
+recorder/peakmeter.c
+recorder/widgets.c
+#endif
+#ifdef CONFIG_TUNER
+recorder/radio.c
+#endif
+#ifdef HAVE_RECORDING
+recorder/recording.c
+#endif
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index caa2775e12..5071f07668 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -8,9 +8,9 @@
 #
 
 INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \
--I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib
-CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes   \
-$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DPLUGIN
+ -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib
+CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES)      \
+ -DMEM=${MEMORYSIZE} -DPLUGIN
 
 ifdef APPEXTRA
    INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
@@ -20,7 +20,8 @@ LDS := plugin.lds
 LINKFILE := $(OBJDIR)/pluginlink.lds
 DEPFILE = $(OBJDIR)/dep-plugins
 
-SRC := $(wildcard *.c)
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE)   \
+ $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 ROCKS := $(SRC:%.c=$(OBJDIR)/%.rock)
 SOURCES = $(SRC)
 ELFS := $(SRC:%.c=$(OBJDIR)/%.elf)
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
new file mode 100644
index 0000000000..c5923ae843
--- /dev/null
+++ b/apps/plugins/SOURCES
@@ -0,0 +1,41 @@
+battery_test.c
+bounce.c
+calculator.c
+calendar.c
+chessclock.c
+chip8.c
+clock.c
+cube.c
+euroconverter.c
+favorites.c
+firmware_flash.c
+flipit.c
+grayscale.c
+helloworld.c
+jackpot.c
+jpeg.c
+mandelbrot.c
+metronome.c
+minesweeper.c
+mosaique.c
+nim.c
+oscillograph.c
+pong.c
+rockblox.c
+rockbox_flash.c
+search.c
+sliding_puzzle.c
+snake.c
+snake2.c
+snow.c
+sokoban.c
+solitaire.c
+sort.c
+splitedit.c
+star.c
+stopwatch.c
+vbrfix.c
+video.c
+viewer.c
+vu_meter.c
+wormlet.c
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile
index 2cc7974770..562d1fc931 100644
--- a/apps/plugins/lib/Makefile
+++ b/apps/plugins/lib/Makefile
@@ -17,7 +17,7 @@ ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
 endif
 
-CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes   \
+CFLAGS = $(GCCOPTS) \
 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
 ifdef DEBUG
@@ -26,7 +26,7 @@ else
 CFLAGS += -fomit-frame-pointer -fschedule-insns
 endif
 
-SRC := $(wildcard *.c)
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
 OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEPFILE = $(OBJDIR)/dep-pluginlib
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
new file mode 100644
index 0000000000..31467cca50
--- /dev/null
+++ b/apps/plugins/lib/SOURCES
@@ -0,0 +1,30 @@
+configfile.c
+gray_black_display.c
+gray_blockfuncs.c
+gray_clear_display.c
+gray_core.c
+gray_deferred_update.c
+gray_drawbitmap.c
+gray_drawgraymap.c
+gray_drawline.c
+gray_drawpixel.c
+gray_drawrect.c
+gray_fillrect.c
+gray_getstringsize.c
+gray_horline.c
+gray_pixelfuncs.c
+gray_position_display.c
+gray_putsxy.c
+gray_screendump.c
+gray_scroll_down.c
+gray_scroll_down8.c
+gray_scroll_left.c
+gray_scroll_right.c
+gray_scroll_up.c
+gray_scroll_up8.c
+gray_set_background.c
+gray_set_drawinfo.c
+gray_set_drawmode.c
+gray_set_foreground.c
+gray_setfont.c
+gray_verline.c