summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-06-28 22:14:02 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-06-28 22:14:02 +0000
commitc2bf5dfe12978b44d5d890a37f256c8d9f510660 (patch)
tree6c42eb2c0996c7b40fc7381b0c06553bb2bf9086
parent2e88a90c0b2e9dae693fa331dd85b82e6cf78257 (diff)
downloadrockbox-c2bf5dfe12978b44d5d890a37f256c8d9f510660.zip
rockbox-c2bf5dfe12978b44d5d890a37f256c8d9f510660.tar.gz
rockbox-c2bf5dfe12978b44d5d890a37f256c8d9f510660.tar.bz2
rockbox-c2bf5dfe12978b44d5d890a37f256c8d9f510660.tar.xz
For target builds, make the ELF files depend on its object file, but also
on the generic codec lib and the specific codec lib for each particular codec. (Initial take, may need to adjusting to get optimal) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6905 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/Makefile19
1 files changed, 17 insertions, 2 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index ccf1389..abd108f 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -37,6 +37,8 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
DEFS := $(SRC:%.c=$(OBJDIR)/%.def)
DIRS = .
+CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a
+
.PHONY: libmad liba52 libFLAC libTremor libwavpack dumb libmusepack
OUTPUT = $(SOFTWARECODECS)
@@ -44,11 +46,24 @@ OUTPUT = $(SOFTWARECODECS)
all: $(OUTPUT) $(ROCKS) $(DEPFILE)
ifndef SIMVER
-$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKCODEC)
- $(SILENT)(file=`basename $@`; \
+ELFIT = $(SILENT)(file=`basename $@`; \
echo "LD $$file"; \
$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map)
+.elf.o:
+ $(ELFIT)
+
+$(OBJDIR)/mpa.elf: $(OBJDIR)/mpa.o $(CODECDEPS) $(BUILDDIR)/libmad.a
+$(OBJDIR)/a52.elf: $(OBJDIR)/a52.o $(CODECDEPS) $(BUILDDIR)/liba52.a
+$(OBJDIR)/flac.elf: $(OBJDIR)/flac.o $(CODECDEPS) $(BUILDDIR)/libFLAC.a
+$(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)/%.elf: $(OBJDIR)/%.o $(CODECDEPS)
+ $(ELFIT)
+
$(OBJDIR)/%.codec : $(OBJDIR)/%.elf
@echo "OBJCOPY "`basename $@`
@$(OC) -O binary $< $@