summaryrefslogtreecommitdiffstats
path: root/apps/codecs/Makefile
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-09-02 22:34:13 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-09-02 22:34:13 +0000
commit55a3018cdd246168cf6b8286032383e7831226ad (patch)
treec85e0f527616126ca3ead68797223460843b3e57 /apps/codecs/Makefile
parentce9fe07d51b9e3ff1625314a58111794dd351729 (diff)
downloadrockbox-55a3018cdd246168cf6b8286032383e7831226ad.tar.gz
rockbox-55a3018cdd246168cf6b8286032383e7831226ad.zip
more make magic to heal the broken builds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10860 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/Makefile')
-rw-r--r--apps/codecs/Makefile31
1 files changed, 24 insertions, 7 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 695b4546b0..fb1228d7fc 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -43,9 +43,11 @@ CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a
OUTPUT = $(SOFTWARECODECS)
-all: $(ROCKS)
+all: $(LINKCODEC) $(ROCKS)
ifndef SIMVER
+$(BUILDDIR)/%.a : % $(CODECDEPS)
+
$(OBJDIR)/wav.elf : $(OBJDIR)/wav.o
$(OBJDIR)/sid.elf : $(OBJDIR)/sid.o
$(OBJDIR)/aiff.elf : $(OBJDIR)/aiff.o
@@ -62,12 +64,9 @@ $(OBJDIR)/mp3_enc.elf: $(OBJDIR)/mp3_enc.o
$(OBJDIR)/wav_enc.elf: $(OBJDIR)/wav_enc.o
$(OBJDIR)/wavpack_enc.elf: $(OBJDIR)/wavpack_enc.o $(BUILDDIR)/libwavpack.a
-$(OBJDIR)/%.elf :
+$(OBJDIR)/%.elf:
@echo "LD $(notdir $@)"
- $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec \
- -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map
-
-$(BUILDDIR)/%.a : % $(CODECDEPS)
+ $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map
$(OBJDIR)/%.codec : $(OBJDIR)/%.elf
@echo "OBJCOPY $(notdir $@)"
@@ -95,7 +94,7 @@ ifeq ($(SIMVER), sdl)
# This is the SDL simulator version
$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT)
- @echo "LD $(notdir $@)"
+ @echo "LD $(notdir $@) $^"
$(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
# 'x' must be kept or you'll have "Win32 error 5"
@@ -140,26 +139,36 @@ $(LINKCODEC): $(LDS)
@echo "build $@"
$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
+$(BUILDDIR)/libmad.a: libmad
+
libmad:
@echo "MAKE in libmad"
$(SILENT)mkdir -p $(OBJDIR)/libmad
$(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
+$(BUILDDIR)/liba52.a: liba52
+
liba52:
@echo "MAKE in liba52"
$(SILENT)mkdir -p $(OBJDIR)/liba52
$(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
+$(BUILDDIR)/libffmpegFLAC.a: libffmpegFLAC
+
libffmpegFLAC:
@echo "MAKE in libffmpegFLAC"
$(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC
$(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a
+$(BUILDDIR)/libTremor.a: libTremor
+
libTremor:
@echo "MAKE in Tremor"
$(SILENT)mkdir -p $(OBJDIR)/Tremor
$(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
+$(BUILDDIR)/libwavpack.a: libwavpack
+
libwavpack:
@echo "MAKE in libwavpack"
$(SILENT)mkdir -p $(OBJDIR)/libwavpack
@@ -170,21 +179,29 @@ dumb:
$(SILENT)mkdir -p $(OBJDIR)/dumb
$(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
+$(BUILDDIR)/libmusepack.a: libmusepack
+
libmusepack:
@echo "MAKE in libmusepack"
$(SILENT)mkdir -p $(OBJDIR)/libmusepack
$(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
+$(BUILDDIR)/libalac.a: libalac
+
libalac:
@echo "MAKE in libalac"
$(SILENT)mkdir -p $(OBJDIR)/libalac
$(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a
+$(BUILDDIR)/libm4a.a: libm4a
+
libm4a:
@echo "MAKE in libm4a"
$(SILENT)mkdir -p $(OBJDIR)/libm4a
$(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a
+$(BUILDDIR)/libfaad.a: libfaad
+
libfaad:
@echo "MAKE in libfaad"
$(SILENT)mkdir -p $(OBJDIR)/libfaad