2 files changed, 6 insertions, 43 deletions

diff --git a/lib/rbcodec/test/SOURCES b/lib/rbcodec/test/SOURCES
index 467115e0d6..4c0d906dc5 100644
--- a/lib/rbcodec/test/SOURCES
+++ b/lib/rbcodec/test/SOURCES
@@ -1,49 +1,8 @@
 warble.c
-../../../apps/metadata.c
-../../../apps/replaygain.c
 ../../../firmware/buflib.c
 ../../../firmware/core_alloc.c
 ../../../firmware/common/strlcpy.c
 ../../../firmware/common/unicode.c
 ../../../firmware/common/structec.c
-../../../apps/mp3data.c
 ../../../apps/fixedpoint.c
 ../../../uisimulator/common/io.c
-../../../apps/compressor.c
-../../../apps/dsp.c
-../../../apps/eq.c
-../../../apps/tdspeed.c
-../../../apps/metadata/a52.c
-../../../apps/metadata/adx.c
-../../../apps/metadata/aiff.c
-../../../apps/metadata/ape.c
-../../../apps/metadata/asap.c
-../../../apps/metadata/asf.c
-../../../apps/metadata/au.c
-../../../apps/metadata/ay.c
-../../../apps/metadata/flac.c
-../../../apps/metadata/gbs.c
-../../../apps/metadata/hes.c
-../../../apps/metadata/id3tags.c
-../../../apps/metadata/kss.c
-../../../apps/metadata/metadata_common.c
-../../../apps/metadata/mod.c
-../../../apps/metadata/monkeys.c
-../../../apps/metadata/mp3.c
-../../../apps/metadata/mp4.c
-../../../apps/metadata/mpc.c
-../../../apps/metadata/nsf.c
-../../../apps/metadata/ogg.c
-../../../apps/metadata/oma.c
-../../../apps/metadata/rm.c
-../../../apps/metadata/sgc.c
-../../../apps/metadata/sid.c
-../../../apps/metadata/smaf.c
-../../../apps/metadata/spc.c
-../../../apps/metadata/tta.c
-../../../apps/metadata/vgm.c
-../../../apps/metadata/vorbis.c
-../../../apps/metadata/vox.c
-../../../apps/metadata/wave.c
-../../../apps/metadata/wavpack.c
-
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index 0b70e9a932..11f7ab03ec 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -9,12 +9,15 @@
 
 
 
+RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec
+RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec
+
 FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall
 
 SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES)
 
 INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \
-                        -I$(ROOTDIR)/apps/gui -I$(ROOTDIR)/apps/metadata
+                        -I$(ROOTDIR)/apps/gui
 INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \
                         -I$(ROOTDIR)/firmware/target/hosted \
                         -I$(ROOTDIR)/firmware/target/hosted/sdl
@@ -30,9 +33,10 @@ endif
 
 include $(ROOTDIR)/tools/functions.make
 include $(ROOTDIR)/apps/codecs/codecs.make
+include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 
 $(BUILDDIR)/$(BINARY): $(CODECS)
 
-$(BUILDDIR)/$(BINARY): $$(OBJ)
+$(BUILDDIR)/$(BINARY): $$(OBJ) $(RBCODEC_LIB)
         @echo LD $(BINARY)
         $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+