X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/dc5a39b124b6dd605d88e8633bd93e3da1169c3d..89a6fd740fd28c538016cff74655121996c8bc85:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 649f82f6..0957fb9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,6 +55,12 @@ AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LDFLAGS = $(NODELETE_LDFLAGS) +if HAVE_GCOV +AM_CFLAGS+=$(GCOV_CFLAGS) +AM_CXXFLAGS+=$(GCOV_CFLAGS) +AM_LDFLAGS+=$(GCOV_LIBS) +endif + if STATIC_BINS BINLDFLAGS = -static endif @@ -87,7 +93,7 @@ EXTRA_DIST = \ 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 \ @@ -238,8 +244,8 @@ TESTS_default = \ volume-test \ mix-test \ proplist-test \ - lock-autospawn-test \ - prioq-test + cpu-test \ + lock-autospawn-test TESTS_norun = \ mcalign-test \ @@ -304,9 +310,9 @@ check-daemon: $(MAKE) check TESTS="$(TESTS_daemon)" mainloop_test_SOURCES = tests/mainloop-test.c -mainloop_test_CFLAGS = $(AM_CFLAGS) +mainloop_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) mainloop_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c thread_mainloop_test_CFLAGS = $(AM_CFLAGS) @@ -314,9 +320,9 @@ thread_mainloop_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpuls thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) utf8_test_SOURCES = tests/utf8-test.c -utf8_test_CFLAGS = $(AM_CFLAGS) +utf8_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) utf8_test_LDADD = $(AM_LDADD) libpulse.la -utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) format_test_SOURCES = tests/format-test.c format_test_CFLAGS = $(AM_CFLAGS) @@ -399,9 +405,9 @@ 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_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) close_test_SOURCES = tests/close-test.c close_test_CFLAGS = $(AM_CFLAGS) @@ -429,9 +435,9 @@ cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la l cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES) -mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP +mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(LIBCHECK_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la -mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) memblockq_test_SOURCES = tests/memblockq-test.c memblockq_test_CFLAGS = $(AM_CFLAGS) @@ -460,8 +466,8 @@ resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) mix_test_SOURCES = tests/mix-test.c mix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -mix_test_CFLAGS = $(AM_CFLAGS) -mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +mix_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) +mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) remix_test_SOURCES = tests/remix-test.c remix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la @@ -478,6 +484,11 @@ proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la li proplist_test_CFLAGS = $(AM_CFLAGS) proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +cpu_test_SOURCES = tests/cpu-test.c +cpu_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la +cpu_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) +cpu_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) + rtstutter_SOURCES = tests/rtstutter.c rtstutter_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la rtstutter_CFLAGS = $(AM_CFLAGS) @@ -493,11 +504,6 @@ 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) @@ -536,7 +542,7 @@ echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) # Common library # ################################### -lib_LTLIBRARIES = \ +pkglib_LTLIBRARIES = \ libpulsecommon-@PA_MAJORMINOR@.la libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ @@ -584,7 +590,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 \ @@ -701,7 +706,7 @@ pulseinclude_HEADERS = \ pulse/volume.h \ pulse/xmalloc.h -lib_LTLIBRARIES += \ +lib_LTLIBRARIES = \ libpulse.la \ libpulse-simple.la @@ -769,8 +774,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 @@ -900,8 +915,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 @@ -939,9 +958,11 @@ 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 = $(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 \ @@ -998,12 +1019,10 @@ 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 \ @@ -1012,10 +1031,18 @@ modlibexec_LTLIBRARIES += \ module-loopback.la \ module-virtual-sink.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 modlibexec_LTLIBRARIES += \ @@ -1028,9 +1055,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 += \ @@ -1039,10 +1069,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 += \ @@ -1080,6 +1112,9 @@ 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/force-speaker.conf \ + modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.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 \ @@ -1103,7 +1138,9 @@ dist_alsapaths_DATA = \ 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-headphone-mic.conf \ modules/alsa/mixer/paths/analog-input-internal-mic.conf \ + modules/alsa/mixer/paths/analog-input-internal-mic-always.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 \ @@ -1111,13 +1148,18 @@ dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-input-video.conf \ modules/alsa/mixer/paths/analog-output.conf \ modules/alsa/mixer/paths/analog-output-speaker.conf \ + modules/alsa/mixer/paths/analog-output-speaker-always.conf \ modules/alsa/mixer/paths/analog-output.conf.common \ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \ modules/alsa/mixer/paths/analog-output-headphones.conf \ modules/alsa/mixer/paths/analog-output-headphones-2.conf \ 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-stereo-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 @@ -1142,6 +1184,12 @@ modlibexec_LTLIBRARIES += \ module-lirc.la endif +if HAVE_XEN +modlibexec_LTLIBRARIES += \ + module-xenpv-sink.la +endif + + if HAVE_EVDEV modlibexec_LTLIBRARIES += \ module-mmkbd-evdev.la @@ -1172,11 +1220,6 @@ modlibexec_LTLIBRARIES += \ module-waveout.la endif -if HAVE_HAL -modlibexec_LTLIBRARIES += \ - module-hal-detect.la -endif - if HAVE_HAL_COMPAT modlibexec_LTLIBRARIES += \ module-hal-detect.la @@ -1187,6 +1230,11 @@ modlibexec_LTLIBRARIES += \ module-udev-detect.la endif +if HAVE_SYSTEMD +modlibexec_LTLIBRARIES += \ + module-systemd-login.la +endif + if HAVE_DBUS modlibexec_LTLIBRARIES += \ module-rygel-media-server.la \ @@ -1198,8 +1246,8 @@ modlibexec_LTLIBRARIES += \ libbluetooth-util.la \ module-bluetooth-proximity.la \ module-bluetooth-discover.la \ - libbluetooth-ipc.la \ libbluetooth-sbc.la \ + module-bluetooth-policy.la \ module-bluetooth-device.la pulselibexec_PROGRAMS += \ @@ -1233,8 +1281,6 @@ SYMDEF_FILES = \ module-pipe-source-symdef.h \ module-simple-protocol-tcp-symdef.h \ module-simple-protocol-unix-symdef.h \ - module-esound-protocol-tcp-symdef.h \ - module-esound-protocol-unix-symdef.h \ module-native-protocol-tcp-symdef.h \ module-native-protocol-unix-symdef.h \ module-native-protocol-fd-symdef.h \ @@ -1244,19 +1290,17 @@ SYMDEF_FILES = \ module-remap-sink-symdef.h \ module-ladspa-sink-symdef.h \ module-equalizer-sink-symdef.h \ - module-esound-compat-spawnfd-symdef.h \ - module-esound-compat-spawnpid-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-esound-sink-symdef.h \ module-zeroconf-publish-symdef.h \ module-zeroconf-discover-symdef.h \ module-bonjour-publish-symdef.h \ module-lirc-symdef.h \ + module-xenpv-sink-symdef.h \ module-mmkbd-evdev-symdef.h \ module-http-protocol-tcp-symdef.h \ module-http-protocol-unix-symdef.h \ @@ -1292,8 +1336,10 @@ SYMDEF_FILES = \ module-echo-cancel-symdef.h \ module-hal-detect-symdef.h \ module-udev-detect-symdef.h \ + module-systemd-login-symdef.h \ module-bluetooth-proximity-symdef.h \ module-bluetooth-discover-symdef.h \ + module-bluetooth-policy-symdef.h \ module-bluetooth-device-symdef.h \ module-raop-sink-symdef.h \ module-raop-discover-symdef.h \ @@ -1306,10 +1352,21 @@ SYMDEF_FILES = \ 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) builddirs @@ -1398,6 +1455,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) @@ -1419,6 +1477,7 @@ 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) $(WINSOCK_LIBS) module_esound_sink_la_LIBADD = $(MODULE_LIBADD) +endif # Pipes @@ -1462,6 +1521,10 @@ 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) @@ -1479,6 +1542,11 @@ module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/l module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) +if HAVE_DBUS +module_ladspa_sink_la_CFLAGS += $(DBUS_CFLAGS) +module_ladspa_sink_la_LIBADD += $(DBUS_LIBS) +endif + module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS) module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1511,6 +1579,11 @@ 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 @@ -1561,6 +1634,7 @@ module_coreaudio_device_la_LIBADD = $(MODULE_LIBADD) libalsa_util_la_SOURCES = \ modules/alsa/alsa-util.c modules/alsa/alsa-util.h \ + modules/alsa/alsa-ucm.c modules/alsa/alsa-ucm.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 \ @@ -1569,12 +1643,6 @@ libalsa_util_la_LDFLAGS = -avoid-version libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) 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 -libalsa_util_la_LIBADD += $(HAL_LIBS) -libalsa_util_la_CFLAGS += $(HAL_CFLAGS) -endif - if HAVE_UDEV libalsa_util_la_SOURCES += modules/udev-util.h modules/udev-util.c libalsa_util_la_LIBADD += $(UDEV_LIBS) @@ -1634,6 +1702,15 @@ module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS) module_lirc_la_LIBADD = $(MODULE_LIBADD) $(LIRC_LIBS) module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS) + +# Xen PV driver + +module_xenpv_sink_la_SOURCES = modules/xen/module-xenpv-sink.c modules/xen/gntalloc.h modules/xen/gntdev.h +module_xenpv_sink_la_LDFLAGS = $(MODULE_LDFLAGS) +module_xenpv_sink_la_LIBADD = $(MODULE_LIBADD) $(XEN_LIBS) +module_xenpv_sink_la_CFLAGS = $(AM_CFLAGS) $(XEN_CFLAGS) -I$(top_srcdir)/src/modules/xen + + # Linux evdev module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c @@ -1744,7 +1821,9 @@ module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS) # echo-cancel module module_echo_cancel_la_SOURCES = \ - modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/echo-cancel.h + modules/echo-cancel/module-echo-cancel.c \ + modules/echo-cancel/null.c \ + modules/echo-cancel/echo-cancel.h module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS) module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSPEEX_CFLAGS) @@ -1766,10 +1845,18 @@ 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 +# The webrtc code is split off into a helper library to avoid having automake +# link module-echo-cancel with C++ (which it does if there are any C++ deps, +# even conditional ones). +modlibexec_LTLIBRARIES += libwebrtc-util.la + +libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc +libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1 +libwebrtc_util_la_LIBADD = $(WEBRTC_LIBS) +libwebrtc_util_la_LDFLAGS = -avoid-version + 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) +module_echo_cancel_la_LIBADD += libwebrtc-util.la endif # RTP modules @@ -1800,15 +1887,9 @@ module_jack_source_la_LDFLAGS = $(MODULE_LDFLAGS) module_jack_source_la_LIBADD = $(MODULE_LIBADD) $(JACK_LIBS) module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) -if HAVE_HAL_COMPAT module_hal_detect_la_SOURCES = modules/module-hal-detect-compat.c module_hal_detect_la_LIBADD = $(MODULE_LIBADD) module_hal_detect_la_CFLAGS = $(AM_CFLAGS) -else -module_hal_detect_la_SOURCES = modules/module-hal-detect.c -module_hal_detect_la_LIBADD = $(MODULE_LIBADD) $(HAL_LIBS) -module_hal_detect_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) -endif module_hal_detect_la_LDFLAGS = $(MODULE_LDFLAGS) module_udev_detect_la_SOURCES = modules/module-udev-detect.c @@ -1818,8 +1899,13 @@ module_udev_detect_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS) module_console_kit_la_SOURCES = modules/module-console-kit.c module_console_kit_la_LDFLAGS = $(MODULE_LDFLAGS) -module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) -module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SYSTEMD_LIBS) +module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS) + +module_systemd_login_la_SOURCES = modules/module-systemd-login.c +module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS) +module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS) +module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) # GConf support module_gconf_la_SOURCES = modules/gconf/module-gconf.c @@ -1863,14 +1949,6 @@ libbluetooth_sbc_la_LIBADD = $(MODULE_LIBADD) 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/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_CFLAGS = $(AM_CFLAGS) -BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h - libbluetooth_util_la_SOURCES = modules/bluetooth/bluetooth-util.c modules/bluetooth/bluetooth-util.h libbluetooth_util_la_LDFLAGS = -avoid-version libbluetooth_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) @@ -1878,9 +1956,14 @@ 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_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la libbluetooth-sbc.la module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/modules/bluetooth/sbc +module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c +module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD) +module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + # Apple Airtunes/RAOP module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c module_raop_sink_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1942,10 +2025,6 @@ update-sbc: 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 $(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 \ @@ -1968,4 +2047,41 @@ 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 installed 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 + +if HAVE_GCOV +coverage: + @echo "" + @echo "Don't forget to run 'make check' before generating coverage stats." + @echo "" + lcov --capture --directory . --output-file $(builddir)/gcov-all.info + -rm -r $(builddir)/coverage + genhtml --output-directory $(builddir)/coverage gcov-all.info + @echo "" + @echo "Coverage data now available at: $(abs_builddir)/coverage/index.html" +else +coverage: + @echo "" + @echo "To generate coverage stats, rerun configure with '--enable-gcov'," + @echo "and don't forget to disable it again for regular builds." + @echo "" +endif + +.PHONY: massif update-all update-ffmpeg update-sbc update-map-file coverage