[pulseaudio-commits] r1708 - /branches/lennart/src/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Aug 24 00:31:51 2007
New Revision: 1708

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1708&root=3Dpulseaudio&vi=
ew=3Drev
Log:
build speex resampler tiwce, once for fixed point, one for floating point

Modified:
    branches/lennart/src/Makefile.am

Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.a=
m?rev=3D1708&root=3Dpulseaudio&r1=3D1707&r2=3D1708&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Fri Aug 24 00:31:51 2007
@@ -556,8 +556,21 @@
 libpulsedsp_la_LDFLAGS =3D -avoid-version
 =

 ###################################
+#      Speex Resampler            #
+###################################
+
+noinst_LTLIBRARIES =3D libspeex-resampler-fixed.la libspeex-resampler-floa=
t.la
+
+libspeex_resampler_fixed_la_CPPFLAGS =3D $(AM_CPPFLAGS) -DRANDOM_PREFIX=3D=
paspfx -DOUTSIDE_SPEEX -DFIXED_POINT
+libspeex_resampler_fixed_la_SOURCES =3D pulsecore/speex/resample.c pulseco=
re/speex/speex_resampler.h pulsecore/speex/arch.h pulsecore/speex/fixed_gen=
eric.h
+
+libspeex_resampler_float_la_CPPFLAGS =3D $(AM_CPPFLAGS) -DRANDOM_PREFIX=3D=
paspfl -DOUTSIDE_SPEEX =

+libspeex_resampler_float_la_SOURCES =3D pulsecore/speex/resample.c pulseco=
re/speex/speex_resampler.h pulsecore/speex/arch.h
+
+###################################
 #      Daemon core library        #
 ###################################
+
 =

 pulsecoreinclude_HEADERS =3D \
 		pulsecore/autoload.h \
@@ -699,7 +712,7 @@
 =

 libpulsecore_la_CPPFLAGS =3D $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
 libpulsecore_la_LDFLAGS =3D -version-info $(LIBPULSECORE_VERSION_INFO)
-libpulsecore_la_LIBADD =3D $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $=
(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
+libpulsecore_la_LIBADD =3D $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $=
(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resam=
pler-fixed.la libspeex-resampler-float.la
 =

 ###################################
 #   Plug-in support libraries     #
@@ -1384,4 +1397,10 @@
 massif: pulseaudio
 	libtool --mode=3Dexecute valgrind --tool=3Dmassif --depth=3D6  --alloc-fn=
=3Dpa_xmalloc --alloc-fn=3Dpa_xmalloc0 --alloc-fn=3Dpa_xrealloc --alloc-fn=
=3Ddbus_realloc --alloc-fn=3Dpa_xnew0_internal --alloc-fn=3Dpa_xnew_interna=
l ./pulseaudio
 =

+update-speex:
+	wget -O pulsecore/speex/speex_resampler.h http://svn.xiph.org/trunk/speex=
/include/speex/speex_resampler.h
+	wget -O pulsecore/speex/resample.c http://svn.xiph.org/trunk/speex/libspe=
ex/resample.c
+	wget -O pulsecore/speex/arch.h http://svn.xiph.org/trunk/speex/libspeex/a=
rch.h
+	wget -O pulsecore/speex/fixed_generic.h http://svn.xiph.org/trunk/speex/l=
ibspeex/fixed_generic.h
+
 .PHONY: utils/padsp