1 files changed, 28 insertions, 28 deletions

diff --git a/tools/configure b/tools/configure
index 39f0d8578c..6d3da399ae 100755
--- a/tools/configure
+++ b/tools/configure
@@ -571,7 +571,7 @@ EOF
   # plugins:   set to 'yes' to build the plugins. Early development builds can
   #            set this to no in the early stages to have an easier life for a
   #            while
-  # codecs:    lists codecs to build for this target
+  # swcodec:   set 'yes' on swcodec targets
   # toolset:   lists what particular tools in the tools/ directory that this
   #            target needs to have built prior to building Rockbox
   #
@@ -593,7 +593,7 @@ EOF
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
 
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -621,7 +621,7 @@ EOF
     archosrom=""#"$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$archosbitmaptools
@@ -643,7 +643,7 @@ EOF
     archosrom=""#"$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$archosbitmaptools
@@ -665,7 +665,7 @@ EOF
     archosrom=""#"$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$archosbitmaptools
@@ -687,7 +687,7 @@ EOF
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$archosbitmaptools
@@ -709,7 +709,7 @@ EOF
     archosrom=""#"$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
     plugins="yes"
-    codecs=""
+    swcodec=""
     toolset=$archosbitmaptools
     t_cpu="sh"
     t_manufacturer="archos"
@@ -730,7 +730,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs=""
+    swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$toolset scramble descramble bmp2rb codepages"
@@ -756,7 +756,7 @@ EOF
     archosrom=""
     flash="$pwd/rombox.iriver"
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$iriverbitmaptools
@@ -781,7 +781,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$iriverbitmaptools
@@ -806,7 +806,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$iriverbitmaptools
@@ -831,7 +831,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$iaudiobitmaptools"
@@ -857,7 +857,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$iaudiobitmaptools"
@@ -881,7 +881,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -906,7 +906,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -930,7 +930,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -955,7 +955,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -980,7 +980,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1005,7 +1005,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1030,7 +1030,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$genericbitmaptools
@@ -1053,7 +1053,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     toolset=$gigabeatbitmaptools
     boottool="$rootdir/tools/scramble -gigabeat"
     bootoutput="FWIMG01.DAT"
@@ -1077,7 +1077,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1102,7 +1102,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL"
     bootoutput="H10_20GC.mi4"
     # toolset is the tools within the tools directory that we build for
@@ -1128,7 +1128,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL"
     bootoutput="H10.mi4"
     # toolset is the tools within the tools directory that we build for
@@ -1154,7 +1154,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=e200 -type=RBBL"
     bootoutput="PP5022.mi4"
     # toolset is the tools within the tools directory that we build for
@@ -1183,7 +1183,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4r -model=e20r -type=RBBL"
     bootoutput="pp5022.mi4"
     # toolset is the tools within the tools directory that we build for
@@ -1209,7 +1209,7 @@ EOF
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="libspc libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2"
     bootoutput="pp5020.mi4"
     # toolset is the tools within the tools directory that we build for
@@ -1567,7 +1567,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,@CODECS@,${swcodec},g" \
  -e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \
  -e "s,@SHARED_FLAG@,${SHARED_FLAG},g" \
  -e "s,@GCCOPTS@,${GCCOPTS},g" \