Split libspeex and libspeexdsp

Author: slicer

Makefile.am

@@ -4,18 +4,15 @@
 # gcc and gmake, add the option 'no-dependencies'
 AUTOMAKE_OPTIONS = 1.8
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = speex.m4
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = speex.pc speexdsp.pc
+pkgconfig_DATA = speexdsp.pc
 
-EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
+EXTRA_DIST = SpeexDSP.spec SpeexDSP.spec.in SpeexDSP.kdevelop speexdsp.pc.in README.blackfin README.symbian README.TI-DSP
 
 #Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+SUBDIRS = libspeexdsp include doc win32 symbian ti
 
-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
+DIST_SUBDIRS = libspeexdsp include doc win32 symbian ti
 
 rpm: dist
 	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

Speex.kdevelop renamed to SpeexDSP.kdevelop

@@ -56,16 +56,12 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %defattr(644,root,root,755)
 %doc COPYING AUTHORS ChangeLog NEWS README
 %doc doc/manual.pdf
-/usr/share/man/man1/speexenc.1*
-/usr/share/man/man1/speexdec.1*
 %attr(755,root,root) %{_bindir}/speex*
 %attr(755,root,root) %{_libdir}/libspeex*.so*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libspeex*.la
 %{_includedir}/speex/speex*.h
-/usr/share/aclocal/speex.m4
-%{_libdir}/pkgconfig/speex.pc
 %{_libdir}/pkgconfig/speexdsp.pc
 %{_libdir}/libspeex*.a

Speex.spec.in renamed to SpeexDSP.spec.in

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
-AC_INIT(libspeex/speex.c)
+AC_INIT(libspeexdsp/preprocess.c)
 
 AM_CONFIG_HEADER([config.h])
 
@@ -22,7 +22,7 @@ AC_SUBST(SPEEX_LT_AGE)
 
 # For automake.
 VERSION=$SPEEX_VERSION
-PACKAGE=speex
+PACKAGE=speexdsp
 
 AC_SUBST(SPEEX_VERSION)
 
@@ -112,7 +112,6 @@ AC_MSG_RESULT($has_visibility)
 
 AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
 
-XIPH_PATH_OGG([src="src"], [src=""])
 AC_SUBST(src)
 
 AC_CHECK_LIB(m, sin)
@@ -204,12 +203,6 @@ AC_ARG_ENABLE(ti-c55x, [  --enable-ti-c55x        Enable support for TI C55X DSP
   AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP])
 fi])
 
-AC_ARG_ENABLE(vorbis-psy, [  --enable-psy    Enable the Vorbis psy model],
-[if test "$enableval" = yes; then
-  vorbis_psy=yes;
-  AC_DEFINE([VORBIS_PSYCHO], , [Enable support for the Vorbis psy model])
-fi])
-
 AC_ARG_WITH([fft], [AS_HELP_STRING([--with-fft=choice],[use an alternate FFT implementation. The available choices are
 kiss (default fixed point), smallft (default floating point), gpl-fftw3 and proprietary-intel-mkl])],
 [FFT=$withval]
@@ -247,8 +240,6 @@ AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"])
 AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"])
 AC_SUBST(FFT_PKGCONFIG)
 
-AM_CONDITIONAL(BUILD_VORBIS_PSY, [test "x$vorbis_psy" = "xyes"])
-
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -284,36 +275,24 @@ AC_SUBST(SIZE32)
 
 AC_DEFINE([_BUILD_SPEEX], [], [Defined only when Speex itself is build built])
 
-AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
-           include/Makefile include/speex/Makefile speex.pc speexdsp.pc
-           win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
-           win32/speexdec/Makefile symbian/Makefile 
+AC_OUTPUT([Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+           include/Makefile include/speex/Makefile speexdsp.pc
+           win32/Makefile win32/libspeexdsp/Makefile
+           symbian/Makefile 
+
            win32/VS2003/Makefile
-           win32/VS2003/tests/Makefile
-           win32/VS2003/libspeex/Makefile
            win32/VS2003/libspeexdsp/Makefile
-           win32/VS2003/speexdec/Makefile
-           win32/VS2003/speexenc/Makefile
+           win32/VS2003/tests/Makefile
+
            win32/VS2005/Makefile
-           win32/VS2005/libspeex/Makefile
-           win32/VS2005/speexdec/Makefile
-           win32/VS2005/speexenc/Makefile
            win32/VS2005/libspeexdsp/Makefile
            win32/VS2005/tests/Makefile
-           win32/VS2008/libspeexdsp/Makefile
+
            win32/VS2008/Makefile
-           win32/VS2008/speexdec/Makefile
+           win32/VS2008/libspeexdsp/Makefile
            win32/VS2008/tests/Makefile
-           win32/VS2008/libspeex/Makefile
-           win32/VS2008/speexenc/Makefile
-           include/speex/speex_config_types.h ti/Makefile 
+           include/speex/speexdsp_config_types.h ti/Makefile 
 	   ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile
 	   ti/speex_C64_test/Makefile ])
 
-if test "x$src" = "x"; then 
-echo "**IMPORTANT**"
-echo "You don't seem to have the development package for libogg (libogg-devel) installed. Only the Speex library (libspeex) will be built (no encoder/decoder executable)"
-echo "You can download libogg from http://downloads.xiph.org/releases/ogg/"
-fi
-
 echo "Type \"make; make install\" to compile and install Speex";

configure.ac

@@ -1,9 +1,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-nodist_pkginclude_HEADERS = speex_config_types.h
-
-pkginclude_HEADERS = speex.h speex_bits.h speex_buffer.h speex_callbacks.h \
-	speex_echo.h speex_header.h speex_jitter.h speex_preprocess.h speex_resampler.h \
-	speex_stereo.h speex_types.h
+nodist_pkginclude_HEADERS = speexdsp_config_types.h
 
+pkginclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
+	speexdsp_types.h