Commit e32fc2c7 authored by jm's avatar jm
Browse files

documentation update, build/install tweaks


git-svn-id: http://svn.xiph.org/trunk/speex@7121 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent ebe2e740
......@@ -3,13 +3,13 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = speex.pc
m4datadir = $(datadir)/aclocal
m4data_DATA = speex.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = speex.pc
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
#Fools KDevelop into including all files
SUBDIRS = libspeex include @src@ doc win32
......
......@@ -64,5 +64,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libspeex*.la
%{_includedir}/speex*.h
%{_includedir}/speex/speex*.h
/usr/share/aclocal/speex.m4
%{_libdir}/pkgconfig/speex.pc
%{_libdir}/libspeex*.a
......@@ -9,9 +9,9 @@ SPEEX_EXTRA_VERSION=
#SPEEX_VERSION=1.1.6
SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
SPEEX_LT_CURRENT=2
SPEEX_LT_CURRENT=3
SPEEX_LT_REVISION=0
SPEEX_LT_AGE=1
SPEEX_LT_AGE=2
AC_SUBST(SPEEX_LT_CURRENT)
AC_SUBST(SPEEX_LT_REVISION)
......@@ -68,7 +68,7 @@ AC_LIBOBJ(getopt1)])])
AC_CHECK_LIB(winmm, main)
AC_DEFINE_UNQUOTED(SPEEX_VERSION, "${VERSION}")
AC_DEFINE_UNQUOTED(SPEEX_VERSION, "${SPEEX_VERSION}")
AC_DEFINE_UNQUOTED(SPEEX_MAJOR_VERSION, ${SPEEX_MAJOR_VERSION})
AC_DEFINE_UNQUOTED(SPEEX_MINOR_VERSION, ${SPEEX_MINOR_VERSION})
AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION})
......
......@@ -28,7 +28,7 @@
The Speex Codec Manual
\newline
(version 1.1.5)
(version 1.1.6)
\layout Author
Jean-Marc Valin
......@@ -743,7 +743,7 @@ Encoding
In order to encode speech using Speex, you first need to:
\layout LyX-Code
#include <speex.h>
#include <speex/speex.h>
\layout Standard
You then need to declare a Speex bit-packing struct
......@@ -880,7 +880,7 @@ Decoding
In order to encode speech using Speex, you first need to:
\layout LyX-Code
#include <speex.h>
#include <speex/speex.h>
\layout Standard
You also need to declare a Speex bit-packing struct
......@@ -998,7 +998,7 @@ Preprocessor
In order to use the Speex preprocessor, you first need to:
\layout LyX-Code
#include <speex_preprocess.h>
#include <speex/speex_preprocess.h>
\layout Standard
Then, a preprocessor state can be created as:
......@@ -5899,7 +5899,7 @@ IETF RTP Profile
\layout Standard
\begin_inset Include \verbatiminput{draft-herlein-speex-rtp-profile-01.txt}
\begin_inset Include \verbatiminput{draft-herlein-avt-rtp-speex-00.txt}
preview false
\end_inset
......
No preview for this file type
#include <speex.h>
#include <speex/speex.h>
#include <stdio.h>
/*The frame size in hardcoded for this sample code but it doesn't have to be*/
......
#include <speex.h>
#include <speex/speex.h>
#include <stdio.h>
/*The frame size in hardcoded for this sample code but it doesn't have to be*/
......
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