Commit 77ff83a2 authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Making the library usable by other projects (install things properly, added

pkg-config file)
parent 388f1d6c
......@@ -7,5 +7,10 @@ AUTOMAKE_OPTIONS = 1.6
#Fools KDevelop into including all files
SUBDIRS = libentcode libcelt
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = celt.pc
EXTRA_DIST = celt.pc.in
rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
# libcelt pkg-config source file
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: celt
Description: CELT is a low-delay audio codec
Version: @CELT_VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lcelt -lentcode -lm
Cflags: -I${includedir}
......@@ -121,7 +121,7 @@ fi
AC_SUBST(SIZE16)
AC_SUBST(SIZE32)
AC_OUTPUT([Makefile libcelt/Makefile libentcode/Makefile])
AC_OUTPUT([Makefile libcelt/Makefile libentcode/Makefile celt.pc])
if test "x$src" = "x"; then
echo "**IMPORTANT**"
......
......@@ -2,6 +2,7 @@
#AUTOMAKE_OPTIONS = no-dependencies
pkginclude_HEADERS = celt.h
#EXTRA_DIST=
#INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
......@@ -16,7 +17,7 @@ libcelt_la_SOURCES = bands.c celt.c cwrs.c fftwrap.c mdct.c modes.c pitch.c \
libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h modes.h \
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
......
......@@ -32,6 +32,10 @@
#ifndef CELT_H
#define CELT_H
#ifdef __cplusplus
extern "C" {
#endif
#define CELT_BAD_ARG -1
#define CELT_INVALID_MODE -2
#define CELT_INTERNAL_ERROR -3
......@@ -43,8 +47,8 @@ typedef struct CELTDecoder CELTDecoder;
typedef struct CELTMode CELTMode;
extern const CELTMode const *celt_mono;
extern const CELTMode const *celt_stereo;
extern const CELTMode *celt_mono;
extern const CELTMode *celt_stereo;
/* Encoder stuff */
......@@ -62,4 +66,8 @@ void celt_decoder_destroy(CELTDecoder *st);
int celt_decode(CELTDecoder *st, char *data, int len, short *pcm);
#ifdef __cplusplus
}
#endif
#endif /*CELT_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