4 files changed, 28 insertions, 2 deletions

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index a8c0085cb4..fbe3b1c978 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -34,6 +34,7 @@ include $(APPSDIR)/codecs/libtremor/libtremor.make
 include $(APPSDIR)/codecs/libwavpack/libwavpack.make
 include $(APPSDIR)/codecs/libwma/libwma.make
 include $(APPSDIR)/codecs/libcook/libcook.make
+include $(APPSDIR)/codecs/librm/librm.make
 
 # compile flags for codecs
 CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \
@@ -74,7 +75,7 @@ $(CODECDIR)/ape.codec : $(CODECDIR)/libdemac.a
 $(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a
 $(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a
 $(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a
-$(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a
+$(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a $(CODECDIR)/librm.a
 
 $(CODECS): $(CODECLIB) # this must be last in codec dependency list
 
diff --git a/apps/codecs/libcook/SOURCES b/apps/codecs/libcook/SOURCES
index 7b2cd967ea..bfcb24c8cd 100644
--- a/apps/codecs/libcook/SOURCES
+++ b/apps/codecs/libcook/SOURCES
@@ -1,3 +1,2 @@
 cook.c
 bitstream.c
-../librm/rm.c
diff --git a/apps/codecs/librm/SOURCES b/apps/codecs/librm/SOURCES
new file mode 100644
index 0000000000..e0ff169fae
--- /dev/null
+++ b/apps/codecs/librm/SOURCES
@@ -0,0 +1 @@
+rm.c
diff --git a/apps/codecs/librm/librm.make b/apps/codecs/librm/librm.make
new file mode 100644
index 0000000000..99d89cdab7
--- /dev/null
+++ b/apps/codecs/librm/librm.make
@@ -0,0 +1,25 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id: librm.make 20151 2009-03-01 09:04:15Z amiconn $
+#
+
+# librm
+RMLIB := $(CODECDIR)/librm.a
+RMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/librm/SOURCES)
+RMLIB_OBJ := $(call c2obj, $(RMLIB_SRC))
+OTHER_SRC += $(RMLIB_SRC)
+
+$(RMLIB): $(RMLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+
+RMFLAGS = $(filter-out -O%,$(CODECFLAGS))
+RMFLAGS += -O3
+
+$(CODECDIR)/librm/%.o: $(ROOTDIR)/apps/codecs/librm/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(RMFLAGS) -c $< -o $@