2 files changed, 23 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
 ROCKS=rocks
 endif
 
+ifdef SOFTWARECODECS
+CODECS=build-codecs
+endif
+
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
 DIRS = .
 
@@ -41,13 +45,16 @@ MAXINFILE = $(OBJDIR)/romstart.temp
 MAXOUTFILE = $(OBJDIR)/romstart
 
 ifdef DEBUG
-all: $(OBJDIR)/rockbox.elf $(ROCKS)
+all: $(OBJDIR)/rockbox.elf $(CODECS) $(ROCKS)
 else
-all: $(OBJDIR)/$(BINARY) $(FLASHFILE) $(ROCKS) $(ARCHOSROM)
+all: $(OBJDIR)/$(BINARY) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM)
 endif
 
 dep: $(DEPFILE)
 
+build-codecs:
+        @$(MAKE) -C codecs
+
 rocks:
         @$(MAKE) -C plugins/lib
         @$(MAKE) -C plugins
@@ -151,6 +158,7 @@ clean:
         $(LINKROM) $(OBJDIR)/rombox.ucl $(OBJDIR)/rombox.bin            \
         $(OBJDIR)/rombox.elf $(MAXOUTFILE) $(DEPFILE)
         @$(MAKE) -C plugins clean
+        @$(MAKE) -C codecs clean
         @rm -rf $(OBJDIR)/recorder $(OBJDIR)/player
 
 -include $(DEPFILE)
diff --git a/tools/configure b/tools/configure
index 48d54f0bc2..ac007716bd 100755
--- a/tools/configure
+++ b/tools/configure
@@ -107,6 +107,7 @@ sed > Makefile \
  -e "s,@LANGUAGE@,${language},g" \
  -e "s,@TARGET@,${target},g" \
  -e "s,@PLUGINS@,${plugins},g" \
+ -e "s,@CODECS@,${codecs},g" \
  -e "s,@SIMVER@,${simver},g" \
  -e "s,@MEMORY@,${memory},g" \
 <<EOF 
@@ -128,6 +129,7 @@ export TARGET=@TARGET@
 export LANGUAGE=@LANGUAGE@
 export VERSION=\$(shell date +%y%m%d-%H%M)
 export ENABLEDPLUGINS=@PLUGINS@
+export SOFTWARECODECS=@CODECS@
 export MEMORYSIZE=@MEMORY@
 
 .PHONY: 
@@ -312,6 +314,7 @@ if [ -z "$archos" ]; then
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
    3)
@@ -324,6 +327,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
    4)
@@ -336,6 +340,7 @@ if [ -z "$archos" ]; then
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
    5)
@@ -349,6 +354,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="" # disabled for now, enable later on
+    codecs=""
     ;;
 
    6)
@@ -362,6 +368,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="" # disabled for now, enable later on
+    codecs=""
     ;;
 
    7)
@@ -374,6 +381,7 @@ if [ -z "$archos" ]; then
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
    8)
@@ -386,6 +394,7 @@ if [ -z "$archos" ]; then
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
    9)
@@ -399,6 +408,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="yes"
+    codecs="yes"
     ;;
 
    *)
@@ -411,6 +421,7 @@ if [ -z "$archos" ]; then
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
+    codecs=""
     ;;
 
   esac
@@ -518,6 +529,7 @@ sed > Makefile \
  -e "s,@ARCHOSROM@,${archosrom},g" \
  -e "s,@FLASHFILE@,${flash},g" \
  -e "s,@PLUGINS@,${plugins},g" \
+ -e "s,@CODECS@,${codecs},g" \
  -e "s,@GCCOPTS@,${GCCOPTS},g" \
  -e "s,@LOADADDRESS@,${loadaddress},g" \
  -e "s,@EXTRADEF@,${extradefines},g" \
@@ -543,6 +555,7 @@ export MKFIRMWARE=@TOOL@
 export BINARY=@OUTPUT@
 export APPEXTRA=@APPEXTRA@
 export ENABLEDPLUGINS=@PLUGINS@
+export SOFTWARECODECS=@CODECS@
 export EXTRA_DEFINES=@EXTRADEF@
 export CC=@CC@
 export LD=@LD@