X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/77c5901df2032328b41997fc3df0de9b5fec5f89..84ffc41bfb9c9f3c7eaa7ff6e106ee2fccb5ea81:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 127956ad..aba850cb 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 @@ -238,6 +244,7 @@ TESTS_default = \ volume-test \ mix-test \ proplist-test \ + cpu-test \ lock-autospawn-test TESTS_norun = \ @@ -296,16 +303,16 @@ TESTS = $(TESTS_default) if BUILD_TESTS_DEFAULT noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) else -check_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) +check_PROGRAMS = $(TESTS_default) $(TESTS_norun) endif -check-daemon: - $(MAKE) check TESTS="$(TESTS_daemon)" +check-daemon: $(TESTS_daemon) + PATH=$(builddir):${PATH} $(top_srcdir)/src/tests/test-daemon.sh $(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) @@ -313,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) @@ -398,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) @@ -428,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) @@ -459,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 @@ -477,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) @@ -1101,6 +1113,8 @@ 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 \ @@ -1124,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 \ @@ -1132,6 +1148,7 @@ 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 \ @@ -1229,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 += \ @@ -1322,6 +1339,7 @@ SYMDEF_FILES = \ 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 \ @@ -1524,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) @@ -1611,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 \ @@ -1797,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) @@ -1819,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 @@ -1915,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) @@ -1930,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) @@ -1994,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 \ @@ -2039,4 +2066,22 @@ $(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES $(installpadsplibLTLIBRARIES): install-libLTLIBRARIES -.PHONY: massif update-all update-ffmpeg update-sbc update-map-file +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