5 files changed, 6 insertions, 10 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 2aa990ac7d..82074016f3 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -486,7 +486,7 @@ STOP
     # Android has codecs installed as native libraries so they are not needed
     # in the zip.
     if ($modelname !~ /android/) {
-        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'apps/codecs');
+        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'lib/rbcodec/codecs');
     }
 
     # remove directory again if no codec was copied
diff --git a/tools/codecscan.pl b/tools/codecscan.pl
index c21295d49f..4f0cbc73af 100755
--- a/tools/codecscan.pl
+++ b/tools/codecscan.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$codecs="apps/codecs";
+$codecs="lib/rbcodec/codecs";
 
 opendir(DIR, $codecs) || die "can't opendir $some_dir: $!";
 my @maps = sort grep { /\.map/ && -f "$codecs/$_" } readdir(DIR);
diff --git a/tools/configure b/tools/configure
index 73639cfb5c..23731530d1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3849,6 +3849,7 @@ export CPU=${t_cpu}
 export MANUFACTURER=${t_manufacturer}
 export OBJDIR=${pwd}
 export BUILDDIR=${pwd}
+export RBCODEC_BLD=${pwd}/lib/rbcodec
 export LANGUAGE=${language}
 export VOICELANGUAGE=${voicelanguage}
 export MEMORYSIZE=${memory}
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 247d25e1db..2435caeaf4 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -11,7 +11,7 @@ ifndef V
 SILENT = @
 endif
 
-SPEEXSRC = ../../apps/codecs/libspeex
+SPEEXSRC = ../../lib/rbcodec/codecs/libspeex
 
 INCLUDES = -I $(SPEEXSRC)
 SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER
diff --git a/tools/root.make b/tools/root.make
index 0fc6c55403..689047e9db 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -101,17 +101,12 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
 else ifneq (,$(findstring warble,$(APP_TYPE)))
   include $(ROOTDIR)/lib/rbcodec/test/warble.make
   include $(ROOTDIR)/lib/tlsf/libtlsf.make
-  include $(APPSDIR)/codecs/codecs.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 else
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
   include $(APPSDIR)/lang/lang.make
 
-  ifdef SOFTWARECODECS
-    include $(APPSDIR)/codecs/codecs.make
-  endif
-
   ifdef ENABLEDPLUGINS
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
@@ -206,7 +201,7 @@ $(LINKROM): $(ROMLDS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
@@ -214,7 +209,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
 $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map