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 /apps/Makefile | |
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
Diffstat (limited to 'apps/Makefile')
-rw-r--r-- | apps/Makefile | 8 |
1 files changed, 3 insertions, 5 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) |