X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/98bde37a513bf655a3f2868880c941a19509987d..d1ce4c0aea23af9d3007cb91e3a5c76ff67bc7cc:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index f67b2f68..b07c60a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,30 +19,22 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -SUBDIRS = pulsecore pulse daemon modules utils tests - ################################### # Extra directories # ################################### pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore -pulseconfdir=$(sysconfdir)/pulse pulselibexecdir=$(libexecdir)/pulse +if HAVE_X11 xdgautostartdir=$(sysconfdir)/xdg/autostart +endif +if HAVE_ALSA alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths +endif +if HAVE_DBUS dbuspolicydir=$(sysconfdir)/dbus-1/system.d - -################################### -# Defines # -################################### - -PA_BINARY=$(bindir)/pulseaudio$(EXEEXT) -if OS_IS_WIN32 -PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% -else -PA_DEFAULT_CONFIG_DIR=$(pulseconfdir) endif ################################### @@ -51,45 +43,13 @@ endif AM_CFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ -I$(top_srcdir)/src/modules \ -I$(top_builddir)/src/modules \ - -I$(top_srcdir)/src/modules/rtp \ - -I$(top_builddir)/src/modules/rtp \ - -I$(top_srcdir)/src/modules/gconf \ - -I$(top_builddir)/src/modules/gconf \ - -I$(top_srcdir)/src/modules/bluetooth \ - -I$(top_builddir)/src/modules/bluetooth \ - -I$(top_srcdir)/src/modules/oss \ - -I$(top_builddir)/src/modules/oss \ - -I$(top_srcdir)/src/modules/alsa \ - -I$(top_builddir)/src/modules/alsa \ - -I$(top_srcdir)/src/modules/raop \ - -I$(top_builddir)/src/modules/raop \ - -I$(top_srcdir)/src/modules/x11 \ - -I$(top_builddir)/src/modules/x11 \ - -I$(top_srcdir)/src/modules/jack \ - -I$(top_builddir)/src/modules/jack \ - -I$(top_srcdir)/src/modules/dbus \ - -I$(top_builddir)/src/modules/dbus \ - -I$(top_srcdir)/src/modules/echo-cancel \ - -I$(top_builddir)/src/modules/echo-cancel \ - $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ - $(LIBSAMPLERATE_CFLAGS) \ - $(LIBSNDFILE_CFLAGS) \ - $(LIBSPEEX_CFLAGS) \ - -DPA_BUILDDIR=\"$(abs_builddir)\" \ - -DPA_DLSEARCHPATH=\"$(modlibexecdir)\" \ - -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \ - -DPA_BINARY=\"$(PA_BINARY)\" \ - -DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\" \ - -DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\" \ - -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \ - -DAO_REQUIRE_CAS \ - -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \ - -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \ - -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ - -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" + $(PTHREAD_CFLAGS) \ + -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ + -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" +AM_CXXFLAGS = $(AM_CFLAGS) +SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) @@ -100,12 +60,17 @@ BINLDFLAGS = -static endif if OS_IS_WIN32 -AM_LDFLAGS+=-Wl,--export-all-symbols +AM_LDFLAGS+=-Wl,--export-all-symbols,--enable-auto-import -no-undefined WINSOCK_LIBS=-lwsock32 -lws2_32 -lwininet endif +if OS_IS_DARWIN +AM_LDFLAGS+=-Wl,-headerpad_max_install_names -headerpad_max_install_names +endif + FOREIGN_CFLAGS = -w -MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) + +MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(NOUNDEFINED_LDFLAGS) MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la ################################### @@ -118,12 +83,11 @@ EXTRA_DIST = \ daemon/daemon.conf.in \ daemon/default.pa.in \ daemon/system.pa.in \ - daemon/default.pa.win32 \ depmod.py \ daemon/esdcompat.in \ daemon/start-pulseaudio-x11.in \ daemon/start-pulseaudio-kde.in \ - utils/padsp \ + utils/padsp.in \ utils/qpaeq \ modules/module-defs.h.m4 \ daemon/pulseaudio.desktop.in \ @@ -138,20 +102,28 @@ pulseconf_DATA = \ daemon.conf \ client.conf +if HAVE_DBUS dbuspolicy_DATA = \ daemon/pulseaudio-system.conf +endif if HAVE_X11 xdgautostart_in_files = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in -endif xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +endif -BUILT_SOURCES = \ - pulse/version.h +################################### +# Includes # +################################### + +BUILT_SOURCES = +CLEANFILES = +include $(top_srcdir)/orc.mak +ORC_SOURCE = ################################### # Main daemon # @@ -168,8 +140,8 @@ pulseaudio_SOURCES = \ daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \ daemon/main.c -pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) -pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) +pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS) +pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(LIBLTDL) $(CAP_LIBS) # This is needed because automake doesn't properly expand the foreach below pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(PREOPEN_LIBS) @@ -195,10 +167,15 @@ endif # Utility programs # ################################### +bin_SCRIPTS = esdcompat + bin_PROGRAMS += \ pacat \ - pactl \ - pasuspender + pactl + +if !OS_IS_WIN32 +bin_PROGRAMS += pasuspender +endif if HAVE_AF_UNIX bin_PROGRAMS += pacmd @@ -206,14 +183,9 @@ endif if HAVE_X11 bin_PROGRAMS += pax11publish +bin_SCRIPTS += start-pulseaudio-x11 start-pulseaudio-kde endif -if HAVE_AVAHI -bin_PROGRAMS += pabrowse -endif - -bin_SCRIPTS = esdcompat start-pulseaudio-x11 start-pulseaudio-kde - pacat_SOURCES = utils/pacat.c pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS) pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) @@ -239,27 +211,19 @@ pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) pax11publish_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(X11_LIBS) pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pabrowse_SOURCES = utils/pabrowse.c -pabrowse_LDADD = $(AM_LDADD) libpulse.la libpulse-browse.la libpulsecommon-@PA_MAJORMINOR@.la -pabrowse_CFLAGS = $(AM_CFLAGS) -pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) - ################################### # Test programs # ################################### -# missing: mcalign-test flist-test pacat-simple parec-simple sync-playback rtstutter stripnul interpol-test thread-test - -TESTS = \ +TESTS_default = \ mainloop-test \ strlist-test \ close-test \ - voltest \ - vector-test \ memblockq-test \ channelmap-test \ thread-mainloop-test \ utf8-test \ + format-test \ get-binary-name-test \ ipacl-test \ hook-list-test \ @@ -268,94 +232,76 @@ TESTS = \ asyncmsgq-test \ queue-test \ rtpoll-test \ - sig2str-test \ resampler-test \ smoother-test \ + thread-test \ + volume-test \ mix-test \ - remix-test \ - envelope-test \ proplist-test \ - lock-autospawn-test \ - prioq-test \ - sigbus-test \ - usergroup-test + lock-autospawn-test -TESTS_BINARIES = \ - mainloop-test \ +TESTS_norun = \ mcalign-test \ pacat-simple \ parec-simple \ - strlist-test \ - close-test \ - voltest \ - vector-test \ - memblockq-test \ - sync-playback \ - interpol-test \ - channelmap-test \ - thread-mainloop-test \ - utf8-test \ - get-binary-name-test \ - ipacl-test \ - hook-list-test \ - memblock-test \ - thread-test \ flist-test \ - asyncq-test \ - asyncmsgq-test \ - queue-test \ - rtpoll-test \ - sig2str-test \ - resampler-test \ - smoother-test \ - mix-test \ remix-test \ - envelope-test \ - proplist-test \ rtstutter \ + sig2str-test \ stripnul \ - lock-autospawn-test \ - prioq-test \ + echo-cancel-test + +# These tests need a running pulseaudio daemon +TESTS_daemon = \ + connect-stress \ + extended-test \ + interpol-test \ + sync-playback + +if !OS_IS_WIN32 +TESTS_default += \ sigbus-test \ usergroup-test +endif + +if !OS_IS_DARWIN +TESTS_default += \ + once-test +endif if HAVE_SIGXCPU -#TESTS += \ -# cpulimit-test \ -# cpulimit-test2 -TESTS_BINARIES += \ +TESTS_norun += \ cpulimit-test \ cpulimit-test2 endif if HAVE_GLIB20 -TESTS += \ - mainloop-test-glib -TESTS_BINARIES += \ +TESTS_default += \ mainloop-test-glib endif if HAVE_GTK20 -TESTS_BINARIES += \ +TESTS_norun += \ gtk-test endif if HAVE_ALSA -TESTS_BINARIES += \ +TESTS_norun += \ alsa-time-test endif -if !OS_IS_DARWIN -TESTS_BINARIES += \ - once-test -endif +TESTS_ENVIRONMENT=MAKE_CHECK=1 +TESTS = $(TESTS_default) if BUILD_TESTS_DEFAULT -noinst_PROGRAMS = $(TESTS_BINARIES) +noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) else -check_PROGRAMS = $(TESTS_BINARIES) +check_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) endif +check-daemon: + $(MAKE) check TESTS="$(TESTS_daemon)" + mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la @@ -368,9 +314,14 @@ thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) utf8_test_SOURCES = tests/utf8-test.c utf8_test_CFLAGS = $(AM_CFLAGS) -utf8_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +utf8_test_LDADD = $(AM_LDADD) libpulse.la utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +format_test_SOURCES = tests/format-test.c +format_test_CFLAGS = $(AM_CFLAGS) +format_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +format_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + get_binary_name_test_SOURCES = tests/get-binary-name-test.c get_binary_name_test_CFLAGS = $(AM_CFLAGS) get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la @@ -432,15 +383,20 @@ mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINOR@.la mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pacat_simple_SOURCES = tests/pacat-simple.c -pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la libpulsecommon-@PA_MAJORMINOR@.la +pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la pacat_simple_CFLAGS = $(AM_CFLAGS) pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) parec_simple_SOURCES = tests/parec-simple.c -parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la libpulsecommon-@PA_MAJORMINOR@.la +parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la parec_simple_CFLAGS = $(AM_CFLAGS) parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +extended_test_SOURCES = tests/extended-test.c +extended_test_LDADD = $(AM_LDADD) libpulse.la +extended_test_CFLAGS = $(AM_CFLAGS) +extended_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + strlist_test_SOURCES = tests/strlist-test.c strlist_test_CFLAGS = $(AM_CFLAGS) strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la @@ -451,19 +407,14 @@ close_test_CFLAGS = $(AM_CFLAGS) close_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la close_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -voltest_SOURCES = tests/voltest.c -voltest_CFLAGS = $(AM_CFLAGS) -voltest_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) - -vector_test_SOURCES = tests/vector-test.c -vector_test_CFLAGS = $(AM_CFLAGS) -vector_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -vector_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +volume_test_SOURCES = tests/volume-test.c +volume_test_CFLAGS = $(AM_CFLAGS) +volume_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +volume_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) channelmap_test_SOURCES = tests/channelmap-test.c channelmap_test_CFLAGS = $(AM_CFLAGS) -channelmap_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +channelmap_test_LDADD = $(AM_LDADD) libpulse.la channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h @@ -487,12 +438,12 @@ memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINOR@. memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) sync_playback_SOURCES = tests/sync-playback.c -sync_playback_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +sync_playback_LDADD = $(AM_LDADD) libpulse.la sync_playback_CFLAGS = $(AM_CFLAGS) sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) interpol_test_SOURCES = tests/interpol-test.c -interpol_test_LDADD = $(AM_LDADD) libpulse.la libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +interpol_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la interpol_test_CFLAGS = $(AM_CFLAGS) interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) @@ -521,11 +472,6 @@ smoother_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la li smoother_test_CFLAGS = $(AM_CFLAGS) smoother_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -envelope_test_SOURCES = tests/envelope-test.c -envelope_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -envelope_test_CFLAGS = $(AM_CFLAGS) -envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) - proplist_test_SOURCES = tests/proplist-test.c proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la proplist_test_CFLAGS = $(AM_CFLAGS) @@ -546,41 +492,49 @@ lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse lock_autospawn_test_CFLAGS = $(AM_CFLAGS) lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -prioq_test_SOURCES = tests/prioq-test.c -prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -prioq_test_CFLAGS = $(AM_CFLAGS) -prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) - sigbus_test_SOURCES = tests/sigbus-test.c sigbus_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la sigbus_test_CFLAGS = $(AM_CFLAGS) sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) gtk_test_SOURCES = tests/gtk-test.c -gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +gtk_test_LDADD = $(AM_LDADD) $(GTK20_LIBS) libpulse-mainloop-glib.la libpulse.la gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) -gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(GTK20_LIBS) +gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) alsa_time_test_SOURCES = tests/alsa-time-test.c -alsa_time_test_LDADD = $(AM_LDADD) +alsa_time_test_LDADD = $(AM_LDADD) $(ASOUNDLIB_LIBS) alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(ASOUNDLIB_LIBS) +alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) usergroup_test_SOURCES = tests/usergroup-test.c usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la usergroup_test_CFLAGS = $(AM_CFLAGS) usergroup_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +connect_stress_SOURCES = tests/connect-stress.c +connect_stress_LDADD = $(AM_LDADD) libpulse.la +connect_stress_CFLAGS = $(AM_CFLAGS) +connect_stress_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + +echo_cancel_test_SOURCES = $(module_echo_cancel_la_SOURCES) +nodist_echo_cancel_test_SOURCES = $(nodist_module_echo_cancel_la_SOURCES) +echo_cancel_test_LDADD = $(module_echo_cancel_la_LIBADD) +echo_cancel_test_CFLAGS = $(module_echo_cancel_la_CFLAGS) -DECHO_CANCEL_TEST=1 +if HAVE_WEBRTC +echo_cancel_test_CXXFLAGS = $(module_echo_cancel_la_CXXFLAGS) -DECHO_CANCEL_TEST=1 +endif +echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + ################################### # Common library # ################################### -lib_LTLIBRARIES = \ +pkglib_LTLIBRARIES = \ libpulsecommon-@PA_MAJORMINOR@.la libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulse/client-conf.c pulse/client-conf.h \ - pulse/i18n.c pulse/i18n.h \ pulse/fork-detect.c pulse/fork-detect.h \ pulsecore/atomic.h \ pulsecore/authkey.c pulsecore/authkey.h \ @@ -593,17 +547,17 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/endianmacros.h \ pulsecore/flist.c pulsecore/flist.h \ pulsecore/hashmap.c pulsecore/hashmap.h \ + pulsecore/i18n.c pulsecore/i18n.h \ pulsecore/idxset.c pulsecore/idxset.h \ - pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ - pulsecore/inet_pton.c pulsecore/inet_pton.h \ + pulsecore/arpa-inet.c pulsecore/arpa-inet.h \ pulsecore/iochannel.c pulsecore/iochannel.h \ pulsecore/ioline.c pulsecore/ioline.h \ - pulsecore/ipacl.h pulsecore/ipacl.c \ + pulsecore/ipacl.c pulsecore/ipacl.h \ pulsecore/llist.h \ pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \ pulsecore/log.c pulsecore/log.h \ pulsecore/ratelimit.c pulsecore/ratelimit.h \ - pulsecore/macro.h pulsecore/vector.h \ + pulsecore/macro.h \ pulsecore/mcalign.c pulsecore/mcalign.h \ pulsecore/memblock.c pulsecore/memblock.h \ pulsecore/memblockq.c pulsecore/memblockq.h \ @@ -616,7 +570,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/pid.c pulsecore/pid.h \ pulsecore/pipe.c pulsecore/pipe.h \ pulsecore/poll.c pulsecore/poll.h \ - pulsecore/prioq.c pulsecore/prioq.h \ pulsecore/memtrap.c pulsecore/memtrap.h \ pulsecore/aupdate.c pulsecore/aupdate.h \ pulsecore/proplist-util.c pulsecore/proplist-util.h \ @@ -637,14 +590,16 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/tokenizer.c pulsecore/tokenizer.h \ pulsecore/usergroup.c pulsecore/usergroup.h \ pulsecore/sndfile-util.c pulsecore/sndfile-util.h \ - pulsecore/winsock.h + pulsecore/socket.h -libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) +libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS) if HAVE_X11 -libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulse/client-conf-x11.c pulse/client-conf-x11.h +libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \ + pulse/client-conf-x11.c pulse/client-conf-x11.h \ + pulsecore/x11prop.c pulsecore/x11prop.h libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS) endif @@ -678,12 +633,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \ endif !OS_IS_DARWIN endif !OS_IS_WIN32 -if HAVE_X11 -libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulsecore/x11prop.c pulsecore/x11prop.h -libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS) -libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS) -endif - if HAVE_LIBASYNCNS libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS) @@ -712,7 +661,9 @@ pulseinclude_HEADERS = \ pulse/def.h \ pulse/error.h \ pulse/ext-device-manager.h \ + pulse/ext-device-restore.h \ pulse/ext-stream-restore.h \ + pulse/format.h \ pulse/gccmacro.h \ pulse/introspect.h \ pulse/mainloop-api.h \ @@ -735,18 +686,10 @@ pulseinclude_HEADERS = \ pulse/volume.h \ pulse/xmalloc.h -lib_LTLIBRARIES += \ +lib_LTLIBRARIES = \ libpulse.la \ libpulse-simple.la -if HAVE_AVAHI -pulseinclude_HEADERS += \ - pulse/browser.h - -lib_LTLIBRARIES += \ - libpulse-browse.la -endif - if HAVE_GLIB20 pulseinclude_HEADERS += \ pulse/glib-mainloop.h @@ -763,7 +706,9 @@ libpulse_la_SOURCES = \ pulse/def.h \ pulse/error.c pulse/error.h \ pulse/ext-device-manager.c pulse/ext-device-manager.h \ + pulse/ext-device-restore.c pulse/ext-device-restore.h \ pulse/ext-stream-restore.c pulse/ext-stream-restore.h \ + pulse/format.c pulse/format.h \ pulse/gccmacro.h \ pulse/internal.h \ pulse/introspect.c pulse/introspect.h \ @@ -785,20 +730,20 @@ libpulse_la_SOURCES = \ pulse/volume.c pulse/volume.h \ pulse/xmalloc.c pulse/xmalloc.h -libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la +libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) +libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO) +if HAVE_DBUS +libpulse_la_CFLAGS += $(DBUS_CFLAGS) +libpulse_la_LIBADD += $(DBUS_LIBS) +endif + libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h libpulse_simple_la_CFLAGS = $(AM_CFLAGS) libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO) -libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h pulsecore/avahi-wrap.c pulsecore/avahi-wrap.h -libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) -libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(AVAHI_LIBS) -libpulse_browse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_BROWSE_VERSION_INFO) - libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(GLIB20_LIBS) @@ -809,8 +754,18 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version ################################### if HAVE_OSS_WRAPPER -lib_LTLIBRARIES += libpulsedsp.la -bin_SCRIPTS += utils/padsp +padsplibdir = $(pkglibdir) +padsplib_LTLIBRARIES = libpulsedsp.la +bin_SCRIPTS += padsp + +edit = @SED@ \ + -e "s|@pkglibdir[@]|$(pkglibdir)|g" + +padsp: utils/padsp.in + $(edit) $< > $@ + +CLEANFILES += padsp + endif libpulsedsp_la_SOURCES = utils/padsp.c @@ -836,7 +791,6 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/core-scache.c pulsecore/core-scache.h \ pulsecore/core-subscribe.c pulsecore/core-subscribe.h \ pulsecore/core.c pulsecore/core.h \ - pulsecore/envelope.c pulsecore/envelope.h \ pulsecore/fdsem.c pulsecore/fdsem.h \ pulsecore/g711.c pulsecore/g711.h \ pulsecore/hook-list.c pulsecore/hook-list.h \ @@ -857,6 +811,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/cpu.h \ pulsecore/cpu-arm.c pulsecore/cpu-arm.h \ pulsecore/cpu-x86.c pulsecore/cpu-x86.h \ + pulsecore/cpu-orc.c pulsecore/cpu-orc.h \ pulsecore/svolume_c.c pulsecore/svolume_arm.c \ pulsecore/svolume_mmx.c pulsecore/svolume_sse.c \ pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \ @@ -864,9 +819,9 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/sconv_sse.c \ pulsecore/sconv.c pulsecore/sconv.h \ pulsecore/shared.c pulsecore/shared.h \ - pulsecore/shm.c pulsecore/shm.h \ pulsecore/sink-input.c pulsecore/sink-input.h \ pulsecore/sink.c pulsecore/sink.h \ + pulsecore/device-port.c pulsecore/device-port.h \ pulsecore/sioman.c pulsecore/sioman.h \ pulsecore/sound-file-stream.c pulsecore/sound-file-stream.h \ pulsecore/sound-file.c pulsecore/sound-file.h \ @@ -874,12 +829,19 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/source.c pulsecore/source.h \ pulsecore/start-child.c pulsecore/start-child.h \ pulsecore/thread-mq.c pulsecore/thread-mq.h \ - pulsecore/time-smoother.c pulsecore/time-smoother.h \ pulsecore/database.h -libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS) -libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = -avoid-version -libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libpulsecore-foreign.la +libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) +libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version +libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libpulsecore-foreign.la + +if HAVE_ORC +ORC_SOURCE += pulsecore/svolume +libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c +nodist_libpulsecore_@PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h +libpulsecore_@PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS) +libpulsecore_@PA_MAJORMINOR@_la_LIBADD += $(ORC_LIBS) +endif if HAVE_X11 libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/x11wrap.c pulsecore/x11wrap.h @@ -933,8 +895,12 @@ modlibexec_LTLIBRARIES = \ libprotocol-cli.la \ libprotocol-simple.la \ libprotocol-http.la \ - libprotocol-native.la \ + libprotocol-native.la + +if HAVE_ESOUND +modlibexec_LTLIBRARIES += \ libprotocol-esound.la +endif # We need to emulate sendmsg/recvmsg to support this on Win32 if !OS_IS_WIN32 @@ -948,28 +914,35 @@ modlibexec_LTLIBRARIES += \ endif libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h -libprotocol_simple_la_LDFLAGS = -avoid-version +libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libcli_la_SOURCES = pulsecore/cli.c pulsecore/cli.h -libcli_la_LDFLAGS = -avoid-version +libcli_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libcli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h -libprotocol_cli_la_LDFLAGS = -avoid-version +libprotocol_cli_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libcli.la libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h pulsecore/mime-type.c pulsecore/mime-type.h -libprotocol_http_la_LDFLAGS = -avoid-version +libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h -libprotocol_native_la_LDFLAGS = -avoid-version +libprotocol_native_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) +libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_native_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la +if HAVE_DBUS +libprotocol_native_la_CFLAGS += $(DBUS_CFLAGS) +libprotocol_native_la_LIBADD += $(DBUS_LIBS) +endif +if HAVE_ESOUND libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h -libprotocol_esound_la_LDFLAGS = -avoid-version +libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la +endif librtp_la_SOURCES = \ modules/rtp/rtp.c modules/rtp/rtp.h \ @@ -977,19 +950,19 @@ librtp_la_SOURCES = \ modules/rtp/sap.c modules/rtp/sap.h \ modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h \ modules/rtp/headerlist.c modules/rtp/headerlist.h -librtp_la_LDFLAGS = -avoid-version +librtp_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version librtp_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libraop_la_SOURCES = \ modules/raop/raop_client.c modules/raop/raop_client.h \ modules/raop/base64.c modules/raop/base64.h -libraop_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) -libraop_la_LDFLAGS = -avoid-version +libraop_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/modules/rtp +libraop_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libraop_la_LIBADD = $(AM_LIBADD) $(OPENSSL_LIBS) libpulsecore-@PA_MAJORMINOR@.la librtp.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la # Avahi libavahi_wrap_la_SOURCES = pulsecore/avahi-wrap.c pulsecore/avahi-wrap.h -libavahi_wrap_la_LDFLAGS = -avoid-version +libavahi_wrap_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libavahi_wrap_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la @@ -1008,6 +981,7 @@ modlibexec_LTLIBRARIES += \ module-cli-protocol-tcp.la \ module-simple-protocol-tcp.la \ module-null-sink.la \ + module-null-source.la \ module-sine-source.la \ module-detect.la \ module-volume-restore.la \ @@ -1025,19 +999,29 @@ modlibexec_LTLIBRARIES += \ module-sine.la \ module-native-protocol-tcp.la \ module-native-protocol-fd.la \ - module-esound-protocol-tcp.la \ module-combine.la \ + module-combine-sink.la \ module-remap-sink.la \ module-ladspa-sink.la \ - module-esound-sink.la \ module-tunnel-sink.la \ module-tunnel-source.la \ module-position-event-sounds.la \ module-augment-properties.la \ - module-cork-music-on-phone.la \ + module-role-cork.la \ module-loopback.la \ module-virtual-sink.la \ - module-virtual-source.la + module-virtual-source.la \ + module-virtual-surround-sink.la \ + module-switch-on-connect.la \ + module-switch-on-port-available.la \ + module-filter-apply.la \ + module-filter-heuristics.la + +if HAVE_ESOUND +modlibexec_LTLIBRARIES += \ + module-esound-protocol-tcp.la \ + module-esound-sink.la +endif # See comment at librtp.la above if !OS_IS_WIN32 @@ -1051,9 +1035,12 @@ modlibexec_LTLIBRARIES += \ module-cli-protocol-unix.la \ module-simple-protocol-unix.la \ module-http-protocol-unix.la \ - module-native-protocol-unix.la \ + module-native-protocol-unix.la +if HAVE_ESOUND +modlibexec_LTLIBRARIES += \ module-esound-protocol-unix.la endif +endif if HAVE_MKFIFO modlibexec_LTLIBRARIES += \ @@ -1062,10 +1049,12 @@ modlibexec_LTLIBRARIES += \ endif if !OS_IS_WIN32 +if HAVE_ESOUND modlibexec_LTLIBRARIES += \ module-esound-compat-spawnfd.la \ module-esound-compat-spawnpid.la endif +endif if HAVE_REGEX modlibexec_LTLIBRARIES += \ @@ -1103,11 +1092,15 @@ modlibexec_LTLIBRARIES += \ dist_alsaprofilesets_DATA = \ modules/alsa/mixer/profile-sets/default.conf \ + modules/alsa/mixer/profile-sets/extra-hdmi.conf \ modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \ modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf \ + modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf \ modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ - modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf + modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ + modules/alsa/mixer/profile-sets/kinect-audio.conf if HAVE_UDEV dist_udevrules_DATA = \ @@ -1119,9 +1112,12 @@ dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-input.conf \ modules/alsa/mixer/paths/analog-input.conf.common \ modules/alsa/mixer/paths/analog-input-fm.conf \ - modules/alsa/mixer/paths/analog-input-internal-mic.conf \ modules/alsa/mixer/paths/analog-input-linein.conf \ modules/alsa/mixer/paths/analog-input-mic.conf \ + modules/alsa/mixer/paths/analog-input-dock-mic.conf \ + modules/alsa/mixer/paths/analog-input-front-mic.conf \ + modules/alsa/mixer/paths/analog-input-internal-mic.conf \ + modules/alsa/mixer/paths/analog-input-rear-mic.conf \ modules/alsa/mixer/paths/analog-input-mic.conf.common \ modules/alsa/mixer/paths/analog-input-mic-line.conf \ modules/alsa/mixer/paths/analog-input-tvtuner.conf \ @@ -1135,7 +1131,10 @@ dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ modules/alsa/mixer/paths/analog-output-mono.conf \ modules/alsa/mixer/paths/iec958-stereo-output.conf \ - modules/alsa/mixer/paths/iec958-passthrough-output.conf + modules/alsa/mixer/paths/hdmi-output-0.conf \ + modules/alsa/mixer/paths/hdmi-output-1.conf \ + modules/alsa/mixer/paths/hdmi-output-2.conf \ + modules/alsa/mixer/paths/hdmi-output-3.conf endif @@ -1185,10 +1184,10 @@ pulselibexec_PROGRAMS += \ gconf-helper endif -#if OS_IS_WIN32 -#modlibexec_LTLIBRARIES += \ -# module-waveout.la -#endif +if HAVE_WAVEOUT +modlibexec_LTLIBRARIES += \ + module-waveout.la +endif if HAVE_HAL modlibexec_LTLIBRARIES += \ @@ -1234,99 +1233,116 @@ modlibexec_LTLIBRARIES += \ endif endif +if HAVE_DBUS if HAVE_FFTW modlibexec_LTLIBRARIES += \ module-equalizer-sink.la bin_SCRIPTS += utils/qpaeq endif +endif # These are generated by an M4 script SYMDEF_FILES = \ - modules/module-cli-symdef.h \ - modules/module-cli-protocol-tcp-symdef.h \ - modules/module-cli-protocol-unix-symdef.h \ - modules/module-pipe-sink-symdef.h \ - modules/module-pipe-source-symdef.h \ - modules/module-simple-protocol-tcp-symdef.h \ - modules/module-simple-protocol-unix-symdef.h \ - modules/module-esound-protocol-tcp-symdef.h \ - modules/module-esound-protocol-unix-symdef.h \ - modules/module-native-protocol-tcp-symdef.h \ - modules/module-native-protocol-unix-symdef.h \ - modules/module-native-protocol-fd-symdef.h \ - modules/module-sine-symdef.h \ - modules/module-combine-symdef.h \ - modules/module-remap-sink-symdef.h \ - modules/module-ladspa-sink-symdef.h \ - modules/module-equalizer-sink-symdef.h \ - modules/module-esound-compat-spawnfd-symdef.h \ - modules/module-esound-compat-spawnpid-symdef.h \ - modules/module-match-symdef.h \ - modules/module-tunnel-sink-symdef.h \ - modules/module-tunnel-source-symdef.h \ - modules/module-null-sink-symdef.h \ - modules/module-sine-source-symdef.h \ - modules/module-esound-sink-symdef.h \ - modules/module-zeroconf-publish-symdef.h \ - modules/module-zeroconf-discover-symdef.h \ - modules/module-bonjour-publish-symdef.h \ - modules/module-lirc-symdef.h \ - modules/module-mmkbd-evdev-symdef.h \ - modules/module-http-protocol-tcp-symdef.h \ - modules/module-http-protocol-unix-symdef.h \ - modules/module-rygel-media-server-symdef.h \ - modules/x11/module-x11-bell-symdef.h \ - modules/x11/module-x11-publish-symdef.h \ - modules/x11/module-x11-xsmp-symdef.h \ - modules/x11/module-x11-cork-request-symdef.h \ - modules/oss/module-oss-symdef.h \ - modules/alsa/module-alsa-sink-symdef.h \ - modules/alsa/module-alsa-source-symdef.h \ - modules/alsa/module-alsa-card-symdef.h \ - modules/coreaudio/module-coreaudio-detect-symdef.h \ - modules/coreaudio/module-coreaudio-device-symdef.h \ - modules/module-solaris-symdef.h \ - modules/module-waveout-symdef.h \ - modules/module-detect-symdef.h \ - modules/rtp/module-rtp-send-symdef.h \ - modules/rtp/module-rtp-recv-symdef.h \ - modules/jack/module-jackdbus-detect-symdef.h \ - modules/jack/module-jack-sink-symdef.h \ - modules/jack/module-jack-source-symdef.h \ - modules/module-volume-restore-symdef.h \ - modules/module-device-manager-symdef.h \ - modules/module-device-restore-symdef.h \ - modules/module-stream-restore-symdef.h \ - modules/module-card-restore-symdef.h \ - modules/module-default-device-restore-symdef.h \ - modules/module-always-sink-symdef.h \ - modules/module-rescue-streams-symdef.h \ - modules/module-intended-roles-symdef.h \ - modules/module-suspend-on-idle-symdef.h \ - modules/echo-cancel/module-echo-cancel-symdef.h \ - modules/module-hal-detect-symdef.h \ - modules/module-udev-detect-symdef.h \ - modules/bluetooth/module-bluetooth-proximity-symdef.h \ - modules/bluetooth/module-bluetooth-discover-symdef.h \ - modules/bluetooth/module-bluetooth-device-symdef.h \ - modules/raop/module-raop-sink-symdef.h \ - modules/raop/module-raop-discover-symdef.h \ - modules/gconf/module-gconf-symdef.h \ - modules/module-position-event-sounds-symdef.h \ - modules/module-augment-properties-symdef.h \ - modules/module-cork-music-on-phone-symdef.h \ - modules/module-console-kit-symdef.h \ - modules/dbus/module-dbus-protocol-symdef.h \ - modules/module-loopback-symdef.h \ - modules/module-virtual-sink-symdef.h \ - modules/module-virtual-source-symdef.h + module-cli-symdef.h \ + module-cli-protocol-tcp-symdef.h \ + module-cli-protocol-unix-symdef.h \ + module-pipe-sink-symdef.h \ + module-pipe-source-symdef.h \ + module-simple-protocol-tcp-symdef.h \ + module-simple-protocol-unix-symdef.h \ + module-native-protocol-tcp-symdef.h \ + module-native-protocol-unix-symdef.h \ + module-native-protocol-fd-symdef.h \ + module-sine-symdef.h \ + module-combine-symdef.h \ + module-combine-sink-symdef.h \ + module-remap-sink-symdef.h \ + module-ladspa-sink-symdef.h \ + module-equalizer-sink-symdef.h \ + module-match-symdef.h \ + module-tunnel-sink-symdef.h \ + module-tunnel-source-symdef.h \ + module-null-sink-symdef.h \ + module-null-source-symdef.h \ + module-sine-source-symdef.h \ + module-zeroconf-publish-symdef.h \ + module-zeroconf-discover-symdef.h \ + module-bonjour-publish-symdef.h \ + module-lirc-symdef.h \ + module-mmkbd-evdev-symdef.h \ + module-http-protocol-tcp-symdef.h \ + module-http-protocol-unix-symdef.h \ + module-rygel-media-server-symdef.h \ + module-x11-bell-symdef.h \ + module-x11-publish-symdef.h \ + module-x11-xsmp-symdef.h \ + module-x11-cork-request-symdef.h \ + module-oss-symdef.h \ + module-alsa-sink-symdef.h \ + module-alsa-source-symdef.h \ + module-alsa-card-symdef.h \ + module-coreaudio-detect-symdef.h \ + module-coreaudio-device-symdef.h \ + module-solaris-symdef.h \ + module-waveout-symdef.h \ + module-detect-symdef.h \ + module-rtp-send-symdef.h \ + module-rtp-recv-symdef.h \ + module-jackdbus-detect-symdef.h \ + module-jack-sink-symdef.h \ + module-jack-source-symdef.h \ + module-volume-restore-symdef.h \ + module-device-manager-symdef.h \ + module-device-restore-symdef.h \ + module-stream-restore-symdef.h \ + module-card-restore-symdef.h \ + module-default-device-restore-symdef.h \ + module-always-sink-symdef.h \ + module-rescue-streams-symdef.h \ + module-intended-roles-symdef.h \ + module-suspend-on-idle-symdef.h \ + module-echo-cancel-symdef.h \ + module-hal-detect-symdef.h \ + module-udev-detect-symdef.h \ + module-bluetooth-proximity-symdef.h \ + module-bluetooth-discover-symdef.h \ + module-bluetooth-device-symdef.h \ + module-raop-sink-symdef.h \ + module-raop-discover-symdef.h \ + module-gconf-symdef.h \ + module-position-event-sounds-symdef.h \ + module-augment-properties-symdef.h \ + module-role-cork-symdef.h \ + module-console-kit-symdef.h \ + module-dbus-protocol-symdef.h \ + module-loopback-symdef.h \ + module-virtual-sink-symdef.h \ + module-virtual-source-symdef.h \ + module-virtual-surround-sink-symdef.h \ + module-switch-on-connect-symdef.h \ + module-switch-on-port-available-symdef.h \ + module-filter-apply-symdef.h \ + module-filter-heuristics-symdef.h + +if HAVE_ESOUND +SYMDEF_FILES += \ + module-esound-protocol-tcp-symdef.h \ + module-esound-protocol-unix-symdef.h \ + module-esound-compat-spawnfd-symdef.h \ + module-esound-compat-spawnpid-symdef.h \ + module-esound-sink-symdef.h +endif EXTRA_DIST += $(SYMDEF_FILES) -BUILT_SOURCES += $(SYMDEF_FILES) +BUILT_SOURCES += $(SYMDEF_FILES) builddirs $(SYMDEF_FILES): modules/module-defs.h.m4 - $(MKDIR_P) $(dir $@) - $(M4) -Dfname="$@" $< > $@ + $(AM_V_at)$(MKDIR_P) modules + $(AM_V_GEN)$(M4) -Dfname="$@" $< > $@ + +.PHONY: builddirs +builddirs: + $(AM_V_at)$(MKDIR_P) daemon modules # Simple protocol @@ -1405,6 +1421,7 @@ module_native_protocol_fd_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la # EsounD protocol +if HAVE_ESOUND module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS) module_esound_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1424,8 +1441,9 @@ module_esound_compat_spawnpid_la_LDFLAGS = $(MODULE_LDFLAGS) module_esound_compat_spawnpid_la_LIBADD = $(MODULE_LIBADD) module_esound_sink_la_SOURCES = modules/module-esound-sink.c -module_esound_sink_la_LDFLAGS = $(MODULE_LDFLAGS) +module_esound_sink_la_LDFLAGS = $(MODULE_LDFLAGS) $(WINSOCK_LIBS) module_esound_sink_la_LIBADD = $(MODULE_LIBADD) +endif # Pipes @@ -1447,8 +1465,12 @@ module_null_sink_la_SOURCES = modules/module-null-sink.c module_null_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_null_sink_la_LIBADD = $(MODULE_LIBADD) +module_null_source_la_SOURCES = modules/module-null-source.c +module_null_source_la_LDFLAGS = $(MODULE_LDFLAGS) +module_null_source_la_LIBADD = $(MODULE_LIBADD) + module_sine_source_la_SOURCES = modules/module-sine-source.c -module_sine_source_la_LDFLAGS = -module -avoid-version +module_sine_source_la_LDFLAGS = $(MODULE_LDFLAGS) module_sine_source_la_LIBADD = $(MODULE_LIBADD) # Couplings @@ -1457,6 +1479,26 @@ module_combine_la_SOURCES = modules/module-combine.c module_combine_la_LDFLAGS = $(MODULE_LDFLAGS) module_combine_la_LIBADD = $(MODULE_LIBADD) +module_combine_sink_la_SOURCES = modules/module-combine-sink.c +module_combine_sink_la_LDFLAGS = $(MODULE_LDFLAGS) +module_combine_sink_la_LIBADD = $(MODULE_LIBADD) + +module_switch_on_connect_la_SOURCES = modules/module-switch-on-connect.c +module_switch_on_connect_la_LDFLAGS = $(MODULE_LDFLAGS) +module_switch_on_connect_la_LIBADD = $(MODULE_LIBADD) + +module_switch_on_port_available_la_SOURCES = modules/module-switch-on-port-available.c +module_switch_on_port_available_la_LDFLAGS = $(MODULE_LDFLAGS) +module_switch_on_port_available_la_LIBADD = $(MODULE_LIBADD) + +module_filter_apply_la_SOURCES = modules/module-filter-apply.c +module_filter_apply_la_LDFLAGS = $(MODULE_LDFLAGS) +module_filter_apply_la_LIBADD = $(MODULE_LIBADD) + +module_filter_heuristics_la_SOURCES = modules/module-filter-heuristics.c +module_filter_heuristics_la_LDFLAGS = $(MODULE_LDFLAGS) +module_filter_heuristics_la_LIBADD = $(MODULE_LIBADD) + module_remap_sink_la_SOURCES = modules/module-remap-sink.c module_remap_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_remap_sink_la_LIBADD = $(MODULE_LIBADD) @@ -1467,7 +1509,7 @@ module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c -module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS) +module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS) module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_equalizer_sink_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS) @@ -1489,13 +1531,20 @@ module_loopback_la_LDFLAGS = $(MODULE_LDFLAGS) module_loopback_la_LIBADD = $(MODULE_LIBADD) module_virtual_sink_la_SOURCES = modules/module-virtual-sink.c +module_virtual_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) module_virtual_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_virtual_sink_la_LIBADD = $(MODULE_LIBADD) module_virtual_source_la_SOURCES = modules/module-virtual-source.c +module_virtual_source_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) module_virtual_source_la_LDFLAGS = $(MODULE_LDFLAGS) module_virtual_source_la_LIBADD = $(MODULE_LIBADD) +module_virtual_surround_sink_la_SOURCES = modules/module-virtual-surround-sink.c +module_virtual_surround_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) +module_virtual_surround_sink_la_LDFLAGS = $(MODULE_LDFLAGS) +module_virtual_surround_sink_la_LIBADD = $(MODULE_LIBADD) + # X11 module_x11_bell_la_SOURCES = modules/x11/module-x11-bell.c @@ -1530,24 +1579,29 @@ module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la # COREAUDIO -module_coreaudio_detect_la_SOURCES = modules/coreaudio/module-coreaudio-detect.c +module_coreaudio_detect_la_SOURCES = modules/macosx/module-coreaudio-detect.c module_coreaudio_detect_la_LDFLAGS = $(MODULE_LDFLAGS) \ - -Wl,-framework -Wl,Cocoa -framework CoreAudio \ - -Wl,-framework -Wl,AudioUnit -framework AudioUnit + -Wl,-framework -Wl,Cocoa -framework CoreAudio \ + -Wl,-framework -Wl,AudioUnit -framework AudioUnit module_coreaudio_detect_la_LIBADD = $(MODULE_LIBADD) -module_coreaudio_device_la_SOURCES = modules/coreaudio/module-coreaudio-device.c +module_coreaudio_device_la_SOURCES = modules/macosx/module-coreaudio-device.c module_coreaudio_device_la_LDFLAGS = $(MODULE_LDFLAGS) \ - -Wl,-framework -Wl,Cocoa -framework CoreAudio \ - -Wl,-framework -Wl,AudioUnit -framework AudioUnit + -Wl,-framework -Wl,Cocoa -framework CoreAudio \ + -Wl,-framework -Wl,AudioUnit -framework AudioUnit module_coreaudio_device_la_LIBADD = $(MODULE_LIBADD) # ALSA -libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h modules/alsa/alsa-mixer.c modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c modules/alsa/alsa-sink.h modules/alsa/alsa-source.c modules/alsa/alsa-source.h modules/reserve-wrap.c modules/reserve-wrap.h +libalsa_util_la_SOURCES = \ + modules/alsa/alsa-util.c modules/alsa/alsa-util.h \ + modules/alsa/alsa-mixer.c modules/alsa/alsa-mixer.h \ + modules/alsa/alsa-sink.c modules/alsa/alsa-sink.h \ + modules/alsa/alsa-source.c modules/alsa/alsa-source.h \ + modules/reserve-wrap.c modules/reserve-wrap.h libalsa_util_la_LDFLAGS = -avoid-version libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) -libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) +libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(ASOUNDLIB_CFLAGS) if HAVE_HAL libalsa_util_la_SOURCES += modules/hal-util.h modules/hal-util.c @@ -1602,10 +1656,10 @@ module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) # Bonjour -module_bonjour_publish_la_SOURCES = modules/module-bonjour-publish.c +module_bonjour_publish_la_SOURCES = modules/macosx/module-bonjour-publish.c module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \ -Wl,-framework -Wl,CoreFoundation -framework CoreFoundation -module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD) +module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la # LIRC @@ -1622,11 +1676,10 @@ module_mmkbd_evdev_la_LIBADD = $(MODULE_LIBADD) module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS) # Windows waveout - -#module_waveout_la_SOURCES = modules/module-waveout.c -#module_waveout_la_LDFLAGS = $(MODULE_LDFLAGS) -#module_waveout_la_LIBADD = $(MODULE_LIBADD) -lwinmm -#module_waveout_la_CFLAGS = $(AM_CFLAGS) +module_waveout_la_SOURCES = modules/module-waveout.c +module_waveout_la_LDFLAGS = $(MODULE_LDFLAGS) +module_waveout_la_LIBADD = $(MODULE_LIBADD) -lwinmm +module_waveout_la_CFLAGS = $(AM_CFLAGS) # Hardware autodetection module module_detect_la_SOURCES = modules/module-detect.c @@ -1653,11 +1706,11 @@ module_augment_properties_la_LIBADD = $(MODULE_LIBADD) #module_augment_properties_la_CFLAGS = $(AM_CFLAGS) -DDESKTOPFILEDIR=\"$(datadir)/applications\" module_augment_properties_la_CFLAGS = $(AM_CFLAGS) -DDESKTOPFILEDIR=\"/usr/share/applications\" -# Cork music streams while a phone stream is active -module_cork_music_on_phone_la_SOURCES = modules/module-cork-music-on-phone.c -module_cork_music_on_phone_la_LDFLAGS = $(MODULE_LDFLAGS) -module_cork_music_on_phone_la_LIBADD = $(MODULE_LIBADD) -module_cork_music_on_phone_la_CFLAGS = $(AM_CFLAGS) +# Cork certain streams while others are active (e.g. cork music when phone streams appear) +module_role_cork_la_SOURCES = modules/module-role-cork.c +module_role_cork_la_LDFLAGS = $(MODULE_LDFLAGS) +module_role_cork_la_LIBADD = $(MODULE_LIBADD) +module_role_cork_la_CFLAGS = $(AM_CFLAGS) # Device description restore module module_device_manager_la_SOURCES = modules/module-device-manager.c @@ -1668,9 +1721,14 @@ module_device_manager_la_CFLAGS = $(AM_CFLAGS) # Device volume/muted restore module module_device_restore_la_SOURCES = modules/module-device-restore.c module_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS) -module_device_restore_la_LIBADD = $(MODULE_LIBADD) +module_device_restore_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la module_device_restore_la_CFLAGS = $(AM_CFLAGS) +if HAVE_DBUS +module_device_restore_la_LIBADD += $(DBUS_LIBS) +module_device_restore_la_CFLAGS += $(DBUS_CFLAGS) +endif + # Stream volume/muted/device restore module module_stream_restore_la_SOURCES = modules/module-stream-restore.c module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1719,17 +1777,34 @@ module_suspend_on_idle_la_LIBADD = $(MODULE_LIBADD) module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS) # echo-cancel module -ORC_SOURCE=modules/echo-cancel/adrian-aec-orc -include $(top_srcdir)/build/orc.mak -module_echo_cancel_la_SOURCES = modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/echo-cancel.h \ - modules/echo-cancel/speex.c \ - modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ - modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h \ - $(ORC_SOURCE).orc -nodist_module_echo_cancel_la_SOURCES = $(ORC_NODIST_SOURCES) +module_echo_cancel_la_SOURCES = \ + modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/echo-cancel.h module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS) -module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) $(ORC_LIBS) -module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS) $(ORC_CFLAGS) +module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) +module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSPEEX_CFLAGS) +if HAVE_ADRIAN_EC +module_echo_cancel_la_SOURCES += \ + modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ + modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h +module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1 +if HAVE_ORC +ORC_SOURCE += modules/echo-cancel/adrian-aec +nodist_module_echo_cancel_la_SOURCES = \ + modules/echo-cancel/adrian-aec-orc-gen.c \ + modules/echo-cancel/adrian-aec-orc-gen.h +module_echo_cancel_la_LIBADD += $(ORC_LIBS) +module_echo_cancel_la_CFLAGS += $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel +endif +endif +if HAVE_SPEEX +module_echo_cancel_la_SOURCES += modules/echo-cancel/speex.c +endif +if HAVE_WEBRTC +module_echo_cancel_la_SOURCES += modules/echo-cancel/webrtc.cc +module_echo_cancel_la_CFLAGS += -DHAVE_WEBRTC=1 +module_echo_cancel_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1 +module_echo_cancel_la_LIBADD += $(WEBRTC_LIBS) +endif # RTP modules module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c @@ -1808,15 +1883,25 @@ module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS) module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -libbluetooth_sbc_la_SOURCES = modules/bluetooth/sbc.c modules/bluetooth/sbc.h modules/bluetooth/sbc_tables.h modules/bluetooth/sbc_math.h modules/bluetooth/sbc_primitives.h modules/bluetooth/sbc_primitives.c modules/bluetooth/sbc_primitives_mmx.h modules/bluetooth/sbc_primitives_neon.h modules/bluetooth/sbc_primitives_mmx.c modules/bluetooth/sbc_primitives_neon.c +libbluetooth_sbc_la_SOURCES = \ + modules/bluetooth/sbc/sbc.c modules/bluetooth/sbc/sbc.h \ + modules/bluetooth/sbc/sbc_primitives.c modules/bluetooth/sbc/sbc_primitives.h \ + modules/bluetooth/sbc/sbc_primitives_armv6.h modules/bluetooth/sbc/sbc_primitives_armv6.c \ + modules/bluetooth/sbc/sbc_primitives_iwmmxt.h modules/bluetooth/sbc/sbc_primitives_iwmmxt.c \ + modules/bluetooth/sbc/sbc_primitives_mmx.c modules/bluetooth/sbc/sbc_primitives_mmx.h \ + modules/bluetooth/sbc/sbc_primitives_neon.c modules/bluetooth/sbc/sbc_primitives_neon.h \ + modules/bluetooth/sbc/sbc_math.h \ + modules/bluetooth/sbc/sbc_tables.h libbluetooth_sbc_la_LDFLAGS = -avoid-version libbluetooth_sbc_la_LIBADD = $(MODULE_LIBADD) -libbluetooth_sbc_la_CFLAGS = $(AM_CFLAGS) +libbluetooth_sbc_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/modules/bluetooth/sbc BLUETOOTH_SBC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_sbc_la_SOURCES)) -libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h +libbluetooth_ipc_la_SOURCES = \ + modules/bluetooth/a2dp-codecs.h \ + modules/bluetooth/ipc.c modules/bluetooth/ipc.h libbluetooth_ipc_la_LDFLAGS = -avoid-version -libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la +libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h @@ -1828,12 +1913,13 @@ libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS) module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la libbluetooth-ipc.la libbluetooth-sbc.la -module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/modules/bluetooth/sbc # Apple Airtunes/RAOP module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c module_raop_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_raop_sink_la_LIBADD = $(MODULE_LIBADD) librtp.la libraop.la +module_raop_sink_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/modules/rtp module_raop_discover_la_SOURCES = modules/raop/module-raop-discover.c module_raop_discover_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1850,62 +1936,31 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) # Some minor stuff # ################################### -CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop - -esdcompat: daemon/esdcompat.in Makefile - sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ - -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ - -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@ - chmod +x esdcompat - -start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile - sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ - -e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@ - chmod +x start-pulseaudio-x11 - -start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile - sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ - -e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@ - chmod +x start-pulseaudio-kde - -client.conf: pulse/client.conf.in Makefile - sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@ +CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop +DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde if OS_IS_WIN32 -default.pa: daemon/default.pa.win32 - cp $< $@ -system.pa: daemon/default.pa.win32 - cp $< $@ +SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp else -default.pa: daemon/default.pa.in Makefile - sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ - -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \ - -e 's,@PA_SOEXT\@,.so,g' < $< > $@ -system.pa: daemon/system.pa.in Makefile - sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ - -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \ - -e 's,@PA_SOEXT\@,.so,g' < $< > $@ +SYMLINK_PROGRAM=ln -sf endif - -daemon.conf: daemon/daemon.conf.in Makefile - sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \ - -e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@ - install-exec-hook: +if HAVE_BLUEZ -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper - ln -sf pacat $(DESTDIR)$(bindir)/parec - ln -sf pacat $(DESTDIR)$(bindir)/pamon - ln -sf pacat $(DESTDIR)$(bindir)/paplay - ln -sf pacat $(DESTDIR)$(bindir)/parecord +endif + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.la rm -f $(DESTDIR)$(modlibexecdir)/*.la uninstall-hook: - rm -f $(DESTDIR)$(bindir)/parec - rm -f $(DESTDIR)$(bindir)/pamon - rm -f $(DESTDIR)$(bindir)/paplay - rm -f $(DESTDIR)$(bindir)/parecord + rm -f $(DESTDIR)$(bindir)/parec$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/pamon$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/paplay$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.* rm -f $(DESTDIR)$(modlibexecdir)/*.so @@ -1918,22 +1973,22 @@ update-ffmpeg: # We get things twice here, because sometimes gitweb will us just give a "Generating..." otherwise. update-sbc: for i in $(BLUETOOTH_SBC_FILES) ; do \ - wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=sbc/$$i ; \ - wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=sbc/$$i ; \ + wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \ + wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \ done for i in $(BLUETOOTH_IPC_FILES); do \ wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ - wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ + wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \ done update-reserve: for i in reserve.c reserve.h reserve-monitor.c reserve-monitor.h ; do \ - wget -O modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \ + wget -O $(top_srcdir)/src/modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \ done update-rtkit: for i in rtkit.c rtkit.h ; do \ - wget -O pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \ + wget -O $(top_srcdir)/src/pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \ done # Automatically generate linker version script. We use the same one for all public .sos @@ -1947,4 +2002,23 @@ update-map-file: update-all: update-ffmpeg update-sbc update-map-file -.PHONY: utils/padsp massif update-all update-ffmpeg update-sbc update-map-file +# Force installation order of libraries. libtool relinks on install time, in +# which case libpulsecommon has to be install before others, but the padsp +# preload library has to be done after the normal libraries (e.g. libpulse) +# ... +# Unfortunately automake behaviour means that rules without commands also +# override build-in rules, so it's not trivial to add dependencies. +# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 for the workaround +# ... +# Isn't libtool/autotools fun! + +installlibLTLIBRARIES = install-libLTLIBRARIES +$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES + +installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES +$(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES + +installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES +$(installpadsplibLTLIBRARIES): install-libLTLIBRARIES + +.PHONY: padsp massif update-all update-ffmpeg update-sbc update-map-file