X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/560ce5ece08201312cadad1d70af133d526d3280..f4f4c42fc611b0bca2293e9b517a88a525f2c1fb:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index e02aaf8e..0296b3c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,13 +41,16 @@ endif # Compiler/linker flags # ################################### -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/modules \ -I$(top_builddir)/src/modules \ - $(PTHREAD_CFLAGS) \ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" +AM_CFLAGS = \ + $(PTHREAD_CFLAGS) \ + -DPA_SRCDIR=\"$(abs_srcdir)\" \ + -DPA_BUILDDIR=\"$(abs_builddir)\" AM_CXXFLAGS = $(AM_CFLAGS) SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO @@ -220,6 +223,7 @@ pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) ################################### # Test programs # ################################### +noinst_LTLIBRARIES = TESTS_default = \ mainloop-test \ @@ -258,7 +262,8 @@ TESTS_norun = \ rtstutter \ sig2str-test \ stripnul \ - echo-cancel-test + echo-cancel-test \ + lo-latency-test # These tests need a running pulseaudio daemon TESTS_daemon = \ @@ -297,6 +302,8 @@ endif if HAVE_ALSA TESTS_norun += \ alsa-time-test +TESTS_default += \ + alsa-mixer-path-test endif if HAVE_TESTS @@ -545,6 +552,11 @@ alsa_time_test_LDADD = $(AM_LDADD) $(ASOUNDLIB_LIBS) alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +alsa_mixer_path_test_SOURCES = tests/alsa-mixer-path-test.c +alsa_mixer_path_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) $(ASOUNDLIB_CFLAGS) +alsa_mixer_path_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la libalsa-util.la +alsa_mixer_path_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) + 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) $(LIBCHECK_CFLAGS) @@ -564,6 +576,16 @@ echo_cancel_test_CXXFLAGS = $(module_echo_cancel_la_CXXFLAGS) -DECHO_CANCEL_TEST endif echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +liblo_test_util_la_SOURCES = tests/lo-test-util.h tests/lo-test-util.c +liblo_test_util_la_LIBADD = libpulsecore-@PA_MAJORMINOR@.la +liblo_test_util_la_LDFLAGS = -avoid-version +noinst_LTLIBRARIES += liblo-test-util.la + +lo_latency_test_SOURCES = tests/lo-latency-test.c +lo_latency_test_LDADD = $(AM_LDADD) libpulse.la liblo-test-util.la +lo_latency_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) +lo_latency_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) + ################################### # Common library # ################################### @@ -839,7 +861,6 @@ libpulsedsp_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -disable-static ################################### lib_LTLIBRARIES += libpulsecore-@PA_MAJORMINOR@.la -noinst_LTLIBRARIES = # Pure core stuff libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ @@ -1076,6 +1097,8 @@ modlibexec_LTLIBRARIES += \ module-remap-sink.la \ module-remap-source.la \ module-ladspa-sink.la \ + module-tunnel-sink-new.la \ + module-tunnel-source-new.la \ module-tunnel-sink.la \ module-tunnel-source.la \ module-position-event-sounds.la \ @@ -1172,6 +1195,7 @@ dist_alsaprofilesets_DATA = \ 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-audio2.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 \ @@ -1208,6 +1232,7 @@ dist_alsapaths_DATA = \ 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-lineout.conf \ modules/alsa/mixer/paths/analog-output-mono.conf \ modules/alsa/mixer/paths/iec958-stereo-output.conf \ modules/alsa/mixer/paths/hdmi-output-0.conf \ @@ -1297,14 +1322,22 @@ endif if HAVE_BLUEZ modlibexec_LTLIBRARIES += \ - libbluetooth-util.la \ - module-bluetooth-proximity.la \ module-bluetooth-discover.la \ - module-bluetooth-policy.la \ - module-bluetooth-device.la + module-bluetooth-policy.la +endif -pulselibexec_PROGRAMS += \ - proximity-helper +if HAVE_BLUEZ_4 +modlibexec_LTLIBRARIES += \ + libbluez4-util.la \ + module-bluez4-discover.la \ + module-bluez4-device.la +endif + +if HAVE_BLUEZ_5 +modlibexec_LTLIBRARIES += \ + libbluez5-util.la \ + module-bluez5-discover.la \ + module-bluez5-device.la endif if HAVE_OPENSSL @@ -1345,6 +1378,8 @@ SYMDEF_FILES = \ module-ladspa-sink-symdef.h \ module-equalizer-sink-symdef.h \ module-match-symdef.h \ + module-tunnel-sink-new-symdef.h \ + module-tunnel-source-new-symdef.h \ module-tunnel-sink-symdef.h \ module-tunnel-source-symdef.h \ module-null-sink-symdef.h \ @@ -1391,10 +1426,12 @@ SYMDEF_FILES = \ 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-bluetooth-discover-symdef.h \ + module-bluez4-discover-symdef.h \ + module-bluez4-device-symdef.h \ + module-bluez5-discover-symdef.h \ + module-bluez5-device-symdef.h \ module-raop-sink-symdef.h \ module-raop-discover-symdef.h \ module-gconf-symdef.h \ @@ -1615,14 +1652,22 @@ module_match_la_SOURCES = modules/module-match.c module_match_la_LDFLAGS = $(MODULE_LDFLAGS) module_match_la_LIBADD = $(MODULE_LIBADD) +module_tunnel_sink_new_la_SOURCES = modules/module-tunnel-sink-new.c +module_tunnel_sink_new_la_LDFLAGS = $(MODULE_LDFLAGS) +module_tunnel_sink_new_la_LIBADD = $(MODULE_LIBADD) + +module_tunnel_source_new_la_SOURCES = modules/module-tunnel-source-new.c +module_tunnel_source_new_la_LDFLAGS = $(MODULE_LDFLAGS) +module_tunnel_source_new_la_LIBADD = $(MODULE_LIBADD) + module_tunnel_sink_la_SOURCES = modules/module-tunnel.c -module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) +module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) $(X11_CFLAGS) module_tunnel_sink_la_LDFLAGS = $(MODULE_LDFLAGS) -module_tunnel_sink_la_LIBADD = $(MODULE_LIBADD) +module_tunnel_sink_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS) module_tunnel_source_la_SOURCES = modules/module-tunnel.c -module_tunnel_source_la_LDFLAGS = $(MODULE_LDFLAGS) -module_tunnel_source_la_LIBADD = $(MODULE_LIBADD) +module_tunnel_source_la_LDFLAGS = $(MODULE_LDFLAGS) $(X11_CFLAGS) +module_tunnel_source_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS) module_loopback_la_SOURCES = modules/module-loopback.c module_loopback_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1963,8 +2008,8 @@ 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) $(SYSTEMD_LIBS) -module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS) +module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) +module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) module_systemd_login_la_SOURCES = modules/module-systemd-login.c module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -1982,41 +2027,55 @@ gconf_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon- gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS) gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -# Bluetooth proximity -module_bluetooth_proximity_la_SOURCES = modules/bluetooth/module-bluetooth-proximity.c -module_bluetooth_proximity_la_LDFLAGS = $(MODULE_LDFLAGS) -module_bluetooth_proximity_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) -module_bluetooth_proximity_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_BT_PROXIMITY_HELPER=\"$(pulselibexecdir)/proximity-helper\" - -proximity_helper_SOURCES = modules/bluetooth/proximity-helper.c -proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS) -proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS) -proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +# Bluetooth policy +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) -# Bluetooth sink / source +# Bluetooth discover module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c 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) +module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD) +module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) +# Bluetooth BlueZ 4 sink / source +module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c +module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez4_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez4-util.la +module_bluez4_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -libbluetooth_util_la_SOURCES = \ +libbluez4_util_la_SOURCES = \ modules/bluetooth/a2dp-codecs.h \ - modules/bluetooth/bluetooth-util.c \ - modules/bluetooth/bluetooth-util.h -libbluetooth_util_la_LDFLAGS = -avoid-version -libbluetooth_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) -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) $(SBC_LIBS) libbluetooth-util.la -module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS) - -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) + modules/bluetooth/bluez4-util.c \ + modules/bluetooth/bluez4-util.h +libbluez4_util_la_LDFLAGS = -avoid-version +libbluez4_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) +libbluez4_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + +module_bluez4_device_la_SOURCES = modules/bluetooth/module-bluez4-device.c modules/bluetooth/rtp.h +module_bluez4_device_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluez4-util.la +module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS) + +# Bluetooth BlueZ 5 sink / source +libbluez5_util_la_SOURCES = \ + modules/bluetooth/bluez5-util.c \ + modules/bluetooth/bluez5-util.h \ + modules/bluetooth/a2dp-codecs.h +libbluez5_util_la_LDFLAGS = -avoid-version +libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) +libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + +module_bluez5_discover_la_SOURCES = modules/bluetooth/module-bluez5-discover.c +module_bluez5_discover_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez5-util.la +module_bluez5_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + +module_bluez5_device_la_SOURCES = modules/bluetooth/module-bluez5-device.c +module_bluez5_device_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez5_device_la_LIBADD = $(MODULE_LIBADD) $(SBC_LIBS) libbluez5-util.la +module_bluez5_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) # Apple Airtunes/RAOP module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c @@ -2048,10 +2107,6 @@ else SYMLINK_PROGRAM=ln -sf endif install-exec-hook: -if HAVE_BLUEZ - -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper - -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper -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)