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

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Aug 26 00:27:24 2007
New Revision: 1718

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1718&root=3Dpulseaudio&vi=
ew=3Drev
Log:
include ffmpeg resampler in build

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=3D1718&root=3Dpulseaudio&r1=3D1717&r2=3D1718&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 Sun Aug 26 00:27:24 2007
@@ -559,13 +559,16 @@
 #      Speex Resampler            #
 ###################################
 =

-noinst_LTLIBRARIES =3D libspeex-resampler-fixed.la libspeex-resampler-floa=
t.la
+noinst_LTLIBRARIES =3D libspeex-resampler-fixed.la libspeex-resampler-floa=
t.la libffmpeg-resampler.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
+
+libffmpeg_resampler_la_CPPFLAGS =3D $(AM_CPPFLAGS) =

+libffmpeg_resampler_la_SOURCES =3D pulsecore/ffmpeg/resample2.c
 =

 ###################################
 #      Daemon core library        #
@@ -712,7 +715,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) libspeex-resam=
pler-fixed.la libspeex-resampler-float.la
+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 libffmpeg-resampler.la
 =

 ###################################
 #   Plug-in support libraries     #
@@ -1403,4 +1406,7 @@
 	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
 =

+update-ffmpeg:
+	wget -O pulsecore/ffmpeg/resample2.c http://svn.mplayerhq.hu/ffmpeg/trunk=
/libavcodec/resample2.c?view=3Dco
+
 .PHONY: utils/padsp