diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-10-04 13:03:33 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-10-04 13:03:33 +0000 |
commit | 9c859417864becc547ec147a736151ed733f6dcf (patch) | |
tree | 3bb156a729f4312e6fe546948797f0a2f126a042 | |
parent | 235b50b42d85c2723bd1df2636edab876fea37c1 (diff) | |
download | rockbox-9c859417864becc547ec147a736151ed733f6dcf.tar.gz rockbox-9c859417864becc547ec147a736151ed733f6dcf.zip |
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
-rw-r--r-- | apps/Makefile | 8 | ||||
-rw-r--r-- | apps/SOURCES | 42 | ||||
-rw-r--r-- | apps/plugins/Makefile | 9 | ||||
-rw-r--r-- | apps/plugins/SOURCES | 41 | ||||
-rw-r--r-- | apps/plugins/lib/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/lib/SOURCES | 30 | ||||
-rw-r--r-- | firmware/Makefile | 19 | ||||
-rw-r--r-- | firmware/SOURCES | 59 |
8 files changed, 188 insertions, 24 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 | |||
18 | CFLAGS += -g | 18 | CFLAGS += -g |
19 | endif | 19 | endif |
20 | 20 | ||
21 | SRC := $(wildcard *.c) | 21 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) |
22 | DIRS = . | 22 | DIRS = . |
23 | 23 | ||
24 | # set the ROMTARGET here | 24 | # set the ROMTARGET here |
25 | ROMTARGET := $(ARCHOSROM) | 25 | ROMTARGET := $(ARCHOSROM) |
26 | 26 | ||
27 | ifdef APPEXTRA | 27 | ifdef APPEXTRA |
28 | SRC += $(wildcard $(APPEXTRA)/*.c) | ||
29 | DIRS += $(APPEXTRA) | 28 | DIRS += $(APPEXTRA) |
30 | INCLUDES += -I$(APPEXTRA) | 29 | INCLUDES += -I$(APPEXTRA) |
31 | endif | 30 | endif |
32 | 31 | ||
33 | CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ | 32 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ |
34 | -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) \ | 33 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
35 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | ||
36 | 34 | ||
37 | OBJS := $(OBJDIR)/lang.o $(SRC:%.c=$(OBJDIR)/%.o) | 35 | OBJS := $(OBJDIR)/lang.o $(SRC:%.c=$(OBJDIR)/%.o) |
38 | SOURCES = $(SRC) | 36 | 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 @@ | |||
1 | alarm_menu.c | ||
2 | bookmark.c | ||
3 | credits.c | ||
4 | debug_menu.c | ||
5 | filetypes.c | ||
6 | language.c | ||
7 | main.c | ||
8 | main_menu.c | ||
9 | menu.c | ||
10 | misc.c | ||
11 | onplay.c | ||
12 | playlist.c | ||
13 | playlist_menu.c | ||
14 | playlist_viewer.c | ||
15 | plugin.c | ||
16 | screens.c | ||
17 | settings.c | ||
18 | settings_menu.c | ||
19 | sleeptimer.c | ||
20 | sound_menu.c | ||
21 | status.c | ||
22 | talk.c | ||
23 | tree.c | ||
24 | wps-display.c | ||
25 | wps.c | ||
26 | #ifdef HAVE_LCD_CHARCELLS | ||
27 | player/icons.c | ||
28 | player/keyboard.c | ||
29 | #endif | ||
30 | #ifdef HAVE_LCD_BITMAP | ||
31 | recorder/bmp.c | ||
32 | recorder/icons.c | ||
33 | recorder/keyboard.c | ||
34 | recorder/peakmeter.c | ||
35 | recorder/widgets.c | ||
36 | #endif | ||
37 | #ifdef CONFIG_TUNER | ||
38 | recorder/radio.c | ||
39 | #endif | ||
40 | #ifdef HAVE_RECORDING | ||
41 | recorder/recording.c | ||
42 | #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 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | 10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ |
11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib | 11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib |
12 | CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
13 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
@@ -20,7 +20,8 @@ LDS := plugin.lds | |||
20 | LINKFILE := $(OBJDIR)/pluginlink.lds | 20 | LINKFILE := $(OBJDIR)/pluginlink.lds |
21 | DEPFILE = $(OBJDIR)/dep-plugins | 21 | DEPFILE = $(OBJDIR)/dep-plugins |
22 | 22 | ||
23 | SRC := $(wildcard *.c) | 23 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) \ |
24 | $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) | ||
24 | ROCKS := $(SRC:%.c=$(OBJDIR)/%.rock) | 25 | ROCKS := $(SRC:%.c=$(OBJDIR)/%.rock) |
25 | SOURCES = $(SRC) | 26 | SOURCES = $(SRC) |
26 | ELFS := $(SRC:%.c=$(OBJDIR)/%.elf) | 27 | 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 @@ | |||
1 | battery_test.c | ||
2 | bounce.c | ||
3 | calculator.c | ||
4 | calendar.c | ||
5 | chessclock.c | ||
6 | chip8.c | ||
7 | clock.c | ||
8 | cube.c | ||
9 | euroconverter.c | ||
10 | favorites.c | ||
11 | firmware_flash.c | ||
12 | flipit.c | ||
13 | grayscale.c | ||
14 | helloworld.c | ||
15 | jackpot.c | ||
16 | jpeg.c | ||
17 | mandelbrot.c | ||
18 | metronome.c | ||
19 | minesweeper.c | ||
20 | mosaique.c | ||
21 | nim.c | ||
22 | oscillograph.c | ||
23 | pong.c | ||
24 | rockblox.c | ||
25 | rockbox_flash.c | ||
26 | search.c | ||
27 | sliding_puzzle.c | ||
28 | snake.c | ||
29 | snake2.c | ||
30 | snow.c | ||
31 | sokoban.c | ||
32 | solitaire.c | ||
33 | sort.c | ||
34 | splitedit.c | ||
35 | star.c | ||
36 | stopwatch.c | ||
37 | vbrfix.c | ||
38 | video.c | ||
39 | viewer.c | ||
40 | vu_meter.c | ||
41 | 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 | |||
17 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 17 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
18 | endif | 18 | endif |
19 | 19 | ||
20 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ | 20 | CFLAGS = $(GCCOPTS) \ |
21 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 21 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
22 | 22 | ||
23 | ifdef DEBUG | 23 | ifdef DEBUG |
@@ -26,7 +26,7 @@ else | |||
26 | CFLAGS += -fomit-frame-pointer -fschedule-insns | 26 | CFLAGS += -fomit-frame-pointer -fschedule-insns |
27 | endif | 27 | endif |
28 | 28 | ||
29 | SRC := $(wildcard *.c) | 29 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) |
30 | SOURCES = $(SRC) | 30 | SOURCES = $(SRC) |
31 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 31 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
32 | DEPFILE = $(OBJDIR)/dep-pluginlib | 32 | 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 @@ | |||
1 | configfile.c | ||
2 | gray_black_display.c | ||
3 | gray_blockfuncs.c | ||
4 | gray_clear_display.c | ||
5 | gray_core.c | ||
6 | gray_deferred_update.c | ||
7 | gray_drawbitmap.c | ||
8 | gray_drawgraymap.c | ||
9 | gray_drawline.c | ||
10 | gray_drawpixel.c | ||
11 | gray_drawrect.c | ||
12 | gray_fillrect.c | ||
13 | gray_getstringsize.c | ||
14 | gray_horline.c | ||
15 | gray_pixelfuncs.c | ||
16 | gray_position_display.c | ||
17 | gray_putsxy.c | ||
18 | gray_screendump.c | ||
19 | gray_scroll_down.c | ||
20 | gray_scroll_down8.c | ||
21 | gray_scroll_left.c | ||
22 | gray_scroll_right.c | ||
23 | gray_scroll_up.c | ||
24 | gray_scroll_up8.c | ||
25 | gray_set_background.c | ||
26 | gray_set_drawinfo.c | ||
27 | gray_set_drawmode.c | ||
28 | gray_set_foreground.c | ||
29 | gray_setfont.c | ||
30 | gray_verline.c | ||
diff --git a/firmware/Makefile b/firmware/Makefile index bb4a30f101..e3364d4387 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -9,19 +9,12 @@ | |||
9 | 9 | ||
10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers | 10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers |
11 | 11 | ||
12 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
13 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 13 | |
14 | 14 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) | |
15 | ifdef DEBUG | 15 | SOURCES = $(SRC) |
16 | CFLAGS += -g -DDEBUG | 16 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o |
17 | else | 17 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
18 | CFLAGS += -fomit-frame-pointer -fschedule-insns | ||
19 | endif | ||
20 | |||
21 | SRC := $(wildcard drivers/*.c common/*.c *.c) | ||
22 | SRC_S := $(wildcard drivers/*.S common/*.S *.S) | ||
23 | SOURCES = $(SRC) $(SRC_S) | ||
24 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) $(SRC_S:%.S=$(OBJDIR)/%.o) $(OBJDIR)/sysfont.o | ||
25 | DIRS:=. drivers common | 18 | DIRS:=. drivers common |
26 | OUTPUT = $(OBJDIR)/librockbox.a | 19 | OUTPUT = $(OBJDIR)/librockbox.a |
27 | DEPFILE = $(OBJDIR)/dep-firmware | 20 | DEPFILE = $(OBJDIR)/dep-firmware |
diff --git a/firmware/SOURCES b/firmware/SOURCES new file mode 100644 index 0000000000..04fa25de34 --- /dev/null +++ b/firmware/SOURCES | |||
@@ -0,0 +1,59 @@ | |||
1 | backlight.c | ||
2 | buffer.c | ||
3 | common/atoi.c | ||
4 | common/ctype.c | ||
5 | common/dir.c | ||
6 | common/disk.c | ||
7 | common/errno.c | ||
8 | common/file.c | ||
9 | common/memcmp.c | ||
10 | common/qsort.c | ||
11 | common/random.c | ||
12 | common/sprintf.c | ||
13 | common/strcasecmp.c | ||
14 | common/strcat.c | ||
15 | common/strchr.c | ||
16 | common/strcmp.c | ||
17 | common/strcpy.c | ||
18 | common/strlen.c | ||
19 | common/strncmp.c | ||
20 | common/strncpy.c | ||
21 | common/strrchr.c | ||
22 | common/strtok.c | ||
23 | common/timefuncs.c | ||
24 | debug.c | ||
25 | drivers/adc.c | ||
26 | drivers/ata.c | ||
27 | drivers/ata_mmc.c | ||
28 | drivers/button.c | ||
29 | drivers/dac.c | ||
30 | drivers/fat.c | ||
31 | drivers/fmradio.c | ||
32 | drivers/i2c.c | ||
33 | drivers/lcd-player-charset.c | ||
34 | drivers/lcd-player.c | ||
35 | drivers/lcd-recorder.c | ||
36 | drivers/led.c | ||
37 | drivers/mas.c | ||
38 | drivers/power.c | ||
39 | drivers/rtc.c | ||
40 | drivers/serial.c | ||
41 | font.c | ||
42 | hwcompat.c | ||
43 | id3.c | ||
44 | kernel.c | ||
45 | mp3_playback.c | ||
46 | mp3data.c | ||
47 | mpeg.c | ||
48 | panic.c | ||
49 | powermgmt.c | ||
50 | rolo.c | ||
51 | system.c | ||
52 | thread.c | ||
53 | usb.c | ||
54 | bitswap.S | ||
55 | common/memcpy.S | ||
56 | common/memset.S | ||
57 | crt0.S | ||
58 | descramble.S | ||
59 | drivers/lcd.S | ||