Correct dependencies for codec builds

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6089 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 19 insertions, 19 deletions

diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 6567e22385..a5ac81b0cd 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -16,37 +16,39 @@ ifdef APPEXTRA
    INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
 endif
 
-OUTPUT = $(OBJDIR)/libmad.a $(OBJDIR)/liba52.a $(OBJDIR)/libFLAC.a $(OBJDIR)/libTremor.a $(OBJDIR)/libwavpack.a
+.PHONY: libmad liba52 libFLAC libTremor libwavpack
+OUTPUT = libmad liba52 libFLAC libTremor libwavpack
 
 all: $(OUTPUT)
 
 include $(TOOLSDIR)/make.inc
 
-$(OBJDIR)/libmad.a:
+
+libmad:
         @echo "MAKE in libmad"
         @mkdir -p $(OBJDIR)/libmad
-        @$(MAKE) -C libmad TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
+        @$(MAKE) -C libmad TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libmad VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libmad.a
 
-$(OBJDIR)/liba52.a:
+liba52:
         @echo "MAKE in liba52"
         @mkdir -p $(OBJDIR)/liba52
-        @$(MAKE) -C liba52 TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
+        @$(MAKE) -C liba52 TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/liba52 VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/liba52.a
 
-$(OBJDIR)/libFLAC.a:
+libFLAC:
         @echo "MAKE in libFLAC"
         @mkdir -p $(OBJDIR)/libFLAC
-        @$(MAKE) -C libFLAC TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
+        @$(MAKE) -C libFLAC TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libFLAC VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libFLAC.a
 
-$(OBJDIR)/libTremor.a:
+libTremor:
         @echo "MAKE in Tremor"
         @mkdir -p $(OBJDIR)/Tremor
-        @$(MAKE) -C Tremor TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
+        @$(MAKE) -C Tremor TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/Tremor VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libTremor.a
 
-$(OBJDIR)/libwavpack.a:
+libwavpack:
         @echo "MAKE in libwavpack"
         @mkdir -p $(OBJDIR)/libwavpack
-        @$(MAKE) -C libwavpack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
-                
+        @$(MAKE) -C libwavpack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libwavpack VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libwavpack.a
+
 clean:
         @echo "cleaning codecs"
         @rm -fr $(OBJDIR)/libmad $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile
index c8713e6496..61f53d0edb 100644
--- a/apps/codecs/Tremor/Makefile
+++ b/apps/codecs/Tremor/Makefile
@@ -19,7 +19,7 @@ CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=$
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
-OBJS := $(SRC:%.c=$(OBJDIR)/Tremor/%.o)
+OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEPFILE = $(OBJDIR)/dep-Tremor
 DIRS = 
 
diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile
index 6f8fb08356..aa475b6b74 100644
--- a/apps/codecs/liba52/Makefile
+++ b/apps/codecs/liba52/Makefile
@@ -19,7 +19,7 @@ CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${ME
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
-OBJS := $(SRC:%.c=$(OBJDIR)/liba52/%.o)
+OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEPFILE = $(OBJDIR)/dep-liba52
 DIRS = 
 
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile
index 2ac459cad6..4403c050b3 100644
--- a/apps/codecs/libmad/Makefile
+++ b/apps/codecs/libmad/Makefile
@@ -20,19 +20,17 @@ $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
-OBJS := $(SRC:%.c=$(OBJDIR)/libmad/%.o)
+OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEPFILE = $(OBJDIR)/dep-libmad
 DIRS = 
 
-OUTPUT = $(OBJDIR)/libmad.a
-
 all: $(OUTPUT)
 
 $(OUTPUT): $(OBJS)
         @echo "AR $@"
         @$(AR) ruv $@ $+ >/dev/null 2>&1
 
-$(OBJDIR)/libmad/%.o: $(APPSDIR)/codecs/libmad/%.c
+$(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c
         @echo "CC $<"
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@
 
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile
index 7fc745b035..f52a2cf2ac 100644
--- a/apps/codecs/libwavpack/Makefile
+++ b/apps/codecs/libwavpack/Makefile
@@ -19,7 +19,7 @@ $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
-OBJS := $(SRC:%.c=$(OBJDIR)/libwavpack/%.o)
+OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEPFILE = $(OBJDIR)/dep-libwavpack
 DIRS =