Make fixepoint.c as a shared library (libfixedpoint.a).

Change-Id: Icc10d6e85f890c432f191233a4d64e09f00be43d
Reviewed-on: http://gerrit.rockbox.org/456
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested-by: Michael Sevakis <jethead71@rockbox.org>

7 files changed, 5 insertions, 32 deletions

diff --git a/lib/rbcodec/codecs/adx.c b/lib/rbcodec/codecs/adx.c
index 0c67fc8d6e..83ced5add0 100644
--- a/lib/rbcodec/codecs/adx.c
+++ b/lib/rbcodec/codecs/adx.c
@@ -23,7 +23,7 @@
 #include "codeclib.h"
 #include "inttypes.h"
 #include "math.h"
-#include "lib/fixedpoint.h"
+#include "fixedpoint.h"
 
 CODEC_HEADER
 
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index eea8950d0d..21bb9332b3 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
 OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
 
 # extra libraries
-CODEC_LIBS := $(CODECLIB)
+CODEC_LIBS := $(CODECLIB) $(FIXEDPOINTLIB)
 
 # the codec libraries
 include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
diff --git a/lib/rbcodec/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
index 257dcb5838..f4b951a5eb 100644
--- a/lib/rbcodec/codecs/lib/SOURCES
+++ b/lib/rbcodec/codecs/lib/SOURCES
@@ -1,6 +1,5 @@
 #if CONFIG_CODEC == SWCODEC /* software codec platforms */
 codeclib.c
-fixedpoint.c
 ffmpeg_bitstream.c
 
 mdct_lookup.c
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.c b/lib/rbcodec/codecs/lib/fixedpoint.c
deleted file mode 100644
index a66dcb1270..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../apps/fixedpoint.c"
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.h b/lib/rbcodec/codecs/lib/fixedpoint.h
deleted file mode 100644
index 3d8e77cd89..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 Jens Arnold
- *
- * Fixed point library for codecs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef _FIXEDPOINT_H_CODECS
-#define _FIXEDPOINT_H_CODECS
-#include "../../../../firmware/include/fixedpoint.h"
-#endif /* _FIXEDPOINT_H_CODECS */
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make
index 7aac57b87d..bc4e54fddf 100644
--- a/lib/rbcodec/rbcodec.make
+++ b/lib/rbcodec/rbcodec.make
@@ -15,7 +15,9 @@ RBCODECLIB := $(BUILDDIR)/lib/librbcodec.a
 INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/codecs \
                         -I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
 OTHER_SRC += $(RBCODECLIB_SRC)
-CORE_LIBS += $(RBCODECLIB)
+
+# libfixedpoint must go after in lib list but be made first
+CORE_LIBS := $(RBCODECLIB) $(CORE_LIBS)
 
 $(RBCODECLIB): $(RBCODECLIB_OBJ)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
diff --git a/lib/rbcodec/test/SOURCES b/lib/rbcodec/test/SOURCES
index a89af238ca..d1413c758a 100644
--- a/lib/rbcodec/test/SOURCES
+++ b/lib/rbcodec/test/SOURCES
@@ -2,5 +2,4 @@ warble.c
 ../../../firmware/common/strlcpy.c
 ../../../firmware/common/unicode.c
 ../../../firmware/common/structec.c
-../../../apps/fixedpoint.c
 ../../../uisimulator/common/io.c