make libpulse-core a noinst lib, because it does not have yet a stable API and won...

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 097b0831582c7f7d9490665398cb4cc316198894..18e06ce643c4a063ba58b7ead8ef413729b64fed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -559,7 +559,7 @@ libpulsedsp_la_LDFLAGS = -avoid-version
 #      Speex Resampler            #
 ###################################
 
-noinst_LTLIBRARIES = libspeex-resampler-fixed.la libspeex-resampler-float.la
+noinst_LTLIBRARIES = libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
 
 libspeex_resampler_fixed_la_CPPFLAGS = $(AM_CPPFLAGS) -DRANDOM_PREFIX=paspfx -DOUTSIDE_SPEEX -DFIXED_POINT
 libspeex_resampler_fixed_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex/speex_resampler.h pulsecore/speex/arch.h pulsecore/speex/fixed_generic.h
@@ -567,12 +567,15 @@ libspeex_resampler_fixed_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex
 libspeex_resampler_float_la_CPPFLAGS = $(AM_CPPFLAGS) -DRANDOM_PREFIX=paspfl -DOUTSIDE_SPEEX 
 libspeex_resampler_float_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex/speex_resampler.h pulsecore/speex/arch.h
 
+libffmpeg_resampler_la_CPPFLAGS = $(AM_CPPFLAGS) 
+libffmpeg_resampler_la_SOURCES = pulsecore/ffmpeg/resample2.c
+
 ###################################
 #      Daemon core library        #
 ###################################
 
-
-pulsecoreinclude_HEADERS = \
+#pulsecoreinclude_HEADERS =
+noinst_HEADERS = \
                pulsecore/autoload.h \
                pulsecore/atomic.h \
                pulsecore/cli-command.h \
@@ -624,7 +627,7 @@ pulsecoreinclude_HEADERS = \
                pulsecore/semaphore.h \
                pulsecore/once.h
 
-lib_LTLIBRARIES += libpulsecore.la
+noinst_LTLIBRARIES += libpulsecore.la
 
 # Some public stuff is used even in the core
 libpulsecore_la_SOURCES = \
@@ -712,13 +715,14 @@ endif
 
 libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
 libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la
+libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
 
 ###################################
 #   Plug-in support libraries     #
 ###################################
 
-pulsecoreinclude_HEADERS += \
+#pulsecoreinclude_HEADERS +=
+noinst_HEADERS += \
                pulsecore/socket-util.h \
                pulsecore/iochannel.h \
                pulsecore/socket-server.h \
@@ -778,7 +782,8 @@ modlibexec_LTLIBRARIES += \
 endif
 
 if HAVE_X11
-pulsecoreinclude_HEADERS += \
+#pulsecoreinclude_HEADERS +=
+noinst_HEADERS += \
                pulsecore/x11wrap.h \
                pulsecore/x11prop.h
 
@@ -788,7 +793,8 @@ modlibexec_LTLIBRARIES += \
 endif
 
 if HAVE_AVAHI
-pulsecoreinclude_HEADERS += \
+#pulsecoreinclude_HEADERS +=
+noinst_HEADERS += \
                pulsecore/avahi-wrap.h
 
 modlibexec_LTLIBRARIES += \
@@ -927,8 +933,8 @@ modlibexec_LTLIBRARIES += \
                module-sine.la \
                module-native-protocol-tcp.la \
                module-native-protocol-fd.la \
-               module-esound-protocol-tcp.la
-#              module-combine.la \
+               module-esound-protocol-tcp.la \
+               module-combine.la
 #              module-tunnel-sink.la \
 #              module-tunnel-source.la \
 #              module-esound-sink.la
@@ -1189,9 +1195,9 @@ module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 # Couplings
 
-#module_combine_la_SOURCES = modules/module-combine.c
-#module_combine_la_LDFLAGS = -module -avoid-version
-#module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+module_combine_la_SOURCES = modules/module-combine.c
+module_combine_la_LDFLAGS = -module -avoid-version
+module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = -module -avoid-version
@@ -1309,15 +1315,15 @@ module_suspend_on_idle_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
 
 # RTP modules
-module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
-module_rtp_send_la_LDFLAGS = -module -avoid-version
-module_rtp_send_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
-module_rtp_send_la_CFLAGS = $(AM_CFLAGS)
+#module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
+#module_rtp_send_la_LDFLAGS = -module -avoid-version
+#module_rtp_send_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
+#module_rtp_send_la_CFLAGS = $(AM_CFLAGS)
 
-module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c
-module_rtp_recv_la_LDFLAGS = -module -avoid-version
-module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
-module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
+#module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c
+#module_rtp_recv_la_LDFLAGS = -module -avoid-version
+#module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
+#module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
 
 # JACK
 
@@ -1403,4 +1409,7 @@ update-speex:
        wget -O pulsecore/speex/arch.h http://svn.xiph.org/trunk/speex/libspeex/arch.h
        wget -O pulsecore/speex/fixed_generic.h http://svn.xiph.org/trunk/speex/libspeex/fixed_generic.h
 
+update-ffmpeg:
+       wget -O pulsecore/ffmpeg/resample2.c http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/resample2.c?view=co
+
 .PHONY: utils/padsp