diff options
| author | Dave Chapman <dave@dchapman.com> | 2005-10-29 17:12:52 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2005-10-29 17:12:52 +0000 |
| commit | 45f9e5d7b02ce3b9d165f45d63825d50244634d4 (patch) | |
| tree | 900097f56dbecc41ea4fc6cd50366f0af3164e84 /apps/codecs/Makefile | |
| parent | e75cbdd2a84904e9294091c0ae599762b067077a (diff) | |
Remove generic M4A parsing code from libalac and create a libm4a - so it can be used by other codecs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7682 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/Makefile')
| -rw-r--r-- | apps/codecs/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 2c1cd93cc6..3b86435208 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -17,7 +17,7 @@ ifdef APPEXTRA endif ifdef SOFTWARECODECS - CODECLIBS = -lmad -la52 -lffmpegFLAC -lTremor -lwavpack -lmusepack -lalac + CODECLIBS = -lmad -la52 -lffmpegFLAC -lTremor -lwavpack -lmusepack -lalac -lm4a endif # we "borrow" the plugin LDS file @@ -39,7 +39,7 @@ DIRS = . CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a -.PHONY: libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac +.PHONY: libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libm4a OUTPUT = $(SOFTWARECODECS) @@ -60,7 +60,7 @@ $(OBJDIR)/vorbis.elf: $(OBJDIR)/vorbis.o $(CODECDEPS) $(BUILDDIR)/libTremor.a $(OBJDIR)/mpc.elf: $(OBJDIR)/mpc.o $(CODECDEPS) $(BUILDDIR)/libmusepack.a $(OBJDIR)/wav.elf: $(OBJDIR)/wav.o $(CODECDEPS) $(OBJDIR)/wavpack.elf: $(OBJDIR)/wavpack.o $(CODECDEPS) $(BUILDDIR)/libwavpack.a -$(OBJDIR)/alac.elf: $(OBJDIR)/alac.o $(CODECDEPS) $(BUILDDIR)/libalac.a +$(OBJDIR)/alac.elf: $(OBJDIR)/alac.o $(CODECDEPS) $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(CODECDEPS) $(ELFIT) @@ -157,10 +157,14 @@ libalac: @echo "MAKE in libalac" @mkdir -p $(OBJDIR)/libalac @$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a +libm4a: + @echo "MAKE in libm4a" + @mkdir -p $(OBJDIR)/libm4a + @$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a clean: @echo "cleaning codecs" - $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a + $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a @$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad @$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52 @$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC @@ -168,5 +172,6 @@ clean: @$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack @$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack @$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac + @$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a @$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb @$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib |