Commit 6238bc0e authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Moved the content of libentcode into libcelt to reduce dependencies,

especially now that we have a custom version of that code anyway. Moved
the test code to tests/
parent 94d4ea93
......@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = 1.6
#Fools KDevelop into including all files
SUBDIRS = libentcode libcelt
SUBDIRS = libcelt tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = celt.pc
......
......@@ -10,5 +10,5 @@ Description: CELT is a low-delay audio codec
Version: @CELT_VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lcelt -lentcode -lm
Libs: -L${libdir} -lcelt -lm
Cflags: -I${includedir}
......@@ -121,7 +121,7 @@ fi
AC_SUBST(SIZE16)
AC_SUBST(SIZE32)
AC_OUTPUT([Makefile libcelt/Makefile libentcode/Makefile celt.pc])
AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile celt.pc])
if test "x$src" = "x"; then
echo "**IMPORTANT**"
......
......@@ -10,20 +10,22 @@ pkginclude_HEADERS = celt.h
lib_LTLIBRARIES = libcelt.la
# Sources for compilation in the library
libcelt_la_SOURCES = bands.c celt.c cwrs.c fftwrap.c mdct.c modes.c pitch.c \
psy.c quant_bands.c quant_pitch.c rate.c smallft.c vq.c
libcelt_la_SOURCES = bands.c bitrdec.c bitree.c bitrenc.c celt.c cwrs.c \
ecintrin.h entcode.c entdec.c entenc.c fftwrap.c laplace.c mdct.c \
modes.c pitch.c psy.c quant_bands.c quant_pitch.c rangedec.c \
rangeenc.c rate.c smallft.c vq.c
#noinst_HEADERS =
libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
noinst_HEADERS = arch.h bands.h cwrs.h fftwrap.h mdct.h modes.h \
os_support.h pgain_table.h pitch.h psy.h quant_bands.h quant_pitch.h rate.h \
smallft.h vq.h
noinst_HEADERS = arch.h bands.h bitrdec.h bitree.h bitrenc.h cwrs.h \
ecintrin.h entcode.h entdec.h entenc.h fftwrap.h laplace.h \
mfrngcod.h mdct.h modes.h os_support.h pgain_table.h pitch.h psy.h \
quant_bands.h quant_pitch.h rate.h smallft.h vq.h
noinst_PROGRAMS = testcelt
testcelt_SOURCES = testcelt.c
testcelt_LDADD = $(top_builddir)/libentcode/libentcode.la \
libcelt.la
INCLUDES = -I$(top_srcdir)/libentcode
libcelt_la_LIBADD = $(top_builddir)/libentcode/libentcode.la
testcelt_LDADD = libcelt.la
INCLUDES =
libcelt_la_LIBADD =
......@@ -37,7 +37,7 @@
#include "fftwrap.h"
#include "bands.h"
#include "modes.h"
#include "probenc.h"
#include "entcode.h"
#include "quant_pitch.h"
#include "quant_bands.h"
#include "psy.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment