diff options
author | Dave Chapman <dave@dchapman.com> | 2005-02-16 00:38:31 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-02-16 00:38:31 +0000 |
commit | 5b2d874a361663dd17413b8bcf2439fc0f8716d8 (patch) | |
tree | 87769b164567d9b93e4e95d7649e9e7eb83f9981 /apps | |
parent | d97bd1e66113d6e180b5fb41e0c7194e64295c12 (diff) | |
download | rockbox-5b2d874a361663dd17413b8bcf2439fc0f8716d8.tar.gz rockbox-5b2d874a361663dd17413b8bcf2439fc0f8716d8.zip |
Incorporate apps/codecs into the build system based on SOFTWARECODECS configuration variable
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5964 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/Makefile b/apps/Makefile index af9c813cad..75b9fbafb3 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -22,6 +22,10 @@ ifdef ENABLEDPLUGINS | |||
22 | ROCKS=rocks | 22 | ROCKS=rocks |
23 | endif | 23 | endif |
24 | 24 | ||
25 | ifdef SOFTWARECODECS | ||
26 | CODECS=build-codecs | ||
27 | endif | ||
28 | |||
25 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) | 29 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) |
26 | DIRS = . | 30 | DIRS = . |
27 | 31 | ||
@@ -41,13 +45,16 @@ MAXINFILE = $(OBJDIR)/romstart.temp | |||
41 | MAXOUTFILE = $(OBJDIR)/romstart | 45 | MAXOUTFILE = $(OBJDIR)/romstart |
42 | 46 | ||
43 | ifdef DEBUG | 47 | ifdef DEBUG |
44 | all: $(OBJDIR)/rockbox.elf $(ROCKS) | 48 | all: $(OBJDIR)/rockbox.elf $(CODECS) $(ROCKS) |
45 | else | 49 | else |
46 | all: $(OBJDIR)/$(BINARY) $(FLASHFILE) $(ROCKS) $(ARCHOSROM) | 50 | all: $(OBJDIR)/$(BINARY) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) |
47 | endif | 51 | endif |
48 | 52 | ||
49 | dep: $(DEPFILE) | 53 | dep: $(DEPFILE) |
50 | 54 | ||
55 | build-codecs: | ||
56 | @$(MAKE) -C codecs | ||
57 | |||
51 | rocks: | 58 | rocks: |
52 | @$(MAKE) -C plugins/lib | 59 | @$(MAKE) -C plugins/lib |
53 | @$(MAKE) -C plugins | 60 | @$(MAKE) -C plugins |
@@ -151,6 +158,7 @@ clean: | |||
151 | $(LINKROM) $(OBJDIR)/rombox.ucl $(OBJDIR)/rombox.bin \ | 158 | $(LINKROM) $(OBJDIR)/rombox.ucl $(OBJDIR)/rombox.bin \ |
152 | $(OBJDIR)/rombox.elf $(MAXOUTFILE) $(DEPFILE) | 159 | $(OBJDIR)/rombox.elf $(MAXOUTFILE) $(DEPFILE) |
153 | @$(MAKE) -C plugins clean | 160 | @$(MAKE) -C plugins clean |
161 | @$(MAKE) -C codecs clean | ||
154 | @rm -rf $(OBJDIR)/recorder $(OBJDIR)/player | 162 | @rm -rf $(OBJDIR)/recorder $(OBJDIR)/player |
155 | 163 | ||
156 | -include $(DEPFILE) | 164 | -include $(DEPFILE) |