New upstream version 11.99.1

author: Felipe Sateler <fsateler@debian.org> 2018-05-13 09:53:54 -0400
committer: Felipe Sateler <fsateler@debian.org> 2018-05-13 09:53:54 -0400
commit: eec08ca9a73ade8fe18fc49a2c9bda804825beb7 (patch)
tree: ff2520583a4e2989fce5e01f40e8d827264ce2fd /src/Makefile.in
parent: 566eb308e762546c787714da8f6f4b8f1f54e42e (diff)
1 files changed, 935 insertions, 575 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 028c725..777d7fe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -150,36 +150,37 @@ bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \
 @HAVE_DBUS_TRUE@am__append_10 = $(DBUS_LIBS)
 @HAVE_SYSTEMD_DAEMON_TRUE@am__append_11 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
 @HAVE_SYSTEMD_DAEMON_TRUE@am__append_12 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
-@OS_IS_WIN32_FALSE@am__append_13 = pasuspender
-@HAVE_AF_UNIX_TRUE@am__append_14 = pacmd
-@HAVE_X11_TRUE@am__append_15 = pax11publish
-@HAVE_X11_TRUE@am__append_16 = start-pulseaudio-x11
-@OS_IS_WIN32_FALSE@am__append_17 = \
+@HAVE_ESOUND_TRUE@am__append_13 = esdcompat
+@OS_IS_WIN32_FALSE@am__append_14 = pasuspender
+@HAVE_AF_UNIX_TRUE@am__append_15 = pacmd
+@HAVE_X11_TRUE@am__append_16 = pax11publish
+@HAVE_X11_TRUE@am__append_17 = start-pulseaudio-x11
+@OS_IS_WIN32_FALSE@am__append_18 = \
 @OS_IS_WIN32_FALSE@		sigbus-test \
 @OS_IS_WIN32_FALSE@		usergroup-test
 
-@HAVE_SYS_EVENTFD_H_TRUE@am__append_18 = \
+@HAVE_SYS_EVENTFD_H_TRUE@am__append_19 = \
 @HAVE_SYS_EVENTFD_H_TRUE@		srbchannel-test
 
-@OS_IS_DARWIN_FALSE@am__append_19 = \
+@OS_IS_DARWIN_FALSE@am__append_20 = \
 @OS_IS_DARWIN_FALSE@		once-test
 
-@HAVE_SIGXCPU_TRUE@am__append_20 = \
+@HAVE_SIGXCPU_TRUE@am__append_21 = \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test2
 
-@HAVE_GLIB20_TRUE@am__append_21 = \
+@HAVE_GLIB20_TRUE@am__append_22 = \
 @HAVE_GLIB20_TRUE@		mainloop-test-glib
 
 
 # gtk-test depends on both glib and gtk
-@HAVE_GLIB20_TRUE@@HAVE_GTK30_TRUE@am__append_22 = \
+@HAVE_GLIB20_TRUE@@HAVE_GTK30_TRUE@am__append_23 = \
 @HAVE_GLIB20_TRUE@@HAVE_GTK30_TRUE@		gtk-test
 
-@HAVE_ALSA_TRUE@am__append_23 = \
+@HAVE_ALSA_TRUE@am__append_24 = \
 @HAVE_ALSA_TRUE@		alsa-time-test
 
-@HAVE_ALSA_TRUE@am__append_24 = \
+@HAVE_ALSA_TRUE@am__append_25 = \
 @HAVE_ALSA_TRUE@		alsa-mixer-path-test
 
 @HAVE_TESTS_TRUE@TESTS = $(am__EXEEXT_9)
@@ -190,217 +191,223 @@ bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@check_PROGRAMS =  \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@	$(am__EXEEXT_9) \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@	$(am__EXEEXT_13)
-@OS_IS_WIN32_TRUE@am__append_25 = \
+@OS_IS_WIN32_TRUE@am__append_26 = \
 @OS_IS_WIN32_TRUE@		pulsecore/poll-win32.c pulsecore/poll.h \
 @OS_IS_WIN32_TRUE@		pulsecore/winerrno.h
 
-@OS_IS_WIN32_FALSE@am__append_26 = pulsecore/poll-posix.c pulsecore/poll.h
-@HAVE_MEMFD_TRUE@am__append_27 = \
+@OS_IS_WIN32_FALSE@am__append_27 = pulsecore/poll-posix.c pulsecore/poll.h
+@HAVE_MEMFD_TRUE@am__append_28 = \
 @HAVE_MEMFD_TRUE@		pulsecore/memfd-wrappers.h
 
-@HAVE_X11_TRUE@am__append_28 = \
+@HAVE_X11_TRUE@am__append_29 = \
 @HAVE_X11_TRUE@		pulse/client-conf-x11.c pulse/client-conf-x11.h \
 @HAVE_X11_TRUE@		pulsecore/x11prop.c pulsecore/x11prop.h
 
-@HAVE_X11_TRUE@am__append_29 = $(X11_CFLAGS)
-@HAVE_X11_TRUE@am__append_30 = $(X11_LIBS)
-@HAVE_SYSTEMD_DAEMON_TRUE@am__append_31 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
-@HAVE_SYSTEMD_DAEMON_TRUE@am__append_32 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
-@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_33 = $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS)
-@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_34 = $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS)
-@OS_IS_WIN32_TRUE@am__append_35 = \
+@HAVE_X11_TRUE@am__append_30 = $(X11_CFLAGS)
+@HAVE_X11_TRUE@am__append_31 = $(X11_LIBS)
+@HAVE_SYSTEMD_DAEMON_TRUE@am__append_32 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
+@HAVE_SYSTEMD_DAEMON_TRUE@am__append_33 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
+@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_34 = $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS)
+@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_35 = $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS)
+@OS_IS_WIN32_TRUE@am__append_36 = \
 @OS_IS_WIN32_TRUE@		pulsecore/mutex-win32.c pulsecore/mutex.h \
 @OS_IS_WIN32_TRUE@		pulsecore/thread-win32.c pulsecore/thread.h \
 @OS_IS_WIN32_TRUE@		pulsecore/semaphore-win32.c pulsecore/semaphore.h
 
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_36 = \
+@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_37 = \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-osx.c pulsecore/semaphore.h
 
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_37 = \
+@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_38 = \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-posix.c pulsecore/semaphore.h
 
-@HAVE_LIBASYNCNS_TRUE@am__append_38 = $(LIBASYNCNS_CFLAGS)
-@HAVE_LIBASYNCNS_TRUE@am__append_39 = $(LIBASYNCNS_LIBS)
-@OS_IS_WIN32_TRUE@am__append_40 = pulsecore/dllmain.c
-@HAVE_DBUS_TRUE@am__append_41 = \
+@HAVE_LIBASYNCNS_TRUE@am__append_39 = $(LIBASYNCNS_CFLAGS)
+@HAVE_LIBASYNCNS_TRUE@am__append_40 = $(LIBASYNCNS_LIBS)
+@OS_IS_WIN32_TRUE@am__append_41 = pulsecore/dllmain.c
+@HAVE_DBUS_TRUE@am__append_42 = \
 @HAVE_DBUS_TRUE@		pulsecore/dbus-util.c pulsecore/dbus-util.h \
 @HAVE_DBUS_TRUE@		pulsecore/rtkit.c pulsecore/rtkit.h
 
-@HAVE_DBUS_TRUE@am__append_42 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_43 = $(DBUS_LIBS)
-@HAVE_GLIB20_TRUE@am__append_44 = \
+@HAVE_DBUS_TRUE@am__append_43 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_44 = $(DBUS_LIBS)
+@HAVE_GLIB20_TRUE@am__append_45 = \
 @HAVE_GLIB20_TRUE@		pulse/glib-mainloop.h
 
-@HAVE_GLIB20_TRUE@am__append_45 = \
+@HAVE_GLIB20_TRUE@am__append_46 = \
 @HAVE_GLIB20_TRUE@		libpulse-mainloop-glib.la
 
-@HAVE_DBUS_TRUE@am__append_46 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_47 = $(DBUS_LIBS)
-@HAVE_OSS_WRAPPER_TRUE@am__append_48 = padsp
+@HAVE_DBUS_TRUE@am__append_47 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_48 = $(DBUS_LIBS)
 @HAVE_OSS_WRAPPER_TRUE@am__append_49 = padsp
-@HAVE_NEON_TRUE@am__append_50 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
+@HAVE_OSS_WRAPPER_TRUE@am__append_50 = padsp
 @HAVE_NEON_TRUE@am__append_51 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
-@HAVE_ORC_TRUE@am__append_52 = pulsecore/svolume_orc.c
-@HAVE_ORC_TRUE@am__append_53 = $(ORC_CFLAGS)
-@HAVE_ORC_TRUE@am__append_54 = $(ORC_LIBS)
-@HAVE_X11_TRUE@am__append_55 = pulsecore/x11wrap.c pulsecore/x11wrap.h
-@HAVE_X11_TRUE@am__append_56 = $(X11_CFLAGS)
-@HAVE_X11_TRUE@am__append_57 = $(X11_LIBS)
-@HAVE_DBUS_TRUE@am__append_58 = \
+@HAVE_NEON_TRUE@am__append_52 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
+@HAVE_ORC_TRUE@am__append_53 = pulsecore/svolume_orc.c
+@HAVE_ORC_TRUE@am__append_54 = $(ORC_CFLAGS)
+@HAVE_ORC_TRUE@am__append_55 = $(ORC_LIBS)
+@HAVE_X11_TRUE@am__append_56 = pulsecore/x11wrap.c pulsecore/x11wrap.h
+@HAVE_X11_TRUE@am__append_57 = $(X11_CFLAGS)
+@HAVE_X11_TRUE@am__append_58 = $(X11_LIBS)
+@HAVE_DBUS_TRUE@am__append_59 = \
 @HAVE_DBUS_TRUE@		pulsecore/dbus-shared.c pulsecore/dbus-shared.h \
 @HAVE_DBUS_TRUE@		pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h
 
-@HAVE_DBUS_TRUE@am__append_59 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_60 = $(DBUS_LIBS)
-@HAVE_GDBM_TRUE@am__append_61 = pulsecore/database-gdbm.c
-@HAVE_GDBM_TRUE@am__append_62 = $(GDBM_CFLAGS)
-@HAVE_GDBM_TRUE@am__append_63 = $(GDBM_LIBS)
-@HAVE_TDB_TRUE@am__append_64 = pulsecore/database-tdb.c
-@HAVE_TDB_TRUE@am__append_65 = $(TDB_CFLAGS)
-@HAVE_TDB_TRUE@am__append_66 = $(TDB_LIBS)
-@HAVE_SIMPLEDB_TRUE@am__append_67 = pulsecore/database-simple.c
-@HAVE_SPEEX_TRUE@am__append_68 = pulsecore/resampler/speex.c
-@HAVE_SPEEX_TRUE@am__append_69 = $(LIBSPEEX_CFLAGS)
-@HAVE_SPEEX_TRUE@am__append_70 = $(LIBSPEEX_LIBS)
-@HAVE_SOXR_TRUE@am__append_71 = pulsecore/resampler/soxr.c
-@HAVE_SOXR_TRUE@am__append_72 = $(LIBSOXR_CFLAGS)
-@HAVE_SOXR_TRUE@am__append_73 = $(LIBSOXR_LIBS)
-@HAVE_LIBSAMPLERATE_TRUE@am__append_74 = pulsecore/resampler/libsamplerate.c
-@HAVE_LIBSAMPLERATE_TRUE@am__append_75 = $(LIBSAMPLERATE_CFLAGS)
-@HAVE_LIBSAMPLERATE_TRUE@am__append_76 = $(LIBSAMPLERATE_LIBS)
-@HAVE_WEBRTC_TRUE@am__append_77 = libwebrtc-util.la
-@HAVE_ESOUND_TRUE@am__append_78 = \
+@HAVE_DBUS_TRUE@am__append_60 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_61 = $(DBUS_LIBS)
+@HAVE_GDBM_TRUE@am__append_62 = pulsecore/database-gdbm.c
+@HAVE_GDBM_TRUE@am__append_63 = $(GDBM_CFLAGS)
+@HAVE_GDBM_TRUE@am__append_64 = $(GDBM_LIBS)
+@HAVE_TDB_TRUE@am__append_65 = pulsecore/database-tdb.c
+@HAVE_TDB_TRUE@am__append_66 = $(TDB_CFLAGS)
+@HAVE_TDB_TRUE@am__append_67 = $(TDB_LIBS)
+@HAVE_SIMPLEDB_TRUE@am__append_68 = pulsecore/database-simple.c
+@HAVE_SPEEX_TRUE@am__append_69 = pulsecore/resampler/speex.c
+@HAVE_SPEEX_TRUE@am__append_70 = $(LIBSPEEX_CFLAGS)
+@HAVE_SPEEX_TRUE@am__append_71 = $(LIBSPEEX_LIBS)
+@HAVE_SOXR_TRUE@am__append_72 = pulsecore/resampler/soxr.c
+@HAVE_SOXR_TRUE@am__append_73 = $(LIBSOXR_CFLAGS)
+@HAVE_SOXR_TRUE@am__append_74 = $(LIBSOXR_LIBS)
+@HAVE_LIBSAMPLERATE_TRUE@am__append_75 = pulsecore/resampler/libsamplerate.c
+@HAVE_LIBSAMPLERATE_TRUE@am__append_76 = $(LIBSAMPLERATE_CFLAGS)
+@HAVE_LIBSAMPLERATE_TRUE@am__append_77 = $(LIBSAMPLERATE_LIBS)
+@HAVE_WEBRTC_TRUE@am__append_78 = libwebrtc-util.la
+@HAVE_ESOUND_TRUE@am__append_79 = \
 @HAVE_ESOUND_TRUE@		libprotocol-esound.la
 
 
 # We need to emulate sendmsg/recvmsg to support this on Win32
-@OS_IS_WIN32_FALSE@am__append_79 = \
+@OS_IS_WIN32_FALSE@am__append_80 = \
 @OS_IS_WIN32_FALSE@		librtp.la
 
-@HAVE_AVAHI_TRUE@am__append_80 = \
+@HAVE_AVAHI_TRUE@am__append_81 = \
 @HAVE_AVAHI_TRUE@		libavahi-wrap.la
 
-@HAVE_DBUS_TRUE@am__append_81 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_82 = $(DBUS_LIBS)
+@HAVE_DBUS_TRUE@am__append_82 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_83 = $(DBUS_LIBS)
 
 ###################################
 #        Plug-in libraries        #
 ###################################
 
 # Serveral module (e.g. libalsa-util.la)
-@HAVE_DBUS_TRUE@am__append_83 = \
+@HAVE_DBUS_TRUE@am__append_84 = \
 @HAVE_DBUS_TRUE@		module-console-kit.la
 
-@HAVE_ESOUND_TRUE@am__append_84 = \
+@HAVE_ESOUND_TRUE@am__append_85 = \
 @HAVE_ESOUND_TRUE@		module-esound-protocol-tcp.la \
 @HAVE_ESOUND_TRUE@		module-esound-sink.la
 
 
 # See comment at librtp.la above
-@OS_IS_WIN32_FALSE@am__append_85 = \
+@OS_IS_WIN32_FALSE@am__append_86 = \
 @OS_IS_WIN32_FALSE@		module-rtp-send.la \
 @OS_IS_WIN32_FALSE@		module-rtp-recv.la
 
-@HAVE_AF_UNIX_TRUE@am__append_86 = \
+@HAVE_AF_UNIX_TRUE@am__append_87 = \
 @HAVE_AF_UNIX_TRUE@		module-cli-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-simple-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-http-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-native-protocol-unix.la
 
-@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_87 = \
+@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_88 = \
 @HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@		module-esound-protocol-unix.la
 
-@HAVE_MKFIFO_TRUE@am__append_88 = \
+@HAVE_MKFIFO_TRUE@am__append_89 = \
 @HAVE_MKFIFO_TRUE@		module-pipe-sink.la \
 @HAVE_MKFIFO_TRUE@		module-pipe-source.la
 
-@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_89 = \
+@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_90 = \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@		module-esound-compat-spawnfd.la \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@		module-esound-compat-spawnpid.la
 
-@HAVE_REGEX_TRUE@am__append_90 = \
+@HAVE_REGEX_TRUE@am__append_91 = \
 @HAVE_REGEX_TRUE@		module-match.la
 
-@HAVE_X11_TRUE@am__append_91 = \
+@HAVE_X11_TRUE@am__append_92 = \
 @HAVE_X11_TRUE@		module-x11-bell.la \
 @HAVE_X11_TRUE@		module-x11-publish.la \
 @HAVE_X11_TRUE@		module-x11-xsmp.la \
 @HAVE_X11_TRUE@		module-x11-cork-request.la
 
-@HAVE_OSS_OUTPUT_TRUE@am__append_92 = \
+@HAVE_OSS_OUTPUT_TRUE@am__append_93 = \
 @HAVE_OSS_OUTPUT_TRUE@		liboss-util.la \
 @HAVE_OSS_OUTPUT_TRUE@		module-oss.la
 
-@HAVE_COREAUDIO_TRUE@am__append_93 = \
+@HAVE_COREAUDIO_TRUE@am__append_94 = \
 @HAVE_COREAUDIO_TRUE@		module-coreaudio-detect.la \
 @HAVE_COREAUDIO_TRUE@		module-coreaudio-device.la
 
-pulselibexec_PROGRAMS = $(am__EXEEXT_15)
-@HAVE_ALSA_TRUE@am__append_94 = \
+pulselibexec_PROGRAMS = $(am__EXEEXT_15) $(am__EXEEXT_16)
+@HAVE_ALSA_TRUE@am__append_95 = \
 @HAVE_ALSA_TRUE@		libalsa-util.la \
 @HAVE_ALSA_TRUE@		module-alsa-sink.la \
 @HAVE_ALSA_TRUE@		module-alsa-source.la \
 @HAVE_ALSA_TRUE@		module-alsa-card.la
 
-@HAVE_SOLARIS_TRUE@am__append_95 = \
+@HAVE_SOLARIS_TRUE@am__append_96 = \
 @HAVE_SOLARIS_TRUE@		module-solaris.la
 
-@HAVE_AVAHI_TRUE@am__append_96 = \
+@HAVE_AVAHI_TRUE@am__append_97 = \
 @HAVE_AVAHI_TRUE@		module-zeroconf-publish.la \
 @HAVE_AVAHI_TRUE@		module-zeroconf-discover.la
 
-@HAVE_BONJOUR_TRUE@am__append_97 = \
+@HAVE_BONJOUR_TRUE@am__append_98 = \
 @HAVE_BONJOUR_TRUE@		module-bonjour-publish.la
 
-@HAVE_LIRC_TRUE@am__append_98 = \
+@HAVE_LIRC_TRUE@am__append_99 = \
 @HAVE_LIRC_TRUE@		module-lirc.la
 
-@HAVE_EVDEV_TRUE@am__append_99 = \
+@HAVE_EVDEV_TRUE@am__append_100 = \
 @HAVE_EVDEV_TRUE@		module-mmkbd-evdev.la
 
-@HAVE_JACK_TRUE@am__append_100 = \
+@HAVE_JACK_TRUE@am__append_101 = \
 @HAVE_JACK_TRUE@		module-jack-sink.la \
 @HAVE_JACK_TRUE@		module-jack-source.la
 
-@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_101 = \
+@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_102 = \
 @HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@		module-jackdbus-detect.la
 
-@HAVE_GCONF_TRUE@am__append_102 = \
+@HAVE_GCONF_TRUE@am__append_103 = \
 @HAVE_GCONF_TRUE@		module-gconf.la
 
-@HAVE_GCONF_TRUE@am__append_103 = \
+@HAVE_GCONF_TRUE@am__append_104 = \
 @HAVE_GCONF_TRUE@		gconf-helper
 
-@HAVE_WAVEOUT_TRUE@am__append_104 = \
+@HAVE_GSETTINGS_TRUE@am__append_105 = \
+@HAVE_GSETTINGS_TRUE@		module-gsettings.la
+
+@HAVE_GSETTINGS_TRUE@am__append_106 = \
+@HAVE_GSETTINGS_TRUE@		gsettings-helper
+
+@HAVE_WAVEOUT_TRUE@am__append_107 = \
 @HAVE_WAVEOUT_TRUE@		module-waveout.la
 
-@HAVE_HAL_COMPAT_TRUE@am__append_105 = \
+@HAVE_HAL_COMPAT_TRUE@am__append_108 = \
 @HAVE_HAL_COMPAT_TRUE@		module-hal-detect.la
 
-@HAVE_UDEV_TRUE@am__append_106 = \
+@HAVE_UDEV_TRUE@am__append_109 = \
 @HAVE_UDEV_TRUE@		module-udev-detect.la
 
-@HAVE_SYSTEMD_LOGIN_TRUE@am__append_107 = \
+@HAVE_SYSTEMD_LOGIN_TRUE@am__append_110 = \
 @HAVE_SYSTEMD_LOGIN_TRUE@		module-systemd-login.la
 
-@HAVE_DBUS_TRUE@am__append_108 = \
+@HAVE_DBUS_TRUE@am__append_111 = \
 @HAVE_DBUS_TRUE@		module-rygel-media-server.la \
 @HAVE_DBUS_TRUE@		module-dbus-protocol.la
 
-@HAVE_BLUEZ_TRUE@am__append_109 = \
+@HAVE_BLUEZ_TRUE@am__append_112 = \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-discover.la \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-policy.la
 
-@HAVE_BLUEZ_4_TRUE@am__append_110 = \
+@HAVE_BLUEZ_4_TRUE@am__append_113 = \
 @HAVE_BLUEZ_4_TRUE@		libbluez4-util.la \
 @HAVE_BLUEZ_4_TRUE@		module-bluez4-discover.la \
 @HAVE_BLUEZ_4_TRUE@		module-bluez4-device.la
 
-@HAVE_BLUEZ_5_TRUE@am__append_111 = \
+@HAVE_BLUEZ_5_TRUE@am__append_114 = \
 @HAVE_BLUEZ_5_TRUE@		libbluez5-util.la \
 @HAVE_BLUEZ_5_TRUE@		module-bluez5-discover.la \
 @HAVE_BLUEZ_5_TRUE@		module-bluez5-device.la
@@ -408,53 +415,46 @@ pulselibexec_PROGRAMS = $(am__EXEEXT_15)
 
 # RAOP depends on RTP, and we don't support RTP on Windows, see comment at
 # librtp.la above.
-@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_112 = \
+@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_115 = \
 @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		libraop.la \
 @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		module-raop-sink.la
 
-@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_113 = \
+@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_116 = \
 @HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		module-raop-discover.la
 
-@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_114 = \
+@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_117 = \
 @HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@		module-equalizer-sink.la
 
-@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_115 = utils/qpaeq
-@HAVE_ESOUND_TRUE@am__append_116 = \
-@HAVE_ESOUND_TRUE@		module-esound-protocol-tcp-symdef.h \
-@HAVE_ESOUND_TRUE@		module-esound-protocol-unix-symdef.h \
-@HAVE_ESOUND_TRUE@		module-esound-compat-spawnfd-symdef.h \
-@HAVE_ESOUND_TRUE@		module-esound-compat-spawnpid-symdef.h \
-@HAVE_ESOUND_TRUE@		module-esound-sink-symdef.h
-
-@HAVE_DBUS_TRUE@am__append_117 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_118 = $(DBUS_LIBS)
-@HAVE_UDEV_TRUE@am__append_119 = modules/udev-util.h modules/udev-util.c
-@HAVE_UDEV_TRUE@am__append_120 = $(UDEV_LIBS)
-@HAVE_UDEV_TRUE@am__append_121 = $(UDEV_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_122 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
-@HAVE_DBUS_TRUE@am__append_123 = $(DBUS_LIBS)
-@HAVE_DBUS_TRUE@am__append_124 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_118 = utils/qpaeq
+@HAVE_DBUS_TRUE@am__append_119 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_120 = $(DBUS_LIBS)
+@HAVE_UDEV_TRUE@am__append_121 = modules/udev-util.h modules/udev-util.c
+@HAVE_UDEV_TRUE@am__append_122 = $(UDEV_LIBS)
+@HAVE_UDEV_TRUE@am__append_123 = $(UDEV_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_124 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
 @HAVE_DBUS_TRUE@am__append_125 = $(DBUS_LIBS)
 @HAVE_DBUS_TRUE@am__append_126 = $(DBUS_CFLAGS)
 @HAVE_DBUS_TRUE@am__append_127 = $(DBUS_LIBS)
 @HAVE_DBUS_TRUE@am__append_128 = $(DBUS_CFLAGS)
-@HAVE_ADRIAN_EC_TRUE@am__append_129 = \
+@HAVE_DBUS_TRUE@am__append_129 = $(DBUS_LIBS)
+@HAVE_DBUS_TRUE@am__append_130 = $(DBUS_CFLAGS)
+@HAVE_ADRIAN_EC_TRUE@am__append_131 = \
 @HAVE_ADRIAN_EC_TRUE@		modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
 @HAVE_ADRIAN_EC_TRUE@		modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
 
-@HAVE_ADRIAN_EC_TRUE@am__append_130 = -DHAVE_ADRIAN_EC=1
-@HAVE_ADRIAN_EC_TRUE@am__append_131 = modules/echo-cancel/adrian-aec
-@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_132 = $(ORC_LIBS)
-@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_133 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
-@HAVE_SPEEX_TRUE@am__append_134 = modules/echo-cancel/speex.c
-@HAVE_SPEEX_TRUE@am__append_135 = $(LIBSPEEX_CFLAGS)
-@HAVE_SPEEX_TRUE@am__append_136 = $(LIBSPEEX_LIBS)
-@HAVE_WEBRTC_TRUE@am__append_137 = -DHAVE_WEBRTC=1
-@HAVE_WEBRTC_TRUE@am__append_138 = libwebrtc-util.la
-@HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_139 = \
+@HAVE_ADRIAN_EC_TRUE@am__append_132 = -DHAVE_ADRIAN_EC=1
+@HAVE_ADRIAN_EC_TRUE@am__append_133 = modules/echo-cancel/adrian-aec
+@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_134 = $(ORC_LIBS)
+@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_135 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
+@HAVE_SPEEX_TRUE@am__append_136 = modules/echo-cancel/speex.c
+@HAVE_SPEEX_TRUE@am__append_137 = $(LIBSPEEX_CFLAGS)
+@HAVE_SPEEX_TRUE@am__append_138 = $(LIBSPEEX_LIBS)
+@HAVE_WEBRTC_TRUE@am__append_139 = -DHAVE_WEBRTC=1
+@HAVE_WEBRTC_TRUE@am__append_140 = libwebrtc-util.la
+@HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_141 = \
 @HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@		modules/bluetooth/backend-ofono.c
 
-@HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_140 = \
+@HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_142 = \
 @HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@		modules/bluetooth/backend-native.c
 
 subdir = src
@@ -519,6 +519,7 @@ am__installdirs = "$(DESTDIR)$(commonlibdir)" "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" \
 	"$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" \
+	"$(DESTDIR)$(gsettingsdataconvertdir)" \
 	"$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(systemduserunitdir)" \
 	"$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"
 LTLIBRARIES = $(commonlib_LTLIBRARIES) $(lib_LTLIBRARIES) \
@@ -908,7 +909,7 @@ libpulsecore_@PA_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \
-	libpulsecore-foreign.la $(am__append_51) $(am__DEPENDENCIES_7) \
+	libpulsecore-foreign.la $(am__append_52) $(am__DEPENDENCIES_7) \
 	$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_8) \
 	$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
 	$(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12)
@@ -1166,6 +1167,15 @@ module_always_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_always_sink_la_CFLAGS) $(CFLAGS) \
 	$(module_always_sink_la_LDFLAGS) $(LDFLAGS) -o $@
+module_always_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
+am_module_always_source_la_OBJECTS =  \
+	modules/module_always_source_la-module-always-source.lo
+module_always_source_la_OBJECTS =  \
+	$(am_module_always_source_la_OBJECTS)
+module_always_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(module_always_source_la_CFLAGS) $(CFLAGS) \
+	$(module_always_source_la_LDFLAGS) $(LDFLAGS) -o $@
 module_augment_properties_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_augment_properties_la_OBJECTS = modules/module_augment_properties_la-module-augment-properties.lo
 module_augment_properties_la_OBJECTS =  \
@@ -1240,14 +1250,13 @@ module_bluez5_discover_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_BLUEZ_5_TRUE@	$(modlibexecdir)
 module_bonjour_publish_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	libprotocol-native.la
-am_module_bonjour_publish_la_OBJECTS =  \
-	modules/macosx/module-bonjour-publish.lo
+am_module_bonjour_publish_la_OBJECTS = modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo
 module_bonjour_publish_la_OBJECTS =  \
 	$(am_module_bonjour_publish_la_OBJECTS)
 module_bonjour_publish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_bonjour_publish_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_bonjour_publish_la_CFLAGS) $(CFLAGS) \
+	$(module_bonjour_publish_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_BONJOUR_TRUE@am_module_bonjour_publish_la_rpath = -rpath \
 @HAVE_BONJOUR_TRUE@	$(modlibexecdir)
 module_card_restore_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
@@ -1281,25 +1290,27 @@ module_cli_protocol_unix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_AF_UNIX_TRUE@am_module_cli_protocol_unix_la_rpath = -rpath \
 @HAVE_AF_UNIX_TRUE@	$(modlibexecdir)
 module_cli_la_DEPENDENCIES = $(am__DEPENDENCIES_3) libcli.la
-am_module_cli_la_OBJECTS = modules/module-cli.lo
+am_module_cli_la_OBJECTS = modules/module_cli_la-module-cli.lo
 module_cli_la_OBJECTS = $(am_module_cli_la_OBJECTS)
 module_cli_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(module_cli_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(module_cli_la_CFLAGS) \
+	$(CFLAGS) $(module_cli_la_LDFLAGS) $(LDFLAGS) -o $@
 module_combine_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_combine_sink_la_OBJECTS = modules/module-combine-sink.lo
+am_module_combine_sink_la_OBJECTS =  \
+	modules/module_combine_sink_la-module-combine-sink.lo
 module_combine_sink_la_OBJECTS = $(am_module_combine_sink_la_OBJECTS)
 module_combine_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_combine_sink_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_combine_sink_la_CFLAGS) $(CFLAGS) \
+	$(module_combine_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 module_combine_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_combine_la_OBJECTS = modules/module-combine.lo
+am_module_combine_la_OBJECTS =  \
+	modules/module_combine_la-module-combine.lo
 module_combine_la_OBJECTS = $(am_module_combine_la_OBJECTS)
 module_combine_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_combine_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(module_combine_la_CFLAGS) $(CFLAGS) \
+	$(module_combine_la_LDFLAGS) $(LDFLAGS) -o $@
 module_console_kit_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1)
 am_module_console_kit_la_OBJECTS =  \
@@ -1312,25 +1323,23 @@ module_console_kit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_DBUS_TRUE@am_module_console_kit_la_rpath = -rpath \
 @HAVE_DBUS_TRUE@	$(modlibexecdir)
 module_coreaudio_detect_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_coreaudio_detect_la_OBJECTS =  \
-	modules/macosx/module-coreaudio-detect.lo
+am_module_coreaudio_detect_la_OBJECTS = modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo
 module_coreaudio_detect_la_OBJECTS =  \
 	$(am_module_coreaudio_detect_la_OBJECTS)
 module_coreaudio_detect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_coreaudio_detect_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_coreaudio_detect_la_CFLAGS) $(CFLAGS) \
+	$(module_coreaudio_detect_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_COREAUDIO_TRUE@am_module_coreaudio_detect_la_rpath = -rpath \
 @HAVE_COREAUDIO_TRUE@	$(modlibexecdir)
 module_coreaudio_device_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_coreaudio_device_la_OBJECTS =  \
-	modules/macosx/module-coreaudio-device.lo
+am_module_coreaudio_device_la_OBJECTS = modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo
 module_coreaudio_device_la_OBJECTS =  \
 	$(am_module_coreaudio_device_la_OBJECTS)
 module_coreaudio_device_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_coreaudio_device_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_coreaudio_device_la_CFLAGS) $(CFLAGS) \
+	$(module_coreaudio_device_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_COREAUDIO_TRUE@am_module_coreaudio_device_la_rpath = -rpath \
 @HAVE_COREAUDIO_TRUE@	$(modlibexecdir)
 module_dbus_protocol_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
@@ -1395,7 +1404,7 @@ module_device_restore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@	$(am__DEPENDENCIES_1)
 module_echo_cancel_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_13) $(am__DEPENDENCIES_10) \
-	$(am__append_138)
+	$(am__append_140)
 am__module_echo_cancel_la_SOURCES_DIST =  \
 	modules/echo-cancel/module-echo-cancel.c \
 	modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
@@ -1431,13 +1440,12 @@ module_equalizer_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_ESOUND_TRUE@	$(am__DEPENDENCIES_3)
 am__module_esound_compat_spawnfd_la_SOURCES_DIST =  \
 	modules/module-esound-compat-spawnfd.c
-@HAVE_ESOUND_TRUE@am_module_esound_compat_spawnfd_la_OBJECTS =  \
-@HAVE_ESOUND_TRUE@	modules/module-esound-compat-spawnfd.lo
+@HAVE_ESOUND_TRUE@am_module_esound_compat_spawnfd_la_OBJECTS = modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo
 module_esound_compat_spawnfd_la_OBJECTS =  \
 	$(am_module_esound_compat_spawnfd_la_OBJECTS)
 module_esound_compat_spawnfd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
+	$(module_esound_compat_spawnfd_la_CFLAGS) $(CFLAGS) \
 	$(module_esound_compat_spawnfd_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am_module_esound_compat_spawnfd_la_rpath =  \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@	-rpath $(modlibexecdir)
@@ -1445,13 +1453,12 @@ module_esound_compat_spawnfd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_ESOUND_TRUE@	$(am__DEPENDENCIES_3)
 am__module_esound_compat_spawnpid_la_SOURCES_DIST =  \
 	modules/module-esound-compat-spawnpid.c
-@HAVE_ESOUND_TRUE@am_module_esound_compat_spawnpid_la_OBJECTS =  \
-@HAVE_ESOUND_TRUE@	modules/module-esound-compat-spawnpid.lo
+@HAVE_ESOUND_TRUE@am_module_esound_compat_spawnpid_la_OBJECTS = modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo
 module_esound_compat_spawnpid_la_OBJECTS =  \
 	$(am_module_esound_compat_spawnpid_la_OBJECTS)
 module_esound_compat_spawnpid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
+	$(module_esound_compat_spawnpid_la_CFLAGS) $(CFLAGS) \
 	$(module_esound_compat_spawnpid_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am_module_esound_compat_spawnpid_la_rpath =  \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@	-rpath $(modlibexecdir)
@@ -1484,33 +1491,32 @@ module_esound_protocol_unix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_ESOUND_TRUE@module_esound_sink_la_DEPENDENCIES =  \
 @HAVE_ESOUND_TRUE@	$(am__DEPENDENCIES_3)
 am__module_esound_sink_la_SOURCES_DIST = modules/module-esound-sink.c
-@HAVE_ESOUND_TRUE@am_module_esound_sink_la_OBJECTS =  \
-@HAVE_ESOUND_TRUE@	modules/module-esound-sink.lo
+@HAVE_ESOUND_TRUE@am_module_esound_sink_la_OBJECTS = modules/module_esound_sink_la-module-esound-sink.lo
 module_esound_sink_la_OBJECTS = $(am_module_esound_sink_la_OBJECTS)
 module_esound_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_esound_sink_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_esound_sink_la_CFLAGS) $(CFLAGS) \
+	$(module_esound_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ESOUND_TRUE@am_module_esound_sink_la_rpath = -rpath \
 @HAVE_ESOUND_TRUE@	$(modlibexecdir)
 module_filter_apply_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_filter_apply_la_OBJECTS = modules/module-filter-apply.lo
+am_module_filter_apply_la_OBJECTS =  \
+	modules/module_filter_apply_la-module-filter-apply.lo
 module_filter_apply_la_OBJECTS = $(am_module_filter_apply_la_OBJECTS)
 module_filter_apply_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_filter_apply_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_filter_apply_la_CFLAGS) $(CFLAGS) \
+	$(module_filter_apply_la_LDFLAGS) $(LDFLAGS) -o $@
 module_filter_heuristics_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_filter_heuristics_la_OBJECTS =  \
-	modules/module-filter-heuristics.lo
+am_module_filter_heuristics_la_OBJECTS = modules/module_filter_heuristics_la-module-filter-heuristics.lo
 module_filter_heuristics_la_OBJECTS =  \
 	$(am_module_filter_heuristics_la_OBJECTS)
 module_filter_heuristics_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_filter_heuristics_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_filter_heuristics_la_CFLAGS) $(CFLAGS) \
+	$(module_filter_heuristics_la_LDFLAGS) $(LDFLAGS) -o $@
 module_gconf_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_gconf_la_OBJECTS =  \
+am_module_gconf_la_OBJECTS = modules/module_gconf_la-stdin-util.lo \
 	modules/gconf/module_gconf_la-module-gconf.lo
 module_gconf_la_OBJECTS = $(am_module_gconf_la_OBJECTS)
 module_gconf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1518,6 +1524,17 @@ module_gconf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(module_gconf_la_CFLAGS) $(CFLAGS) $(module_gconf_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @HAVE_GCONF_TRUE@am_module_gconf_la_rpath = -rpath $(modlibexecdir)
+module_gsettings_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
+am_module_gsettings_la_OBJECTS =  \
+	modules/module_gsettings_la-stdin-util.lo \
+	modules/gsettings/module_gsettings_la-module-gsettings.lo
+module_gsettings_la_OBJECTS = $(am_module_gsettings_la_OBJECTS)
+module_gsettings_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(module_gsettings_la_CFLAGS) $(CFLAGS) \
+	$(module_gsettings_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_GSETTINGS_TRUE@am_module_gsettings_la_rpath = -rpath \
+@HAVE_GSETTINGS_TRUE@	$(modlibexecdir)
 module_hal_detect_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_hal_detect_la_OBJECTS =  \
 	modules/module_hal_detect_la-module-hal-detect-compat.lo
@@ -1610,19 +1627,20 @@ module_lirc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
 @HAVE_LIRC_TRUE@am_module_lirc_la_rpath = -rpath $(modlibexecdir)
 module_loopback_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_loopback_la_OBJECTS = modules/module-loopback.lo
+am_module_loopback_la_OBJECTS =  \
+	modules/module_loopback_la-module-loopback.lo
 module_loopback_la_OBJECTS = $(am_module_loopback_la_OBJECTS)
 module_loopback_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_loopback_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_loopback_la_CFLAGS) $(CFLAGS) \
+	$(module_loopback_la_LDFLAGS) $(LDFLAGS) -o $@
 module_match_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_match_la_OBJECTS = modules/module-match.lo
+am_module_match_la_OBJECTS = modules/module_match_la-module-match.lo
 module_match_la_OBJECTS = $(am_module_match_la_OBJECTS)
 module_match_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_match_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(module_match_la_CFLAGS) $(CFLAGS) $(module_match_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @HAVE_REGEX_TRUE@am_module_match_la_rpath = -rpath $(modlibexecdir)
 module_mmkbd_evdev_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_mmkbd_evdev_la_OBJECTS =  \
@@ -1665,42 +1683,46 @@ module_native_protocol_unix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_AF_UNIX_TRUE@am_module_native_protocol_unix_la_rpath = -rpath \
 @HAVE_AF_UNIX_TRUE@	$(modlibexecdir)
 module_null_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_null_sink_la_OBJECTS = modules/module-null-sink.lo
+am_module_null_sink_la_OBJECTS =  \
+	modules/module_null_sink_la-module-null-sink.lo
 module_null_sink_la_OBJECTS = $(am_module_null_sink_la_OBJECTS)
 module_null_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_null_sink_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_null_sink_la_CFLAGS) $(CFLAGS) \
+	$(module_null_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 module_null_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_null_source_la_OBJECTS = modules/module-null-source.lo
+am_module_null_source_la_OBJECTS =  \
+	modules/module_null_source_la-module-null-source.lo
 module_null_source_la_OBJECTS = $(am_module_null_source_la_OBJECTS)
 module_null_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_null_source_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_null_source_la_CFLAGS) $(CFLAGS) \
+	$(module_null_source_la_LDFLAGS) $(LDFLAGS) -o $@
 module_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_3) liboss-util.la
-am_module_oss_la_OBJECTS = modules/oss/module-oss.lo
+am_module_oss_la_OBJECTS = modules/oss/module_oss_la-module-oss.lo
 module_oss_la_OBJECTS = $(am_module_oss_la_OBJECTS)
 module_oss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(module_oss_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(module_oss_la_CFLAGS) \
+	$(CFLAGS) $(module_oss_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_OSS_OUTPUT_TRUE@am_module_oss_la_rpath = -rpath $(modlibexecdir)
 module_pipe_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_pipe_sink_la_OBJECTS = modules/module-pipe-sink.lo
+am_module_pipe_sink_la_OBJECTS =  \
+	modules/module_pipe_sink_la-module-pipe-sink.lo
 module_pipe_sink_la_OBJECTS = $(am_module_pipe_sink_la_OBJECTS)
 module_pipe_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_pipe_sink_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_pipe_sink_la_CFLAGS) $(CFLAGS) \
+	$(module_pipe_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MKFIFO_TRUE@am_module_pipe_sink_la_rpath = -rpath \
 @HAVE_MKFIFO_TRUE@	$(modlibexecdir)
 module_pipe_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_pipe_source_la_OBJECTS = modules/module-pipe-source.lo
+am_module_pipe_source_la_OBJECTS =  \
+	modules/module_pipe_source_la-module-pipe-source.lo
 module_pipe_source_la_OBJECTS = $(am_module_pipe_source_la_OBJECTS)
 module_pipe_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_pipe_source_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_pipe_source_la_CFLAGS) $(CFLAGS) \
+	$(module_pipe_source_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MKFIFO_TRUE@am_module_pipe_source_la_rpath = -rpath \
 @HAVE_MKFIFO_TRUE@	$(modlibexecdir)
 module_position_event_sounds_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
@@ -1736,19 +1758,21 @@ module_raop_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am_module_raop_sink_la_rpath =  \
 @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@	-rpath $(modlibexecdir)
 module_remap_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_remap_sink_la_OBJECTS = modules/module-remap-sink.lo
+am_module_remap_sink_la_OBJECTS =  \
+	modules/module_remap_sink_la-module-remap-sink.lo
 module_remap_sink_la_OBJECTS = $(am_module_remap_sink_la_OBJECTS)
 module_remap_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_remap_sink_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_remap_sink_la_CFLAGS) $(CFLAGS) \
+	$(module_remap_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 module_remap_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_remap_source_la_OBJECTS = modules/module-remap-source.lo
+am_module_remap_source_la_OBJECTS =  \
+	modules/module_remap_source_la-module-remap-source.lo
 module_remap_source_la_OBJECTS = $(am_module_remap_source_la_OBJECTS)
 module_remap_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_remap_source_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_remap_source_la_CFLAGS) $(CFLAGS) \
+	$(module_remap_source_la_LDFLAGS) $(LDFLAGS) -o $@
 module_rescue_streams_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_rescue_streams_la_OBJECTS =  \
 	modules/module_rescue_streams_la-module-rescue-streams.lo
@@ -1829,26 +1853,28 @@ module_simple_protocol_unix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_AF_UNIX_TRUE@am_module_simple_protocol_unix_la_rpath = -rpath \
 @HAVE_AF_UNIX_TRUE@	$(modlibexecdir)
 module_sine_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_sine_source_la_OBJECTS = modules/module-sine-source.lo
+am_module_sine_source_la_OBJECTS =  \
+	modules/module_sine_source_la-module-sine-source.lo
 module_sine_source_la_OBJECTS = $(am_module_sine_source_la_OBJECTS)
 module_sine_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_sine_source_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_sine_source_la_CFLAGS) $(CFLAGS) \
+	$(module_sine_source_la_LDFLAGS) $(LDFLAGS) -o $@
 module_sine_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_sine_la_OBJECTS = modules/module-sine.lo
+am_module_sine_la_OBJECTS = modules/module_sine_la-module-sine.lo
 module_sine_la_OBJECTS = $(am_module_sine_la_OBJECTS)
 module_sine_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_sine_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
+	$(module_sine_la_CFLAGS) $(CFLAGS) $(module_sine_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 module_solaris_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_solaris_la_OBJECTS = modules/module-solaris.lo
+am_module_solaris_la_OBJECTS =  \
+	modules/module_solaris_la-module-solaris.lo
 module_solaris_la_OBJECTS = $(am_module_solaris_la_OBJECTS)
 module_solaris_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_solaris_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(module_solaris_la_CFLAGS) $(CFLAGS) \
+	$(module_solaris_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SOLARIS_TRUE@am_module_solaris_la_rpath = -rpath \
 @HAVE_SOLARIS_TRUE@	$(modlibexecdir)
 module_stream_restore_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
@@ -1871,23 +1897,21 @@ module_suspend_on_idle_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(module_suspend_on_idle_la_CFLAGS) $(CFLAGS) \
 	$(module_suspend_on_idle_la_LDFLAGS) $(LDFLAGS) -o $@
 module_switch_on_connect_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_switch_on_connect_la_OBJECTS =  \
-	modules/module-switch-on-connect.lo
+am_module_switch_on_connect_la_OBJECTS = modules/module_switch_on_connect_la-module-switch-on-connect.lo
 module_switch_on_connect_la_OBJECTS =  \
 	$(am_module_switch_on_connect_la_OBJECTS)
 module_switch_on_connect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_switch_on_connect_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_switch_on_connect_la_CFLAGS) $(CFLAGS) \
+	$(module_switch_on_connect_la_LDFLAGS) $(LDFLAGS) -o $@
 module_switch_on_port_available_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_3)
-am_module_switch_on_port_available_la_OBJECTS =  \
-	modules/module-switch-on-port-available.lo
+am_module_switch_on_port_available_la_OBJECTS = modules/module_switch_on_port_available_la-module-switch-on-port-available.lo
 module_switch_on_port_available_la_OBJECTS =  \
 	$(am_module_switch_on_port_available_la_OBJECTS)
 module_switch_on_port_available_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(CCLD) $(module_switch_on_port_available_la_CFLAGS) $(CFLAGS) \
 	$(module_switch_on_port_available_la_LDFLAGS) $(LDFLAGS) -o $@
 module_systemd_login_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -1903,13 +1927,13 @@ module_systemd_login_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_SYSTEMD_LOGIN_TRUE@	$(modlibexecdir)
 module_tunnel_sink_new_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_tunnel_sink_new_la_OBJECTS =  \
-	modules/module-tunnel-sink-new.lo
+	modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo
 module_tunnel_sink_new_la_OBJECTS =  \
 	$(am_module_tunnel_sink_new_la_OBJECTS)
 module_tunnel_sink_new_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_tunnel_sink_new_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_tunnel_sink_new_la_CFLAGS) $(CFLAGS) \
+	$(module_tunnel_sink_new_la_LDFLAGS) $(LDFLAGS) -o $@
 module_tunnel_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1)
 am_module_tunnel_sink_la_OBJECTS =  \
@@ -1920,23 +1944,23 @@ module_tunnel_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(module_tunnel_sink_la_CFLAGS) $(CFLAGS) \
 	$(module_tunnel_sink_la_LDFLAGS) $(LDFLAGS) -o $@
 module_tunnel_source_new_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_module_tunnel_source_new_la_OBJECTS =  \
-	modules/module-tunnel-source-new.lo
+am_module_tunnel_source_new_la_OBJECTS = modules/module_tunnel_source_new_la-module-tunnel-source-new.lo
 module_tunnel_source_new_la_OBJECTS =  \
 	$(am_module_tunnel_source_new_la_OBJECTS)
 module_tunnel_source_new_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_tunnel_source_new_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_tunnel_source_new_la_CFLAGS) $(CFLAGS) \
+	$(module_tunnel_source_new_la_LDFLAGS) $(LDFLAGS) -o $@
 module_tunnel_source_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1)
-am_module_tunnel_source_la_OBJECTS = modules/module-tunnel.lo
+am_module_tunnel_source_la_OBJECTS =  \
+	modules/module_tunnel_source_la-module-tunnel.lo
 module_tunnel_source_la_OBJECTS =  \
 	$(am_module_tunnel_source_la_OBJECTS)
 module_tunnel_source_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_tunnel_source_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(module_tunnel_source_la_CFLAGS) $(CFLAGS) \
+	$(module_tunnel_source_la_LDFLAGS) $(LDFLAGS) -o $@
 module_udev_detect_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1)
 am_module_udev_detect_la_OBJECTS =  \
@@ -2096,6 +2120,7 @@ am__EXEEXT_13 = ipacl-test$(EXEEXT) mcalign-test$(EXEEXT) \
 am__EXEEXT_14 = connect-stress$(EXEEXT) extended-test$(EXEEXT) \
 	interpol-test$(EXEEXT) sync-playback$(EXEEXT)
 @HAVE_GCONF_TRUE@am__EXEEXT_15 = gconf-helper$(EXEEXT)
+@HAVE_GSETTINGS_TRUE@am__EXEEXT_16 = gsettings-helper$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pulselibexec_PROGRAMS)
 am_alsa_mixer_path_test_OBJECTS =  \
 	tests/alsa_mixer_path_test-alsa-mixer-path-test.$(OBJEXT)
@@ -2244,7 +2269,7 @@ nodist_echo_cancel_test_OBJECTS = $(am__objects_28)
 echo_cancel_test_OBJECTS = $(am_echo_cancel_test_OBJECTS) \
 	$(nodist_echo_cancel_test_OBJECTS)
 am__DEPENDENCIES_14 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_13) \
-	$(am__DEPENDENCIES_10) $(am__append_138)
+	$(am__DEPENDENCIES_10) $(am__append_140)
 echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_14)
 echo_cancel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2292,6 +2317,17 @@ get_binary_name_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(get_binary_name_test_CFLAGS) $(CFLAGS) \
 	$(get_binary_name_test_LDFLAGS) $(LDFLAGS) -o $@
+am_gsettings_helper_OBJECTS =  \
+	modules/gsettings/gsettings_helper-gsettings-helper.$(OBJEXT)
+gsettings_helper_OBJECTS = $(am_gsettings_helper_OBJECTS)
+gsettings_helper_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libpulsecore-@PA_MAJORMINOR@.la \
+	libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \
+	$(am__DEPENDENCIES_1)
+gsettings_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(gsettings_helper_CFLAGS) $(CFLAGS) \
+	$(gsettings_helper_LDFLAGS) $(LDFLAGS) -o $@
 am_gtk_test_OBJECTS = tests/gtk_test-gtk-test.$(OBJEXT)
 gtk_test_OBJECTS = $(am_gtk_test_OBJECTS)
 gtk_test_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -2727,6 +2763,7 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(module_alsa_card_la_SOURCES) $(module_alsa_sink_la_SOURCES) \
 	$(module_alsa_source_la_SOURCES) \
 	$(module_always_sink_la_SOURCES) \
+	$(module_always_source_la_SOURCES) \
 	$(module_augment_properties_la_SOURCES) \
 	$(module_bluetooth_discover_la_SOURCES) \
 	$(module_bluetooth_policy_la_SOURCES) \
@@ -2757,7 +2794,8 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(module_esound_sink_la_SOURCES) \
 	$(module_filter_apply_la_SOURCES) \
 	$(module_filter_heuristics_la_SOURCES) \
-	$(module_gconf_la_SOURCES) $(module_hal_detect_la_SOURCES) \
+	$(module_gconf_la_SOURCES) $(module_gsettings_la_SOURCES) \
+	$(module_hal_detect_la_SOURCES) \
 	$(module_http_protocol_tcp_la_SOURCES) \
 	$(module_http_protocol_unix_la_SOURCES) \
 	$(module_intended_roles_la_SOURCES) \
@@ -2816,27 +2854,27 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(echo_cancel_test_SOURCES) $(nodist_echo_cancel_test_SOURCES) \
 	$(extended_test_SOURCES) $(flist_test_SOURCES) \
 	$(format_test_SOURCES) $(gconf_helper_SOURCES) \
-	$(get_binary_name_test_SOURCES) $(gtk_test_SOURCES) \
-	$(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
-	$(ipacl_test_SOURCES) $(json_test_SOURCES) \
-	$(lfe_filter_test_SOURCES) $(lo_latency_test_SOURCES) \
-	$(lock_autospawn_test_SOURCES) $(mainloop_test_SOURCES) \
-	$(mainloop_test_glib_SOURCES) $(mcalign_test_SOURCES) \
-	$(memblock_test_SOURCES) $(memblockq_test_SOURCES) \
-	$(mix_test_SOURCES) $(mult_s16_test_SOURCES) \
-	$(once_test_SOURCES) $(pacat_SOURCES) $(pacat_simple_SOURCES) \
-	$(pacmd_SOURCES) $(pactl_SOURCES) $(parec_simple_SOURCES) \
-	$(pasuspender_SOURCES) $(pax11publish_SOURCES) \
-	$(proplist_test_SOURCES) $(pulseaudio_SOURCES) \
-	$(queue_test_SOURCES) $(remix_test_SOURCES) \
-	$(resampler_test_SOURCES) $(rtpoll_test_SOURCES) \
-	$(rtstutter_SOURCES) $(sig2str_test_SOURCES) \
-	$(sigbus_test_SOURCES) $(smoother_test_SOURCES) \
-	$(srbchannel_test_SOURCES) $(stripnul_SOURCES) \
-	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
-	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
-	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
-	$(volume_test_SOURCES)
+	$(get_binary_name_test_SOURCES) $(gsettings_helper_SOURCES) \
+	$(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
+	$(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
+	$(json_test_SOURCES) $(lfe_filter_test_SOURCES) \
+	$(lo_latency_test_SOURCES) $(lock_autospawn_test_SOURCES) \
+	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
+	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
+	$(memblockq_test_SOURCES) $(mix_test_SOURCES) \
+	$(mult_s16_test_SOURCES) $(once_test_SOURCES) $(pacat_SOURCES) \
+	$(pacat_simple_SOURCES) $(pacmd_SOURCES) $(pactl_SOURCES) \
+	$(parec_simple_SOURCES) $(pasuspender_SOURCES) \
+	$(pax11publish_SOURCES) $(proplist_test_SOURCES) \
+	$(pulseaudio_SOURCES) $(queue_test_SOURCES) \
+	$(remix_test_SOURCES) $(resampler_test_SOURCES) \
+	$(rtpoll_test_SOURCES) $(rtstutter_SOURCES) \
+	$(sig2str_test_SOURCES) $(sigbus_test_SOURCES) \
+	$(smoother_test_SOURCES) $(srbchannel_test_SOURCES) \
+	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
+	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
+	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
+	$(utf8_test_SOURCES) $(volume_test_SOURCES)
 DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(libavahi_wrap_la_SOURCES) $(libbluez4_util_la_SOURCES) \
 	$(am__libbluez5_util_la_SOURCES_DIST) $(libcli_la_SOURCES) \
@@ -2860,6 +2898,7 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(module_alsa_card_la_SOURCES) $(module_alsa_sink_la_SOURCES) \
 	$(module_alsa_source_la_SOURCES) \
 	$(module_always_sink_la_SOURCES) \
+	$(module_always_source_la_SOURCES) \
 	$(module_augment_properties_la_SOURCES) \
 	$(module_bluetooth_discover_la_SOURCES) \
 	$(module_bluetooth_policy_la_SOURCES) \
@@ -2889,7 +2928,8 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(am__module_esound_sink_la_SOURCES_DIST) \
 	$(module_filter_apply_la_SOURCES) \
 	$(module_filter_heuristics_la_SOURCES) \
-	$(module_gconf_la_SOURCES) $(module_hal_detect_la_SOURCES) \
+	$(module_gconf_la_SOURCES) $(module_gsettings_la_SOURCES) \
+	$(module_hal_detect_la_SOURCES) \
 	$(module_http_protocol_tcp_la_SOURCES) \
 	$(module_http_protocol_unix_la_SOURCES) \
 	$(module_intended_roles_la_SOURCES) \
@@ -2948,26 +2988,27 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(am__echo_cancel_test_SOURCES_DIST) $(extended_test_SOURCES) \
 	$(flist_test_SOURCES) $(format_test_SOURCES) \
 	$(gconf_helper_SOURCES) $(get_binary_name_test_SOURCES) \
-	$(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
-	$(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
-	$(json_test_SOURCES) $(lfe_filter_test_SOURCES) \
-	$(lo_latency_test_SOURCES) $(lock_autospawn_test_SOURCES) \
-	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
-	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
-	$(memblockq_test_SOURCES) $(mix_test_SOURCES) \
-	$(mult_s16_test_SOURCES) $(once_test_SOURCES) $(pacat_SOURCES) \
-	$(pacat_simple_SOURCES) $(pacmd_SOURCES) $(pactl_SOURCES) \
-	$(parec_simple_SOURCES) $(pasuspender_SOURCES) \
-	$(pax11publish_SOURCES) $(proplist_test_SOURCES) \
-	$(am__pulseaudio_SOURCES_DIST) $(queue_test_SOURCES) \
-	$(remix_test_SOURCES) $(resampler_test_SOURCES) \
-	$(rtpoll_test_SOURCES) $(rtstutter_SOURCES) \
-	$(sig2str_test_SOURCES) $(sigbus_test_SOURCES) \
-	$(smoother_test_SOURCES) $(srbchannel_test_SOURCES) \
-	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
-	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
-	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
-	$(utf8_test_SOURCES) $(volume_test_SOURCES)
+	$(gsettings_helper_SOURCES) $(gtk_test_SOURCES) \
+	$(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
+	$(ipacl_test_SOURCES) $(json_test_SOURCES) \
+	$(lfe_filter_test_SOURCES) $(lo_latency_test_SOURCES) \
+	$(lock_autospawn_test_SOURCES) $(mainloop_test_SOURCES) \
+	$(mainloop_test_glib_SOURCES) $(mcalign_test_SOURCES) \
+	$(memblock_test_SOURCES) $(memblockq_test_SOURCES) \
+	$(mix_test_SOURCES) $(mult_s16_test_SOURCES) \
+	$(once_test_SOURCES) $(pacat_SOURCES) $(pacat_simple_SOURCES) \
+	$(pacmd_SOURCES) $(pactl_SOURCES) $(parec_simple_SOURCES) \
+	$(pasuspender_SOURCES) $(pax11publish_SOURCES) \
+	$(proplist_test_SOURCES) $(am__pulseaudio_SOURCES_DIST) \
+	$(queue_test_SOURCES) $(remix_test_SOURCES) \
+	$(resampler_test_SOURCES) $(rtpoll_test_SOURCES) \
+	$(rtstutter_SOURCES) $(sig2str_test_SOURCES) \
+	$(sigbus_test_SOURCES) $(smoother_test_SOURCES) \
+	$(srbchannel_test_SOURCES) $(stripnul_SOURCES) \
+	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
+	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
+	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
+	$(volume_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -2999,6 +3040,7 @@ am__dist_alsapaths_DATA_DIST =  \
 	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-input.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 \
@@ -3007,7 +3049,10 @@ am__dist_alsapaths_DATA_DIST =  \
 	modules/alsa/mixer/paths/hdmi-output-4.conf \
 	modules/alsa/mixer/paths/hdmi-output-5.conf \
 	modules/alsa/mixer/paths/hdmi-output-6.conf \
-	modules/alsa/mixer/paths/hdmi-output-7.conf
+	modules/alsa/mixer/paths/hdmi-output-7.conf \
+	modules/alsa/mixer/paths/steelseries-arctis-input.conf \
+	modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf \
+	modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
 am__dist_alsaprofilesets_DATA_DIST =  \
 	modules/alsa/mixer/profile-sets/default.conf \
 	modules/alsa/mixer/profile-sets/force-speaker.conf \
@@ -3021,12 +3066,15 @@ am__dist_alsaprofilesets_DATA_DIST =  \
 	modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \
 	modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
 	modules/alsa/mixer/profile-sets/kinect-audio.conf \
-	modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
+	modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \
+	modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf \
+	modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
 am__dist_udevrules_DATA_DIST =  \
 	modules/alsa/mixer/profile-sets/90-pulseaudio.rules
 DATA = $(dbuspolicy_DATA) $(dist_alsapaths_DATA) \
 	$(dist_alsaprofilesets_DATA) $(dist_udevrules_DATA) \
-	$(pulseconf_DATA) $(systemduserunit_DATA) $(xdgautostart_DATA)
+	$(gsettingsdataconvert_DATA) $(pulseconf_DATA) \
+	$(systemduserunit_DATA) $(xdgautostart_DATA)
 am__pulseinclude_HEADERS_DIST = pulse/cdecl.h pulse/channelmap.h \
 	pulse/context.h pulse/def.h pulse/direction.h pulse/error.h \
 	pulse/ext-device-manager.h pulse/ext-device-restore.h \
@@ -3298,9 +3346,13 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB20_CFLAGS = @GLIB20_CFLAGS@
 GLIB20_LIBS = @GLIB20_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
+GSETTINGS_LIBS = @GSETTINGS_LIBS@
 GTK30_CFLAGS = @GTK30_CFLAGS@
 GTK30_LIBS = @GTK30_LIBS@
 HAVE_AF_UNIX = @HAVE_AF_UNIX@
@@ -3314,7 +3366,9 @@ HAVE_BLUEZ_5_OFONO_HEADSET = @HAVE_BLUEZ_5_OFONO_HEADSET@
 HAVE_COREAUDIO = @HAVE_COREAUDIO@
 HAVE_CXX11 = @HAVE_CXX11@
 HAVE_DBUS = @HAVE_DBUS@
+HAVE_GCONF = @HAVE_GCONF@
 HAVE_GLIB20 = @HAVE_GLIB20@
+HAVE_GSETTINGS = @HAVE_GSETTINGS@
 HAVE_MEMFD = @HAVE_MEMFD@
 HAVE_MKFIFO = @HAVE_MKFIFO@
 HAVE_NEON = @HAVE_NEON@
@@ -3493,6 +3547,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -3536,6 +3591,7 @@ pulselibexecdir = $(libexecdir)/pulse
 @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
 @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
 @HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d
+@HAVE_GSETTINGS_TRUE@gsettingsdataconvertdir = $(datadir)/GConf/gsettings
 
 ###################################
 #     Compiler/linker flags       #
@@ -3573,11 +3629,12 @@ EXTRA_DIST = pulse/client.conf.in pulse/version.h.in \
 	daemon/esdcompat.in daemon/start-pulseaudio-x11.in \
 	daemon/systemd/user/pulseaudio.service.in \
 	daemon/systemd/user/pulseaudio.socket utils/padsp.in \
-	utils/qpaeq modules/module-defs.h.m4 \
-	daemon/pulseaudio.desktop.in map-file \
+	utils/qpaeq daemon/pulseaudio.desktop.in map-file \
 	daemon/pulseaudio-system.conf \
-	modules/echo-cancel/adrian-license.txt $(addsuffix \
-	.orc,$(ORC_SOURCE)) $(SYMDEF_FILES)
+	modules/echo-cancel/adrian-license.txt \
+	modules/gsettings/org.freedesktop.pulseaudio.gschema.xml \
+	modules/gsettings/pulseaudio.convert $(addsuffix \
+	.orc,$(ORC_SOURCE))
 pulseconf_DATA = \
 		default.pa \
 		system.pa \
@@ -3595,12 +3652,12 @@ pulseconf_DATA = \
 ###################################
 #          Includes               #
 ###################################
-BUILT_SOURCES = $(am__append_6) $(SYMDEF_FILES) builddirs
+BUILT_SOURCES = $(am__append_6)
 
 ###################################
 #        Some minor stuff         #
 ###################################
-CLEANFILES = $(am__append_7) $(am__append_49) \
+CLEANFILES = $(am__append_7) $(am__append_50) \
 	daemon/pulseaudio.desktop
 @HAVE_ORC_TRUE@ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE))
 @HAVE_ORC_TRUE@ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE))
@@ -3610,7 +3667,7 @@ CLEANFILES = $(am__append_7) $(am__append_49) \
 @HAVE_ORC_TRUE@cp_v_gen = $(cp_v_gen_$(V))
 @HAVE_ORC_TRUE@cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
 @HAVE_ORC_TRUE@cp_v_gen_0 = @echo "  CP     $@";
-ORC_SOURCE = pulsecore/svolume $(am__append_131)
+ORC_SOURCE = pulsecore/svolume $(am__append_133)
 pulseaudio_SOURCES = daemon/caps.c daemon/caps.h daemon/cmdline.c \
 	daemon/cmdline.h daemon/cpulimit.c daemon/cpulimit.h \
 	daemon/daemon-conf.c daemon/daemon-conf.h daemon/dumpmodules.c \
@@ -3637,8 +3694,8 @@ pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJ
 ###################################
 #       Utility programs          #
 ###################################
-bin_SCRIPTS = esdcompat $(am__append_16) $(am__append_48) \
-	$(am__append_115)
+bin_SCRIPTS = $(am__append_13) $(am__append_17) $(am__append_49) \
+	$(am__append_118)
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -3669,7 +3726,7 @@ pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 ###################################
 
 # We split the foreign code off to not be annoyed by warnings we don't care about
-noinst_LTLIBRARIES = liblo-test-util.la $(am__append_50) \
+noinst_LTLIBRARIES = liblo-test-util.la $(am__append_51) \
 	libpulsecore-foreign.la
 TESTS_default = core-util-test mainloop-test strlist-test close-test \
 	memblockq-test channelmap-test thread-mainloop-test utf8-test \
@@ -3678,13 +3735,13 @@ TESTS_default = core-util-test mainloop-test strlist-test close-test \
 	rtpoll-test resampler-test smoother-test thread-test \
 	volume-test mix-test proplist-test cpu-mix-test cpu-remap-test \
 	cpu-sconv-test cpu-volume-test lock-autospawn-test \
-	mult-s16-test lfe-filter-test $(am__append_17) \
-	$(am__append_18) $(am__append_19) $(am__append_21) \
-	$(am__append_24)
+	mult-s16-test lfe-filter-test $(am__append_18) \
+	$(am__append_19) $(am__append_20) $(am__append_22) \
+	$(am__append_25)
 TESTS_norun = ipacl-test mcalign-test pacat-simple parec-simple \
 	flist-test remix-test rtstutter sig2str-test stripnul \
-	echo-cancel-test lo-latency-test $(am__append_20) \
-	$(am__append_22) $(am__append_23)
+	echo-cancel-test lo-latency-test $(am__append_21) \
+	$(am__append_23) $(am__append_24)
 
 # These tests need a running pulseaudio daemon
 TESTS_daemon = \
@@ -3988,22 +4045,22 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
 	pulsecore/time-smoother.h pulsecore/tokenizer.c \
 	pulsecore/tokenizer.h pulsecore/usergroup.c \
 	pulsecore/usergroup.h pulsecore/sndfile-util.c \
-	pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_25) \
-	$(am__append_26) $(am__append_27) $(am__append_28) \
-	$(am__append_35) $(am__append_36) $(am__append_37) \
-	$(am__append_40) $(am__append_41)
+	pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_26) \
+	$(am__append_27) $(am__append_28) $(am__append_29) \
+	$(am__append_36) $(am__append_37) $(am__append_38) \
+	$(am__append_41) $(am__append_42)
 
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) \
-	$(LIBSNDFILE_CFLAGS) $(am__append_29) $(am__append_31) \
-	$(am__append_33) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \
-	$(am__append_38) $(am__append_42)
+	$(LIBSNDFILE_CFLAGS) $(am__append_30) $(am__append_32) \
+	$(am__append_34) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \
+	$(am__append_39) $(am__append_43)
 libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \
-	$(AM_LIBLDFLAGS) -avoid-version $(am__append_30) \
-	$(am__append_32) $(am__append_34)
+	$(AM_LIBLDFLAGS) -avoid-version $(am__append_31) \
+	$(am__append_33) $(am__append_35)
 libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \
 	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
-	$(LIBSNDFILE_LIBS) $(am__append_39) $(am__append_43)
+	$(LIBSNDFILE_LIBS) $(am__append_40) $(am__append_44)
 
 ###################################
 #         Client library          #
@@ -4018,8 +4075,8 @@ pulseinclude_HEADERS = pulse/cdecl.h pulse/channelmap.h \
 	pulse/sample.h pulse/scache.h pulse/simple.h pulse/stream.h \
 	pulse/subscribe.h pulse/thread-mainloop.h pulse/timeval.h \
 	pulse/utf8.h pulse/util.h pulse/version.h pulse/volume.h \
-	pulse/xmalloc.h $(am__append_44)
-lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_45)
+	pulse/xmalloc.h $(am__append_45)
+lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_46)
 
 # Public interface
 libpulse_la_SOURCES = \
@@ -4054,9 +4111,9 @@ libpulse_la_SOURCES = \
 		pulse/volume.c pulse/volume.h \
 		pulse/xmalloc.c pulse/xmalloc.h
 
-libpulse_la_CFLAGS = $(AM_CFLAGS) $(am__append_46)
+libpulse_la_CFLAGS = $(AM_CFLAGS) $(am__append_47)
 libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) \
-	libpulsecommon-@PA_MAJORMINOR@.la $(am__append_47)
+	libpulsecommon-@PA_MAJORMINOR@.la $(am__append_48)
 libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
 libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
 libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
@@ -4128,23 +4185,23 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES =  \
 	pulsecore/source-output.c pulsecore/source-output.h \
 	pulsecore/source.c pulsecore/source.h pulsecore/start-child.c \
 	pulsecore/start-child.h pulsecore/thread-mq.c \
-	pulsecore/thread-mq.h pulsecore/database.h $(am__append_52) \
-	$(am__append_55) $(am__append_58) $(am__append_61) \
-	$(am__append_64) $(am__append_67) $(am__append_68) \
-	$(am__append_71) $(am__append_74)
-libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_53) \
+	pulsecore/thread-mq.h pulsecore/database.h $(am__append_53) \
 	$(am__append_56) $(am__append_59) $(am__append_62) \
-	$(am__append_65) $(am__append_69) $(am__append_72) \
-	$(am__append_75)
+	$(am__append_65) $(am__append_68) $(am__append_69) \
+	$(am__append_72) $(am__append_75)
+libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
+	$(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_54) \
+	$(am__append_57) $(am__append_60) $(am__append_63) \
+	$(am__append_66) $(am__append_70) $(am__append_73) \
+	$(am__append_76)
 libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \
-	$(AM_LIBLDFLAGS) -avoid-version $(am__append_57)
+	$(AM_LIBLDFLAGS) -avoid-version $(am__append_58)
 libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) \
 	$(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
 	libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \
-	libpulsecore-foreign.la $(am__append_51) $(am__append_54) \
-	$(am__append_60) $(am__append_63) $(am__append_66) \
-	$(am__append_70) $(am__append_73) $(am__append_76)
+	libpulsecore-foreign.la $(am__append_52) $(am__append_55) \
+	$(am__append_61) $(am__append_64) $(am__append_67) \
+	$(am__append_71) $(am__append_74) $(am__append_77)
 @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_SOURCES = pulsecore/sconv_neon.c
 @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
 @HAVE_NEON_TRUE@libpulsecore_mix_neon_la_SOURCES = pulsecore/mix_neon.c
@@ -4167,20 +4224,20 @@ libpulsecore_foreign_la_CFLAGS = $(AM_CFLAGS) $(FOREIGN_CFLAGS)
 ### the head, and not the other way!
 modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
 	libprotocol-simple.la libprotocol-http.la \
-	libprotocol-native.la $(am__append_77) $(am__append_78) \
-	$(am__append_79) $(am__append_80) $(am__append_83) \
+	libprotocol-native.la $(am__append_78) $(am__append_79) \
+	$(am__append_80) $(am__append_81) $(am__append_84) \
 	module-cli.la 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 module-device-manager.la \
 	module-device-restore.la module-stream-restore.la \
 	module-card-restore.la module-default-device-restore.la \
-	module-always-sink.la module-rescue-streams.la \
-	module-intended-roles.la module-suspend-on-idle.la \
-	module-echo-cancel.la module-http-protocol-tcp.la \
-	module-sine.la module-native-protocol-tcp.la \
-	module-native-protocol-fd.la module-combine.la \
-	module-combine-sink.la module-remap-sink.la \
+	module-always-sink.la module-always-source.la \
+	module-rescue-streams.la module-intended-roles.la \
+	module-suspend-on-idle.la module-echo-cancel.la \
+	module-http-protocol-tcp.la module-sine.la \
+	module-native-protocol-tcp.la module-native-protocol-fd.la \
+	module-combine.la module-combine-sink.la 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 \
@@ -4190,16 +4247,17 @@ modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
 	module-switch-on-connect.la module-switch-on-port-available.la \
 	module-filter-apply.la module-filter-heuristics.la \
 	module-role-ducking.la module-allow-passthrough.la \
-	$(am__append_84) $(am__append_85) $(am__append_86) \
-	$(am__append_87) $(am__append_88) $(am__append_89) \
-	$(am__append_90) $(am__append_91) $(am__append_92) \
-	$(am__append_93) $(am__append_94) $(am__append_95) \
-	$(am__append_96) $(am__append_97) $(am__append_98) \
-	$(am__append_99) $(am__append_100) $(am__append_101) \
-	$(am__append_102) $(am__append_104) $(am__append_105) \
-	$(am__append_106) $(am__append_107) $(am__append_108) \
-	$(am__append_109) $(am__append_110) $(am__append_111) \
-	$(am__append_112) $(am__append_113) $(am__append_114)
+	$(am__append_85) $(am__append_86) $(am__append_87) \
+	$(am__append_88) $(am__append_89) $(am__append_90) \
+	$(am__append_91) $(am__append_92) $(am__append_93) \
+	$(am__append_94) $(am__append_95) $(am__append_96) \
+	$(am__append_97) $(am__append_98) $(am__append_99) \
+	$(am__append_100) $(am__append_101) $(am__append_102) \
+	$(am__append_103) $(am__append_105) $(am__append_107) \
+	$(am__append_108) $(am__append_109) $(am__append_110) \
+	$(am__append_111) $(am__append_112) $(am__append_113) \
+	$(am__append_114) $(am__append_115) $(am__append_116) \
+	$(am__append_117)
 libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
 libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
@@ -4214,11 +4272,11 @@ libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -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_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(am__append_81)
+	$(am__append_82)
 libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
 libprotocol_native_la_LIBADD = $(AM_LIBADD) \
 	libpulsecore-@PA_MAJORMINOR@.la \
-	libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_82)
+	libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_83)
 @HAVE_ESOUND_TRUE@libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 @HAVE_ESOUND_TRUE@libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
 @HAVE_ESOUND_TRUE@libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
@@ -4260,7 +4318,9 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/kinect-audio.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
 
 @HAVE_ALSA_TRUE@@HAVE_UDEV_TRUE@dist_udevrules_DATA = \
 @HAVE_ALSA_TRUE@@HAVE_UDEV_TRUE@		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
@@ -4291,6 +4351,7 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-lineout.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-mono.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/iec958-stereo-input.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/iec958-stereo-output.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-0.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-1.conf \
@@ -4299,71 +4360,22 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-4.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-5.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-6.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-7.conf
-
-
-# These are generated by an M4 script
-SYMDEF_FILES = 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-remap-source-symdef.h \
-	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 \
-	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-systemd-login-symdef.h \
-	module-bluetooth-policy-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 module-position-event-sounds-symdef.h \
-	module-role-ducking-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 \
-	module-allow-passthrough-symdef.h $(am__append_116)
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-7.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/steelseries-arctis-input.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf \
+@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
+
+@HAVE_GSETTINGS_TRUE@gsettingsdataconvert_DATA = \
+@HAVE_GSETTINGS_TRUE@		modules/gsettings/pulseaudio.convert
+
 
 # Simple protocol
 module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
-module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
+module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS) -DPA_MODULE_NAME=module_simple_protocol_tcp
 module_simple_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_simple_protocol_tcp_la_LIBADD = $(MODULE_LIBADD) libprotocol-simple.la
 module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
-module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
+module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS) -DPA_MODULE_NAME=module_simple_protocol_unix
 module_simple_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_simple_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-simple.la
 
@@ -4371,22 +4383,23 @@ module_simple_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-simple.la
 module_cli_la_SOURCES = modules/module-cli.c
 module_cli_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_cli_la_LIBADD = $(MODULE_LIBADD) libcli.la
+module_cli_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_cli
 module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
-module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
+module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS) -DPA_MODULE_NAME=module_cli_protocol_tcp
 module_cli_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_cli_protocol_tcp_la_LIBADD = $(MODULE_LIBADD) libprotocol-cli.la
 module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
-module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
+module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS) -DPA_MODULE_NAME=module_cli_protocol_unix
 module_cli_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_cli_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-cli.la
 
 # HTTP protocol
 module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
-module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
+module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS) -DPA_MODULE_NAME=module_http_protocol_tcp
 module_http_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_http_protocol_tcp_la_LIBADD = $(MODULE_LIBADD) libprotocol-http.la
 module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
-module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
+module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS) -DPA_MODULE_NAME=module_http_protocol_unix
 module_http_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_http_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-http.la
 
@@ -4404,40 +4417,43 @@ module_dbus_protocol_la_SOURCES = \
 		modules/dbus/iface-stream.c modules/dbus/iface-stream.h \
 		modules/dbus/module-dbus-protocol.c
 
-module_dbus_protocol_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+module_dbus_protocol_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_dbus_protocol
 module_dbus_protocol_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_dbus_protocol_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
 
 # Native protocol
 module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
-module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
+module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS) -DPA_MODULE_NAME=module_native_protocol_tcp
 module_native_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_native_protocol_tcp_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
 module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
-module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
+module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS) -DPA_MODULE_NAME=module_native_protocol_unix
 module_native_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_native_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
 module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c
-module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS)
+module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_native_protocol_fd
 module_native_protocol_fd_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_native_protocol_fd_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
 
 # EsounD protocol
 @HAVE_ESOUND_TRUE@module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
-@HAVE_ESOUND_TRUE@module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
+@HAVE_ESOUND_TRUE@module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS) -DPA_MODULE_NAME=module_esound_protocol_tcp
 @HAVE_ESOUND_TRUE@module_esound_protocol_tcp_la_LDFLAGS = $(MODULE_LDFLAGS)
 @HAVE_ESOUND_TRUE@module_esound_protocol_tcp_la_LIBADD = $(MODULE_LIBADD) libprotocol-esound.la
 @HAVE_ESOUND_TRUE@module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
-@HAVE_ESOUND_TRUE@module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
+@HAVE_ESOUND_TRUE@module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS) -DPA_MODULE_NAME=module_esound_protocol_unix
 @HAVE_ESOUND_TRUE@module_esound_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 @HAVE_ESOUND_TRUE@module_esound_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-esound.la
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c
+@HAVE_ESOUND_TRUE@module_esound_compat_spawnfd_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_esound_compat_spawnfd
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnfd_la_LDFLAGS = $(MODULE_LDFLAGS)
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnfd_la_LIBADD = $(MODULE_LIBADD)
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c
+@HAVE_ESOUND_TRUE@module_esound_compat_spawnpid_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_esound_compat_spawnpid
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnpid_la_LDFLAGS = $(MODULE_LDFLAGS)
 @HAVE_ESOUND_TRUE@module_esound_compat_spawnpid_la_LIBADD = $(MODULE_LIBADD)
 @HAVE_ESOUND_TRUE@module_esound_sink_la_SOURCES = modules/module-esound-sink.c
+@HAVE_ESOUND_TRUE@module_esound_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_esound_sink
 @HAVE_ESOUND_TRUE@module_esound_sink_la_LDFLAGS = $(MODULE_LDFLAGS) $(WINSOCK_LIBS)
 @HAVE_ESOUND_TRUE@module_esound_sink_la_LIBADD = $(MODULE_LIBADD)
 
@@ -4445,106 +4461,126 @@ module_native_protocol_fd_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
 module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c
 module_pipe_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_pipe_sink_la_LIBADD = $(MODULE_LIBADD)
+module_pipe_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_pipe_sink
 module_pipe_source_la_SOURCES = modules/module-pipe-source.c
 module_pipe_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_pipe_source_la_LIBADD = $(MODULE_LIBADD)
+module_pipe_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_pipe_source
 
 # Fake sources/sinks
 module_sine_la_SOURCES = modules/module-sine.c
 module_sine_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_sine_la_LIBADD = $(MODULE_LIBADD)
+module_sine_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_sine
 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_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_null_sink
 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_null_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_null_source
 module_sine_source_la_SOURCES = modules/module-sine-source.c
 module_sine_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_sine_source_la_LIBADD = $(MODULE_LIBADD)
+module_sine_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_sine_source
 
 # Couplings
 module_combine_la_SOURCES = modules/module-combine.c
 module_combine_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_combine_la_LIBADD = $(MODULE_LIBADD)
+module_combine_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_combine
 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_combine_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_combine_sink
 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_connect_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_switch_on_connect
 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_switch_on_port_available_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_switch_on_port_available
 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_apply_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_filter_apply
 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_filter_heuristics_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_filter_heuristics
 module_remap_sink_la_SOURCES = modules/module-remap-sink.c
 module_remap_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_remap_sink_la_LIBADD = $(MODULE_LIBADD)
+module_remap_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_remap_sink
 module_remap_source_la_SOURCES = modules/module-remap-source.c
 module_remap_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_remap_source_la_LIBADD = $(MODULE_LIBADD)
+module_remap_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_remap_source
 module_ladspa_sink_la_SOURCES = modules/module-ladspa-sink.c modules/ladspa.h
-module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" \
-	$(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_117)
+module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH="$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa" \
+	$(AM_CFLAGS) $(SERVER_CFLAGS) \
+	-DPA_MODULE_NAME=module_ladspa_sink $(am__append_119)
 module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) \
-	$(am__append_118)
+	$(am__append_120)
 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_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS) -DPA_MODULE_NAME=module_equalizer_sink
 module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_equalizer_sink_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS)
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_match_la_LIBADD = $(MODULE_LIBADD)
+module_match_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_match
 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_sink_new_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_tunnel_sink_new
 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_source_new_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_tunnel_source_new
 module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
-module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) $(X11_CFLAGS)
+module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) $(X11_CFLAGS) -DPA_MODULE_NAME=module_tunnel_sink
 module_tunnel_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 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) $(X11_CFLAGS)
 module_tunnel_source_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS)
+module_tunnel_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_tunnel_source
 module_loopback_la_SOURCES = modules/module-loopback.c
 module_loopback_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_loopback_la_LIBADD = $(MODULE_LIBADD)
+module_loopback_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_loopback
 module_virtual_sink_la_SOURCES = modules/module-virtual-sink.c
-module_virtual_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS)
+module_virtual_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) -DPA_MODULE_NAME=module_virtual_sink
 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_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) -DPA_MODULE_NAME=module_virtual_source
 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_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) -DPA_MODULE_NAME=module_virtual_surround_sink
 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
-module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) -DPA_MODULE_NAME=module_x11_bell
 module_x11_bell_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_x11_bell_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS)
 module_x11_publish_la_SOURCES = modules/x11/module-x11-publish.c
-module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) -DPA_MODULE_NAME=module_x11_publish
 module_x11_publish_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_x11_publish_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la $(X11_LIBS)
 module_x11_xsmp_la_SOURCES = modules/x11/module-x11-xsmp.c
-module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) -DPA_MODULE_NAME=module_x11_xsmp
 module_x11_xsmp_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_x11_xsmp_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS)
 module_x11_cork_request_la_SOURCES = modules/x11/module-x11-cork-request.c
-module_x11_cork_request_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+module_x11_cork_request_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) -DPA_MODULE_NAME=module_x11_cork_request
 module_x11_cork_request_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_x11_cork_request_la_LIBADD = $(MODULE_LIBADD) $(X11_LIBS)
 
@@ -4555,6 +4591,7 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
 module_oss_la_SOURCES = modules/oss/module-oss.c
 module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la
+module_oss_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_oss
 
 # COREAUDIO
 module_coreaudio_detect_la_SOURCES = modules/macosx/module-coreaudio-detect.c
@@ -4563,12 +4600,14 @@ module_coreaudio_detect_la_LDFLAGS = $(MODULE_LDFLAGS) \
 		-Wl,-framework -Wl,AudioUnit -framework AudioUnit
 
 module_coreaudio_detect_la_LIBADD = $(MODULE_LIBADD)
+module_coreaudio_detect_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_coreaudio_detect
 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
 
 module_coreaudio_device_la_LIBADD = $(MODULE_LIBADD)
+module_coreaudio_device_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_coreaudio_device
 
 # ALSA
 libalsa_util_la_SOURCES = modules/alsa/alsa-util.c \
@@ -4577,39 +4616,40 @@ libalsa_util_la_SOURCES = modules/alsa/alsa-util.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 $(am__append_119) $(am__append_122)
+	modules/reserve-wrap.h $(am__append_121) $(am__append_124)
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) \
-	$(am__append_120) $(am__append_123)
+	$(am__append_122) $(am__append_125)
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(ASOUNDLIB_CFLAGS) $(am__append_121) $(am__append_124)
+	$(ASOUNDLIB_CFLAGS) $(am__append_123) $(am__append_126)
 module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
-module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
+module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -DPA_MODULE_NAME=module_alsa_sink
 module_alsa_source_la_SOURCES = modules/alsa/module-alsa-source.c
 module_alsa_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_source_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
-module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
+module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -DPA_MODULE_NAME=module_alsa_source
 module_alsa_card_la_SOURCES = modules/alsa/module-alsa-card.c
 module_alsa_card_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_card_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
-module_alsa_card_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
+module_alsa_card_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -DPA_MODULE_NAME=module_alsa_card
 
 # Solaris
 module_solaris_la_SOURCES = modules/module-solaris.c
 module_solaris_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_solaris_la_LIBADD = $(MODULE_LIBADD)
+module_solaris_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_solaris
 
 # Avahi
 module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
 module_zeroconf_publish_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_zeroconf_publish_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) $(DBUS_LIBS) libavahi-wrap.la libprotocol-native.la
-module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) $(DBUS_CFLAGS)
+module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_zeroconf_publish
 module_zeroconf_discover_la_SOURCES = modules/module-zeroconf-discover.c
 module_zeroconf_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_zeroconf_discover_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la
-module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
+module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) -DPA_MODULE_NAME=module_zeroconf_discover
 
 # Bonjour
 module_bonjour_publish_la_SOURCES = modules/macosx/module-bonjour-publish.c
@@ -4617,42 +4657,43 @@ module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \
 			-Wl,-framework -Wl,CoreFoundation -framework CoreFoundation
 
 module_bonjour_publish_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
+module_bonjour_publish_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_bonjour_publish
 
 # LIRC
 module_lirc_la_SOURCES = modules/module-lirc.c
 module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_lirc_la_LIBADD = $(MODULE_LIBADD) $(LIRC_LIBS)
-module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
+module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS) -DPA_MODULE_NAME=module_lirc
 
 # Linux evdev
 module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
 module_mmkbd_evdev_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_mmkbd_evdev_la_LIBADD = $(MODULE_LIBADD)
-module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
+module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_mmkbd_evdev
 
 # 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_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_waveout
 
 # Hardware autodetection module
 module_detect_la_SOURCES = modules/module-detect.c
 module_detect_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_detect_la_LIBADD = $(MODULE_LIBADD)
-module_detect_la_CFLAGS = $(AM_CFLAGS)
+module_detect_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_detect
 
 # Volume restore module
 module_volume_restore_la_SOURCES = modules/module-volume-restore.c
 module_volume_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_volume_restore_la_LIBADD = $(MODULE_LIBADD)
-module_volume_restore_la_CFLAGS = $(AM_CFLAGS)
+module_volume_restore_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_volume_restore
 
 # Position event sounds in space
 module_position_event_sounds_la_SOURCES = modules/module-position-event-sounds.c
 module_position_event_sounds_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_position_event_sounds_la_LIBADD = $(MODULE_LIBADD)
-module_position_event_sounds_la_CFLAGS = $(AM_CFLAGS)
+module_position_event_sounds_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_position_event_sounds
 
 # Ducking effect based on stream roles
 module_role_ducking_la_SOURCES = modules/module-role-ducking.c \
@@ -4660,14 +4701,14 @@ module_role_ducking_la_SOURCES = modules/module-role-ducking.c \
 
 module_role_ducking_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_role_ducking_la_LIBADD = $(MODULE_LIBADD)
-module_role_ducking_la_CFLAGS = $(AM_CFLAGS)
+module_role_ducking_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_role_ducking
 
 # Augment properties from XDG .desktop files
 module_augment_properties_la_SOURCES = modules/module-augment-properties.c
 module_augment_properties_la_LDFLAGS = $(MODULE_LDFLAGS)
 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\"
+module_augment_properties_la_CFLAGS = $(AM_CFLAGS) -DDESKTOPFILEDIR=\"/usr/share/applications\" -DPA_MODULE_NAME=module_augment_properties
 
 # 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 \
@@ -4675,75 +4716,83 @@ 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)
+module_role_cork_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_role_cork
 
 # Device description restore module
 module_device_manager_la_SOURCES = modules/module-device-manager.c
 module_device_manager_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_device_manager_la_LIBADD = $(MODULE_LIBADD) libprotocol-native.la
-module_device_manager_la_CFLAGS = $(AM_CFLAGS)
+module_device_manager_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_device_manager
 
 # 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) \
-	libprotocol-native.la $(am__append_125)
-module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_126)
+	libprotocol-native.la $(am__append_127)
+module_device_restore_la_CFLAGS = $(AM_CFLAGS) \
+	-DPA_MODULE_NAME=module_device_restore $(am__append_128)
 
 # Stream volume/muted/device restore module
 module_stream_restore_la_SOURCES = modules/module-stream-restore.c
 module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_stream_restore_la_LIBADD = $(MODULE_LIBADD) \
-	libprotocol-native.la $(am__append_127)
-module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_128)
+	libprotocol-native.la $(am__append_129)
+module_stream_restore_la_CFLAGS = $(AM_CFLAGS) \
+	-DPA_MODULE_NAME=module_stream_restore $(am__append_130)
 
 # Card profile restore module
 module_card_restore_la_SOURCES = modules/module-card-restore.c
 module_card_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_card_restore_la_LIBADD = $(MODULE_LIBADD)
-module_card_restore_la_CFLAGS = $(AM_CFLAGS)
+module_card_restore_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_card_restore
 
 # Default sink/source restore module
 module_default_device_restore_la_SOURCES = modules/module-default-device-restore.c
 module_default_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_default_device_restore_la_LIBADD = $(MODULE_LIBADD)
-module_default_device_restore_la_CFLAGS = $(AM_CFLAGS)
+module_default_device_restore_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_default_device_restore
 
 # Always Sink module
 module_always_sink_la_SOURCES = modules/module-always-sink.c
 module_always_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_always_sink_la_LIBADD = $(MODULE_LIBADD)
-module_always_sink_la_CFLAGS = $(AM_CFLAGS)
+module_always_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_always_sink
+
+# Always Source module
+module_always_source_la_SOURCES = modules/module-always-source.c
+module_always_source_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_always_source_la_LIBADD = $(MODULE_LIBADD)
+module_always_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_always_source
 
 # Rescue streams module
 module_rescue_streams_la_SOURCES = modules/module-rescue-streams.c
 module_rescue_streams_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rescue_streams_la_LIBADD = $(MODULE_LIBADD)
-module_rescue_streams_la_CFLAGS = $(AM_CFLAGS)
+module_rescue_streams_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_rescue_streams
 
 # Automatically move streams to devices that are intended for their roles
 module_intended_roles_la_SOURCES = modules/module-intended-roles.c
 module_intended_roles_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_intended_roles_la_LIBADD = $(MODULE_LIBADD)
-module_intended_roles_la_CFLAGS = $(AM_CFLAGS)
+module_intended_roles_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_intended_roles
 
 # Suspend-on-idle module
 module_suspend_on_idle_la_SOURCES = modules/module-suspend-on-idle.c
 module_suspend_on_idle_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_suspend_on_idle_la_LIBADD = $(MODULE_LIBADD)
-module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
+module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_suspend_on_idle
 
 # echo-cancel module
 module_echo_cancel_la_SOURCES =  \
 	modules/echo-cancel/module-echo-cancel.c \
 	modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
-	$(am__append_129) $(am__append_134)
+	$(am__append_131) $(am__append_136)
 module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(am__append_132) \
-	$(am__append_136) $(am__append_138)
+module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(am__append_134) \
+	$(am__append_138) $(am__append_140)
 module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(am__append_130) $(am__append_133) $(am__append_135) \
-	$(am__append_137)
+	-DPA_MODULE_NAME=module_echo_cancel $(am__append_132) \
+	$(am__append_135) $(am__append_137) $(am__append_139)
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@nodist_module_echo_cancel_la_SOURCES = \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@		modules/echo-cancel/adrian-aec-orc-gen.c \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@		modules/echo-cancel/adrian-aec-orc-gen.h
@@ -4760,69 +4809,86 @@ module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
 module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
 module_rtp_send_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rtp_send_la_LIBADD = $(MODULE_LIBADD) librtp.la
-module_rtp_send_la_CFLAGS = $(AM_CFLAGS)
+module_rtp_send_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_rtp_send
 module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c
 module_rtp_recv_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rtp_recv_la_LIBADD = $(MODULE_LIBADD) librtp.la
-module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
+module_rtp_recv_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_rtp_recv
 
 # JACK
 module_jackdbus_detect_la_SOURCES = modules/jack/module-jackdbus-detect.c
 module_jackdbus_detect_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_jackdbus_detect_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(JACK_LIBS)
-module_jackdbus_detect_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(JACK_CFLAGS)
+module_jackdbus_detect_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(JACK_CFLAGS) -DPA_MODULE_NAME=module_jackdbus_detect
 module_jack_sink_la_SOURCES = modules/jack/module-jack-sink.c
 module_jack_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_jack_sink_la_LIBADD = $(MODULE_LIBADD) $(JACK_LIBS)
-module_jack_sink_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
+module_jack_sink_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) -DPA_MODULE_NAME=module_jack_sink
 module_jack_source_la_SOURCES = modules/jack/module-jack-source.c
 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)
+module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) -DPA_MODULE_NAME=module_jack_source
 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)
+module_hal_detect_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_hal_detect
 module_hal_detect_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_udev_detect_la_SOURCES = modules/module-udev-detect.c
 module_udev_detect_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_udev_detect_la_LIBADD = $(MODULE_LIBADD) $(UDEV_LIBS)
-module_udev_detect_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
+module_udev_detect_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS) -DPA_MODULE_NAME=module_udev_detect
 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_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_console_kit
 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) $(SYSTEMDLOGIN_LIBS)
-module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) $(SYSTEMDLOGIN_CFLAGS)
+module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) $(SYSTEMDLOGIN_CFLAGS) -DPA_MODULE_NAME=module_systemd_login
 
 # GConf support
-module_gconf_la_SOURCES = modules/gconf/module-gconf.c
+module_gconf_la_SOURCES = \
+		 modules/stdin-util.c modules/stdin-util.h \
+		 modules/gconf/module-gconf.c
+
 module_gconf_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_gconf_la_LIBADD = $(MODULE_LIBADD)
-module_gconf_la_CFLAGS = $(AM_CFLAGS) -DPA_GCONF_HELPER=\"$(pulselibexecdir)/gconf-helper\"
+module_gconf_la_CFLAGS = $(AM_CFLAGS) -DPA_GCONF_HELPER=\"$(pulselibexecdir)/gconf-helper\" -DPA_MODULE_NAME=module_gconf
 gconf_helper_SOURCES = modules/gconf/gconf-helper.c
 gconf_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(GCONF_LIBS)
 gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS)
 gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
+# GSettings support
+module_gsettings_la_SOURCES = \
+		modules/stdin-util.c modules/stdin-util.h \
+		modules/gsettings/module-gsettings.c
+
+module_gsettings_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_gsettings_la_LIBADD = $(MODULE_LIBADD)
+module_gsettings_la_CFLAGS = $(AM_CFLAGS) -DPA_GSETTINGS_HELPER=\"$(pulselibexecdir)/gsettings-helper\" -DPA_MODULE_NAME=module_gsettings
+gsettings_helper_SOURCES = modules/gsettings/gsettings-helper.c
+gsettings_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(GSETTINGS_LIBS)
+gsettings_helper_CFLAGS = $(AM_CFLAGS) $(GSETTINGS_CFLAGS)
+gsettings_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+@HAVE_GSETTINGS_TRUE@gsettings_SCHEMAS = modules/gsettings/org.freedesktop.pulseaudio.gschema.xml
+
 # 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)
+module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_policy
 
 # 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)
-module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS)
+module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_discover
 
 # 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)
+module_bluez4_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluez4_discover
 libbluez4_util_la_SOURCES = \
 		modules/bluetooth/a2dp-codecs.h \
 		modules/bluetooth/bluez4-util.c \
@@ -4834,46 +4900,46 @@ 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)
+module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS) -DPA_MODULE_NAME=module_bluez4_device
 
 # Bluetooth BlueZ 5 sink / source
 libbluez5_util_la_SOURCES = modules/bluetooth/bluez5-util.c \
 	modules/bluetooth/bluez5-util.h \
-	modules/bluetooth/a2dp-codecs.h $(am__append_139) \
-	$(am__append_140)
+	modules/bluetooth/a2dp-codecs.h $(am__append_141) \
+	$(am__append_142)
 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_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluez5_discover
 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)
+module_bluez5_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) -DPA_MODULE_NAME=module_bluez5_device
 
 # 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_sink_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/modules/rtp -DPA_MODULE_NAME=module_raop_sink
 module_raop_discover_la_SOURCES = modules/raop/module-raop-discover.c
 module_raop_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_raop_discover_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la
-module_raop_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
+module_raop_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) -DPA_MODULE_NAME=module_raop_discover
 
 # Rygel
 module_rygel_media_server_la_SOURCES = modules/module-rygel-media-server.c
 module_rygel_media_server_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rygel_media_server_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libprotocol-http.la
-module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_rygel_media_server
 
 # Allow passthrough module
 module_allow_passthrough_la_SOURCES = modules/module-allow-passthrough.c
 module_allow_passthrough_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_allow_passthrough_la_LIBADD = $(MODULE_LIBADD)
-module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS)
+module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_allow_passthrough
 DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service
 @OS_IS_WIN32_FALSE@SYMLINK_PROGRAM = ln -sf
 @OS_IS_WIN32_TRUE@SYMLINK_PROGRAM = cd $(DESTDIR)$(bindir) && cp
@@ -5758,6 +5824,11 @@ modules/module_always_sink_la-module-always-sink.lo:  \
 
 module-always-sink.la: $(module_always_sink_la_OBJECTS) $(module_always_sink_la_DEPENDENCIES) $(EXTRA_module_always_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_always_sink_la_LINK) -rpath $(modlibexecdir) $(module_always_sink_la_OBJECTS) $(module_always_sink_la_LIBADD) $(LIBS)
+modules/module_always_source_la-module-always-source.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
+
+module-always-source.la: $(module_always_source_la_OBJECTS) $(module_always_source_la_DEPENDENCIES) $(EXTRA_module_always_source_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(module_always_source_la_LINK) -rpath $(modlibexecdir) $(module_always_source_la_OBJECTS) $(module_always_source_la_LIBADD) $(LIBS)
 modules/module_augment_properties_la-module-augment-properties.lo:  \
 	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
@@ -5805,7 +5876,7 @@ modules/macosx/$(am__dirstamp):
 modules/macosx/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) modules/macosx/$(DEPDIR)
 	@: > modules/macosx/$(DEPDIR)/$(am__dirstamp)
-modules/macosx/module-bonjour-publish.lo:  \
+modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo:  \
 	modules/macosx/$(am__dirstamp) \
 	modules/macosx/$(DEPDIR)/$(am__dirstamp)
 
@@ -5826,17 +5897,17 @@ modules/module_cli_protocol_unix_la-module-protocol-stub.lo:  \
 
 module-cli-protocol-unix.la: $(module_cli_protocol_unix_la_OBJECTS) $(module_cli_protocol_unix_la_DEPENDENCIES) $(EXTRA_module_cli_protocol_unix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_cli_protocol_unix_la_LINK) $(am_module_cli_protocol_unix_la_rpath) $(module_cli_protocol_unix_la_OBJECTS) $(module_cli_protocol_unix_la_LIBADD) $(LIBS)
-modules/module-cli.lo: modules/$(am__dirstamp) \
+modules/module_cli_la-module-cli.lo: modules/$(am__dirstamp) \
 	modules/$(DEPDIR)/$(am__dirstamp)
 
 module-cli.la: $(module_cli_la_OBJECTS) $(module_cli_la_DEPENDENCIES) $(EXTRA_module_cli_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_cli_la_LINK) -rpath $(modlibexecdir) $(module_cli_la_OBJECTS) $(module_cli_la_LIBADD) $(LIBS)
-modules/module-combine-sink.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_combine_sink_la-module-combine-sink.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-combine-sink.la: $(module_combine_sink_la_OBJECTS) $(module_combine_sink_la_DEPENDENCIES) $(EXTRA_module_combine_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_combine_sink_la_LINK) -rpath $(modlibexecdir) $(module_combine_sink_la_OBJECTS) $(module_combine_sink_la_LIBADD) $(LIBS)
-modules/module-combine.lo: modules/$(am__dirstamp) \
+modules/module_combine_la-module-combine.lo: modules/$(am__dirstamp) \
 	modules/$(DEPDIR)/$(am__dirstamp)
 
 module-combine.la: $(module_combine_la_OBJECTS) $(module_combine_la_DEPENDENCIES) $(EXTRA_module_combine_la_DEPENDENCIES) 
@@ -5846,13 +5917,13 @@ modules/module_console_kit_la-module-console-kit.lo:  \
 
 module-console-kit.la: $(module_console_kit_la_OBJECTS) $(module_console_kit_la_DEPENDENCIES) $(EXTRA_module_console_kit_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_console_kit_la_LINK) $(am_module_console_kit_la_rpath) $(module_console_kit_la_OBJECTS) $(module_console_kit_la_LIBADD) $(LIBS)
-modules/macosx/module-coreaudio-detect.lo:  \
+modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo:  \
 	modules/macosx/$(am__dirstamp) \
 	modules/macosx/$(DEPDIR)/$(am__dirstamp)
 
 module-coreaudio-detect.la: $(module_coreaudio_detect_la_OBJECTS) $(module_coreaudio_detect_la_DEPENDENCIES) $(EXTRA_module_coreaudio_detect_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_coreaudio_detect_la_LINK) $(am_module_coreaudio_detect_la_rpath) $(module_coreaudio_detect_la_OBJECTS) $(module_coreaudio_detect_la_LIBADD) $(LIBS)
-modules/macosx/module-coreaudio-device.lo:  \
+modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo:  \
 	modules/macosx/$(am__dirstamp) \
 	modules/macosx/$(DEPDIR)/$(am__dirstamp)
 
@@ -5946,13 +6017,13 @@ modules/module_equalizer_sink_la-module-equalizer-sink.lo:  \
 
 module-equalizer-sink.la: $(module_equalizer_sink_la_OBJECTS) $(module_equalizer_sink_la_DEPENDENCIES) $(EXTRA_module_equalizer_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_equalizer_sink_la_LINK) $(am_module_equalizer_sink_la_rpath) $(module_equalizer_sink_la_OBJECTS) $(module_equalizer_sink_la_LIBADD) $(LIBS)
-modules/module-esound-compat-spawnfd.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-esound-compat-spawnfd.la: $(module_esound_compat_spawnfd_la_OBJECTS) $(module_esound_compat_spawnfd_la_DEPENDENCIES) $(EXTRA_module_esound_compat_spawnfd_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_esound_compat_spawnfd_la_LINK) $(am_module_esound_compat_spawnfd_la_rpath) $(module_esound_compat_spawnfd_la_OBJECTS) $(module_esound_compat_spawnfd_la_LIBADD) $(LIBS)
-modules/module-esound-compat-spawnpid.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-esound-compat-spawnpid.la: $(module_esound_compat_spawnpid_la_OBJECTS) $(module_esound_compat_spawnpid_la_DEPENDENCIES) $(EXTRA_module_esound_compat_spawnpid_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_esound_compat_spawnpid_la_LINK) $(am_module_esound_compat_spawnpid_la_rpath) $(module_esound_compat_spawnpid_la_OBJECTS) $(module_esound_compat_spawnpid_la_LIBADD) $(LIBS)
@@ -5966,21 +6037,23 @@ modules/module_esound_protocol_unix_la-module-protocol-stub.lo:  \
 
 module-esound-protocol-unix.la: $(module_esound_protocol_unix_la_OBJECTS) $(module_esound_protocol_unix_la_DEPENDENCIES) $(EXTRA_module_esound_protocol_unix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_esound_protocol_unix_la_LINK) $(am_module_esound_protocol_unix_la_rpath) $(module_esound_protocol_unix_la_OBJECTS) $(module_esound_protocol_unix_la_LIBADD) $(LIBS)
-modules/module-esound-sink.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_esound_sink_la-module-esound-sink.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-esound-sink.la: $(module_esound_sink_la_OBJECTS) $(module_esound_sink_la_DEPENDENCIES) $(EXTRA_module_esound_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_esound_sink_la_LINK) $(am_module_esound_sink_la_rpath) $(module_esound_sink_la_OBJECTS) $(module_esound_sink_la_LIBADD) $(LIBS)
-modules/module-filter-apply.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_filter_apply_la-module-filter-apply.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-filter-apply.la: $(module_filter_apply_la_OBJECTS) $(module_filter_apply_la_DEPENDENCIES) $(EXTRA_module_filter_apply_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_filter_apply_la_LINK) -rpath $(modlibexecdir) $(module_filter_apply_la_OBJECTS) $(module_filter_apply_la_LIBADD) $(LIBS)
-modules/module-filter-heuristics.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_filter_heuristics_la-module-filter-heuristics.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-filter-heuristics.la: $(module_filter_heuristics_la_OBJECTS) $(module_filter_heuristics_la_DEPENDENCIES) $(EXTRA_module_filter_heuristics_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_filter_heuristics_la_LINK) -rpath $(modlibexecdir) $(module_filter_heuristics_la_OBJECTS) $(module_filter_heuristics_la_LIBADD) $(LIBS)
+modules/module_gconf_la-stdin-util.lo: modules/$(am__dirstamp) \
+	modules/$(DEPDIR)/$(am__dirstamp)
 modules/gconf/$(am__dirstamp):
 	@$(MKDIR_P) modules/gconf
 	@: > modules/gconf/$(am__dirstamp)
@@ -5993,6 +6066,20 @@ modules/gconf/module_gconf_la-module-gconf.lo:  \
 
 module-gconf.la: $(module_gconf_la_OBJECTS) $(module_gconf_la_DEPENDENCIES) $(EXTRA_module_gconf_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_gconf_la_LINK) $(am_module_gconf_la_rpath) $(module_gconf_la_OBJECTS) $(module_gconf_la_LIBADD) $(LIBS)
+modules/module_gsettings_la-stdin-util.lo: modules/$(am__dirstamp) \
+	modules/$(DEPDIR)/$(am__dirstamp)
+modules/gsettings/$(am__dirstamp):
+	@$(MKDIR_P) modules/gsettings
+	@: > modules/gsettings/$(am__dirstamp)
+modules/gsettings/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) modules/gsettings/$(DEPDIR)
+	@: > modules/gsettings/$(DEPDIR)/$(am__dirstamp)
+modules/gsettings/module_gsettings_la-module-gsettings.lo:  \
+	modules/gsettings/$(am__dirstamp) \
+	modules/gsettings/$(DEPDIR)/$(am__dirstamp)
+
+module-gsettings.la: $(module_gsettings_la_OBJECTS) $(module_gsettings_la_DEPENDENCIES) $(EXTRA_module_gsettings_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(module_gsettings_la_LINK) $(am_module_gsettings_la_rpath) $(module_gsettings_la_OBJECTS) $(module_gsettings_la_LIBADD) $(LIBS)
 modules/module_hal_detect_la-module-hal-detect-compat.lo:  \
 	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
@@ -6047,12 +6134,12 @@ modules/module_lirc_la-module-lirc.lo: modules/$(am__dirstamp) \
 
 module-lirc.la: $(module_lirc_la_OBJECTS) $(module_lirc_la_DEPENDENCIES) $(EXTRA_module_lirc_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_lirc_la_LINK) $(am_module_lirc_la_rpath) $(module_lirc_la_OBJECTS) $(module_lirc_la_LIBADD) $(LIBS)
-modules/module-loopback.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_loopback_la-module-loopback.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-loopback.la: $(module_loopback_la_OBJECTS) $(module_loopback_la_DEPENDENCIES) $(EXTRA_module_loopback_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_loopback_la_LINK) -rpath $(modlibexecdir) $(module_loopback_la_OBJECTS) $(module_loopback_la_LIBADD) $(LIBS)
-modules/module-match.lo: modules/$(am__dirstamp) \
+modules/module_match_la-module-match.lo: modules/$(am__dirstamp) \
 	modules/$(DEPDIR)/$(am__dirstamp)
 
 module-match.la: $(module_match_la_OBJECTS) $(module_match_la_DEPENDENCIES) $(EXTRA_module_match_la_DEPENDENCIES) 
@@ -6077,28 +6164,28 @@ modules/module_native_protocol_unix_la-module-protocol-stub.lo:  \
 
 module-native-protocol-unix.la: $(module_native_protocol_unix_la_OBJECTS) $(module_native_protocol_unix_la_DEPENDENCIES) $(EXTRA_module_native_protocol_unix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_native_protocol_unix_la_LINK) $(am_module_native_protocol_unix_la_rpath) $(module_native_protocol_unix_la_OBJECTS) $(module_native_protocol_unix_la_LIBADD) $(LIBS)
-modules/module-null-sink.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_null_sink_la-module-null-sink.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-null-sink.la: $(module_null_sink_la_OBJECTS) $(module_null_sink_la_DEPENDENCIES) $(EXTRA_module_null_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_null_sink_la_LINK) -rpath $(modlibexecdir) $(module_null_sink_la_OBJECTS) $(module_null_sink_la_LIBADD) $(LIBS)
-modules/module-null-source.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_null_source_la-module-null-source.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-null-source.la: $(module_null_source_la_OBJECTS) $(module_null_source_la_DEPENDENCIES) $(EXTRA_module_null_source_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_null_source_la_LINK) -rpath $(modlibexecdir) $(module_null_source_la_OBJECTS) $(module_null_source_la_LIBADD) $(LIBS)
-modules/oss/module-oss.lo: modules/oss/$(am__dirstamp) \
+modules/oss/module_oss_la-module-oss.lo: modules/oss/$(am__dirstamp) \
 	modules/oss/$(DEPDIR)/$(am__dirstamp)
 
 module-oss.la: $(module_oss_la_OBJECTS) $(module_oss_la_DEPENDENCIES) $(EXTRA_module_oss_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_oss_la_LINK) $(am_module_oss_la_rpath) $(module_oss_la_OBJECTS) $(module_oss_la_LIBADD) $(LIBS)
-modules/module-pipe-sink.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_pipe_sink_la-module-pipe-sink.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-pipe-sink.la: $(module_pipe_sink_la_OBJECTS) $(module_pipe_sink_la_DEPENDENCIES) $(EXTRA_module_pipe_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_pipe_sink_la_LINK) $(am_module_pipe_sink_la_rpath) $(module_pipe_sink_la_OBJECTS) $(module_pipe_sink_la_LIBADD) $(LIBS)
-modules/module-pipe-source.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_pipe_source_la-module-pipe-source.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-pipe-source.la: $(module_pipe_source_la_OBJECTS) $(module_pipe_source_la_DEPENDENCIES) $(EXTRA_module_pipe_source_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_pipe_source_la_LINK) $(am_module_pipe_source_la_rpath) $(module_pipe_source_la_OBJECTS) $(module_pipe_source_la_LIBADD) $(LIBS)
@@ -6119,13 +6206,13 @@ modules/raop/module_raop_sink_la-module-raop-sink.lo:  \
 
 module-raop-sink.la: $(module_raop_sink_la_OBJECTS) $(module_raop_sink_la_DEPENDENCIES) $(EXTRA_module_raop_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_raop_sink_la_LINK) $(am_module_raop_sink_la_rpath) $(module_raop_sink_la_OBJECTS) $(module_raop_sink_la_LIBADD) $(LIBS)
-modules/module-remap-sink.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_remap_sink_la-module-remap-sink.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-remap-sink.la: $(module_remap_sink_la_OBJECTS) $(module_remap_sink_la_DEPENDENCIES) $(EXTRA_module_remap_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_remap_sink_la_LINK) -rpath $(modlibexecdir) $(module_remap_sink_la_OBJECTS) $(module_remap_sink_la_LIBADD) $(LIBS)
-modules/module-remap-source.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_remap_source_la-module-remap-source.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-remap-source.la: $(module_remap_source_la_OBJECTS) $(module_remap_source_la_DEPENDENCIES) $(EXTRA_module_remap_source_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_remap_source_la_LINK) -rpath $(modlibexecdir) $(module_remap_source_la_OBJECTS) $(module_remap_source_la_LIBADD) $(LIBS)
@@ -6175,17 +6262,17 @@ modules/module_simple_protocol_unix_la-module-protocol-stub.lo:  \
 
 module-simple-protocol-unix.la: $(module_simple_protocol_unix_la_OBJECTS) $(module_simple_protocol_unix_la_DEPENDENCIES) $(EXTRA_module_simple_protocol_unix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_simple_protocol_unix_la_LINK) $(am_module_simple_protocol_unix_la_rpath) $(module_simple_protocol_unix_la_OBJECTS) $(module_simple_protocol_unix_la_LIBADD) $(LIBS)
-modules/module-sine-source.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_sine_source_la-module-sine-source.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-sine-source.la: $(module_sine_source_la_OBJECTS) $(module_sine_source_la_DEPENDENCIES) $(EXTRA_module_sine_source_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_sine_source_la_LINK) -rpath $(modlibexecdir) $(module_sine_source_la_OBJECTS) $(module_sine_source_la_LIBADD) $(LIBS)
-modules/module-sine.lo: modules/$(am__dirstamp) \
+modules/module_sine_la-module-sine.lo: modules/$(am__dirstamp) \
 	modules/$(DEPDIR)/$(am__dirstamp)
 
 module-sine.la: $(module_sine_la_OBJECTS) $(module_sine_la_DEPENDENCIES) $(EXTRA_module_sine_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_sine_la_LINK) -rpath $(modlibexecdir) $(module_sine_la_OBJECTS) $(module_sine_la_LIBADD) $(LIBS)
-modules/module-solaris.lo: modules/$(am__dirstamp) \
+modules/module_solaris_la-module-solaris.lo: modules/$(am__dirstamp) \
 	modules/$(DEPDIR)/$(am__dirstamp)
 
 module-solaris.la: $(module_solaris_la_OBJECTS) $(module_solaris_la_DEPENDENCIES) $(EXTRA_module_solaris_la_DEPENDENCIES) 
@@ -6200,13 +6287,13 @@ modules/module_suspend_on_idle_la-module-suspend-on-idle.lo:  \
 
 module-suspend-on-idle.la: $(module_suspend_on_idle_la_OBJECTS) $(module_suspend_on_idle_la_DEPENDENCIES) $(EXTRA_module_suspend_on_idle_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_suspend_on_idle_la_LINK) -rpath $(modlibexecdir) $(module_suspend_on_idle_la_OBJECTS) $(module_suspend_on_idle_la_LIBADD) $(LIBS)
-modules/module-switch-on-connect.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_switch_on_connect_la-module-switch-on-connect.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-switch-on-connect.la: $(module_switch_on_connect_la_OBJECTS) $(module_switch_on_connect_la_DEPENDENCIES) $(EXTRA_module_switch_on_connect_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_switch_on_connect_la_LINK) -rpath $(modlibexecdir) $(module_switch_on_connect_la_OBJECTS) $(module_switch_on_connect_la_LIBADD) $(LIBS)
-modules/module-switch-on-port-available.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_switch_on_port_available_la-module-switch-on-port-available.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-switch-on-port-available.la: $(module_switch_on_port_available_la_OBJECTS) $(module_switch_on_port_available_la_DEPENDENCIES) $(EXTRA_module_switch_on_port_available_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_switch_on_port_available_la_LINK) -rpath $(modlibexecdir) $(module_switch_on_port_available_la_OBJECTS) $(module_switch_on_port_available_la_LIBADD) $(LIBS)
@@ -6215,8 +6302,8 @@ modules/module_systemd_login_la-module-systemd-login.lo:  \
 
 module-systemd-login.la: $(module_systemd_login_la_OBJECTS) $(module_systemd_login_la_DEPENDENCIES) $(EXTRA_module_systemd_login_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_systemd_login_la_LINK) $(am_module_systemd_login_la_rpath) $(module_systemd_login_la_OBJECTS) $(module_systemd_login_la_LIBADD) $(LIBS)
-modules/module-tunnel-sink-new.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-tunnel-sink-new.la: $(module_tunnel_sink_new_la_OBJECTS) $(module_tunnel_sink_new_la_DEPENDENCIES) $(EXTRA_module_tunnel_sink_new_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_tunnel_sink_new_la_LINK) -rpath $(modlibexecdir) $(module_tunnel_sink_new_la_OBJECTS) $(module_tunnel_sink_new_la_LIBADD) $(LIBS)
@@ -6225,13 +6312,13 @@ modules/module_tunnel_sink_la-module-tunnel.lo:  \
 
 module-tunnel-sink.la: $(module_tunnel_sink_la_OBJECTS) $(module_tunnel_sink_la_DEPENDENCIES) $(EXTRA_module_tunnel_sink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_tunnel_sink_la_LINK) -rpath $(modlibexecdir) $(module_tunnel_sink_la_OBJECTS) $(module_tunnel_sink_la_LIBADD) $(LIBS)
-modules/module-tunnel-source-new.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_tunnel_source_new_la-module-tunnel-source-new.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-tunnel-source-new.la: $(module_tunnel_source_new_la_OBJECTS) $(module_tunnel_source_new_la_DEPENDENCIES) $(EXTRA_module_tunnel_source_new_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_tunnel_source_new_la_LINK) -rpath $(modlibexecdir) $(module_tunnel_source_new_la_OBJECTS) $(module_tunnel_source_new_la_LIBADD) $(LIBS)
-modules/module-tunnel.lo: modules/$(am__dirstamp) \
-	modules/$(DEPDIR)/$(am__dirstamp)
+modules/module_tunnel_source_la-module-tunnel.lo:  \
+	modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
 
 module-tunnel-source.la: $(module_tunnel_source_la_OBJECTS) $(module_tunnel_source_la_DEPENDENCIES) $(EXTRA_module_tunnel_source_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_tunnel_source_la_LINK) -rpath $(modlibexecdir) $(module_tunnel_source_la_OBJECTS) $(module_tunnel_source_la_LIBADD) $(LIBS)
@@ -6568,6 +6655,13 @@ tests/get_binary_name_test-get-binary-name-test.$(OBJEXT):  \
 get-binary-name-test$(EXEEXT): $(get_binary_name_test_OBJECTS) $(get_binary_name_test_DEPENDENCIES) $(EXTRA_get_binary_name_test_DEPENDENCIES) 
 	@rm -f get-binary-name-test$(EXEEXT)
 	$(AM_V_CCLD)$(get_binary_name_test_LINK) $(get_binary_name_test_OBJECTS) $(get_binary_name_test_LDADD) $(LIBS)
+modules/gsettings/gsettings_helper-gsettings-helper.$(OBJEXT):  \
+	modules/gsettings/$(am__dirstamp) \
+	modules/gsettings/$(DEPDIR)/$(am__dirstamp)
+
+gsettings-helper$(EXEEXT): $(gsettings_helper_OBJECTS) $(gsettings_helper_DEPENDENCIES) $(EXTRA_gsettings_helper_DEPENDENCIES) 
+	@rm -f gsettings-helper$(EXEEXT)
+	$(AM_V_CCLD)$(gsettings_helper_LINK) $(gsettings_helper_OBJECTS) $(gsettings_helper_LDADD) $(LIBS)
 tests/gtk_test-gtk-test.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -6885,6 +6979,8 @@ mostlyclean-compile:
 	-rm -f modules/echo-cancel/*.lo
 	-rm -f modules/gconf/*.$(OBJEXT)
 	-rm -f modules/gconf/*.lo
+	-rm -f modules/gsettings/*.$(OBJEXT)
+	-rm -f modules/gsettings/*.lo
 	-rm -f modules/jack/*.$(OBJEXT)
 	-rm -f modules/jack/*.lo
 	-rm -f modules/macosx/*.$(OBJEXT)
@@ -6929,55 +7025,50 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/libalsa_util_la-reserve-wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/libalsa_util_la-reserve.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/libalsa_util_la-udev-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-cli.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-combine-sink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-combine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-esound-compat-spawnfd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-esound-compat-spawnpid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-esound-sink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-filter-apply.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-filter-heuristics.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-loopback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-match.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-null-sink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-null-source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-pipe-sink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-pipe-source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-remap-sink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-remap-source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-sine-source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-sine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-solaris.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-switch-on-connect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-switch-on-port-available.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-tunnel-sink-new.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-tunnel-source-new.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module-tunnel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_allow_passthrough_la-module-allow-passthrough.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_always_sink_la-module-always-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_always_source_la-module-always-source.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_augment_properties_la-module-augment-properties.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_card_restore_la-module-card-restore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_cli_la-module-cli.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_cli_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_cli_protocol_unix_la-module-protocol-stub.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_combine_la-module-combine.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_combine_sink_la-module-combine-sink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_console_kit_la-module-console-kit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_default_device_restore_la-module-default-device-restore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_detect_la-module-detect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_device_manager_la-module-device-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_device_restore_la-module-device-restore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_equalizer_sink_la-module-equalizer-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_esound_protocol_unix_la-module-protocol-stub.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_esound_sink_la-module-esound-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_filter_apply_la-module-filter-apply.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_filter_heuristics_la-module-filter-heuristics.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_gconf_la-stdin-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_gsettings_la-stdin-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_hal_detect_la-module-hal-detect-compat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_http_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_http_protocol_unix_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_intended_roles_la-module-intended-roles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_ladspa_sink_la-module-ladspa-sink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_lirc_la-module-lirc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_loopback_la-module-loopback.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_match_la-module-match.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_mmkbd_evdev_la-module-mmkbd-evdev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_native_protocol_fd_la-module-native-protocol-fd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_native_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_native_protocol_unix_la-module-protocol-stub.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_null_sink_la-module-null-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_null_source_la-module-null-source.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_pipe_sink_la-module-pipe-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_pipe_source_la-module-pipe-source.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_position_event_sounds_la-module-position-event-sounds.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_remap_sink_la-module-remap-sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_remap_source_la-module-remap-source.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_rescue_streams_la-module-rescue-streams.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_role_cork_la-module-role-cork.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_role_cork_la-stream-interaction.Plo@am__quote@
@@ -6986,10 +7077,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_rygel_media_server_la-module-rygel-media-server.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_simple_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_simple_protocol_unix_la-module-protocol-stub.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_sine_la-module-sine.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_sine_source_la-module-sine-source.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_solaris_la-module-solaris.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_stream_restore_la-module-stream-restore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_suspend_on_idle_la-module-suspend-on-idle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_switch_on_connect_la-module-switch-on-connect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_switch_on_port_available_la-module-switch-on-port-available.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_systemd_login_la-module-systemd-login.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_tunnel_sink_la-module-tunnel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_tunnel_sink_new_la-module-tunnel-sink-new.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_tunnel_source_la-module-tunnel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_tunnel_source_new_la-module-tunnel-source-new.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_udev_detect_la-module-udev-detect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_virtual_sink_la-module-virtual-sink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/$(DEPDIR)/module_virtual_source_la-module-virtual-source.Plo@am__quote@
@@ -7042,13 +7141,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@modules/echo-cancel/$(DEPDIR)/module_echo_cancel_la-speex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/gconf/$(DEPDIR)/gconf_helper-gconf-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/gconf/$(DEPDIR)/module_gconf_la-module-gconf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/gsettings/$(DEPDIR)/module_gsettings_la-module-gsettings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/jack/$(DEPDIR)/module_jack_sink_la-module-jack-sink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/jack/$(DEPDIR)/module_jack_source_la-module-jack-source.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/jack/$(DEPDIR)/module_jackdbus_detect_la-module-jackdbus-detect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module-bonjour-publish.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module-coreaudio-detect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module-coreaudio-device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/oss/$(DEPDIR)/module-oss.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module_bonjour_publish_la-module-bonjour-publish.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module_coreaudio_detect_la-module-coreaudio-detect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/macosx/$(DEPDIR)/module_coreaudio_device_la-module-coreaudio-device.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@modules/oss/$(DEPDIR)/module_oss_la-module-oss.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/oss/$(DEPDIR)/oss-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/raop/$(DEPDIR)/libraop_la-raop-client.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@modules/raop/$(DEPDIR)/libraop_la-raop-crypto.Plo@am__quote@
@@ -8760,6 +8861,13 @@ modules/module_always_sink_la-module-always-sink.lo: modules/module-always-sink.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_always_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_always_sink_la-module-always-sink.lo `test -f 'modules/module-always-sink.c' || echo '$(srcdir)/'`modules/module-always-sink.c
 
+modules/module_always_source_la-module-always-source.lo: modules/module-always-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_always_source_la_CFLAGS) $(CFLAGS) -MT modules/module_always_source_la-module-always-source.lo -MD -MP -MF modules/$(DEPDIR)/module_always_source_la-module-always-source.Tpo -c -o modules/module_always_source_la-module-always-source.lo `test -f 'modules/module-always-source.c' || echo '$(srcdir)/'`modules/module-always-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_always_source_la-module-always-source.Tpo modules/$(DEPDIR)/module_always_source_la-module-always-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-always-source.c' object='modules/module_always_source_la-module-always-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_always_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_always_source_la-module-always-source.lo `test -f 'modules/module-always-source.c' || echo '$(srcdir)/'`modules/module-always-source.c
+
 modules/module_augment_properties_la-module-augment-properties.lo: modules/module-augment-properties.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_augment_properties_la_CFLAGS) $(CFLAGS) -MT modules/module_augment_properties_la-module-augment-properties.lo -MD -MP -MF modules/$(DEPDIR)/module_augment_properties_la-module-augment-properties.Tpo -c -o modules/module_augment_properties_la-module-augment-properties.lo `test -f 'modules/module-augment-properties.c' || echo '$(srcdir)/'`modules/module-augment-properties.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_augment_properties_la-module-augment-properties.Tpo modules/$(DEPDIR)/module_augment_properties_la-module-augment-properties.Plo
@@ -8809,6 +8917,13 @@ modules/bluetooth/module_bluez5_discover_la-module-bluez5-discover.lo: modules/b
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_bluez5_discover_la_CFLAGS) $(CFLAGS) -c -o modules/bluetooth/module_bluez5_discover_la-module-bluez5-discover.lo `test -f 'modules/bluetooth/module-bluez5-discover.c' || echo '$(srcdir)/'`modules/bluetooth/module-bluez5-discover.c
 
+modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo: modules/macosx/module-bonjour-publish.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_bonjour_publish_la_CFLAGS) $(CFLAGS) -MT modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo -MD -MP -MF modules/macosx/$(DEPDIR)/module_bonjour_publish_la-module-bonjour-publish.Tpo -c -o modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo `test -f 'modules/macosx/module-bonjour-publish.c' || echo '$(srcdir)/'`modules/macosx/module-bonjour-publish.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/macosx/$(DEPDIR)/module_bonjour_publish_la-module-bonjour-publish.Tpo modules/macosx/$(DEPDIR)/module_bonjour_publish_la-module-bonjour-publish.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/macosx/module-bonjour-publish.c' object='modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_bonjour_publish_la_CFLAGS) $(CFLAGS) -c -o modules/macosx/module_bonjour_publish_la-module-bonjour-publish.lo `test -f 'modules/macosx/module-bonjour-publish.c' || echo '$(srcdir)/'`modules/macosx/module-bonjour-publish.c
+
 modules/module_card_restore_la-module-card-restore.lo: modules/module-card-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_card_restore_la_CFLAGS) $(CFLAGS) -MT modules/module_card_restore_la-module-card-restore.lo -MD -MP -MF modules/$(DEPDIR)/module_card_restore_la-module-card-restore.Tpo -c -o modules/module_card_restore_la-module-card-restore.lo `test -f 'modules/module-card-restore.c' || echo '$(srcdir)/'`modules/module-card-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_card_restore_la-module-card-restore.Tpo modules/$(DEPDIR)/module_card_restore_la-module-card-restore.Plo
@@ -8830,6 +8945,27 @@ modules/module_cli_protocol_unix_la-module-protocol-stub.lo: modules/module-prot
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_cli_protocol_unix_la_CFLAGS) $(CFLAGS) -c -o modules/module_cli_protocol_unix_la-module-protocol-stub.lo `test -f 'modules/module-protocol-stub.c' || echo '$(srcdir)/'`modules/module-protocol-stub.c
 
+modules/module_cli_la-module-cli.lo: modules/module-cli.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_cli_la_CFLAGS) $(CFLAGS) -MT modules/module_cli_la-module-cli.lo -MD -MP -MF modules/$(DEPDIR)/module_cli_la-module-cli.Tpo -c -o modules/module_cli_la-module-cli.lo `test -f 'modules/module-cli.c' || echo '$(srcdir)/'`modules/module-cli.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_cli_la-module-cli.Tpo modules/$(DEPDIR)/module_cli_la-module-cli.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-cli.c' object='modules/module_cli_la-module-cli.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_cli_la_CFLAGS) $(CFLAGS) -c -o modules/module_cli_la-module-cli.lo `test -f 'modules/module-cli.c' || echo '$(srcdir)/'`modules/module-cli.c
+
+modules/module_combine_sink_la-module-combine-sink.lo: modules/module-combine-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_combine_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_combine_sink_la-module-combine-sink.lo -MD -MP -MF modules/$(DEPDIR)/module_combine_sink_la-module-combine-sink.Tpo -c -o modules/module_combine_sink_la-module-combine-sink.lo `test -f 'modules/module-combine-sink.c' || echo '$(srcdir)/'`modules/module-combine-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_combine_sink_la-module-combine-sink.Tpo modules/$(DEPDIR)/module_combine_sink_la-module-combine-sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-combine-sink.c' object='modules/module_combine_sink_la-module-combine-sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_combine_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_combine_sink_la-module-combine-sink.lo `test -f 'modules/module-combine-sink.c' || echo '$(srcdir)/'`modules/module-combine-sink.c
+
+modules/module_combine_la-module-combine.lo: modules/module-combine.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_combine_la_CFLAGS) $(CFLAGS) -MT modules/module_combine_la-module-combine.lo -MD -MP -MF modules/$(DEPDIR)/module_combine_la-module-combine.Tpo -c -o modules/module_combine_la-module-combine.lo `test -f 'modules/module-combine.c' || echo '$(srcdir)/'`modules/module-combine.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_combine_la-module-combine.Tpo modules/$(DEPDIR)/module_combine_la-module-combine.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-combine.c' object='modules/module_combine_la-module-combine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_combine_la_CFLAGS) $(CFLAGS) -c -o modules/module_combine_la-module-combine.lo `test -f 'modules/module-combine.c' || echo '$(srcdir)/'`modules/module-combine.c
+
 modules/module_console_kit_la-module-console-kit.lo: modules/module-console-kit.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_console_kit_la_CFLAGS) $(CFLAGS) -MT modules/module_console_kit_la-module-console-kit.lo -MD -MP -MF modules/$(DEPDIR)/module_console_kit_la-module-console-kit.Tpo -c -o modules/module_console_kit_la-module-console-kit.lo `test -f 'modules/module-console-kit.c' || echo '$(srcdir)/'`modules/module-console-kit.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_console_kit_la-module-console-kit.Tpo modules/$(DEPDIR)/module_console_kit_la-module-console-kit.Plo
@@ -8837,6 +8973,20 @@ modules/module_console_kit_la-module-console-kit.lo: modules/module-console-kit.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_console_kit_la_CFLAGS) $(CFLAGS) -c -o modules/module_console_kit_la-module-console-kit.lo `test -f 'modules/module-console-kit.c' || echo '$(srcdir)/'`modules/module-console-kit.c
 
+modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo: modules/macosx/module-coreaudio-detect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_coreaudio_detect_la_CFLAGS) $(CFLAGS) -MT modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo -MD -MP -MF modules/macosx/$(DEPDIR)/module_coreaudio_detect_la-module-coreaudio-detect.Tpo -c -o modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo `test -f 'modules/macosx/module-coreaudio-detect.c' || echo '$(srcdir)/'`modules/macosx/module-coreaudio-detect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/macosx/$(DEPDIR)/module_coreaudio_detect_la-module-coreaudio-detect.Tpo modules/macosx/$(DEPDIR)/module_coreaudio_detect_la-module-coreaudio-detect.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/macosx/module-coreaudio-detect.c' object='modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_coreaudio_detect_la_CFLAGS) $(CFLAGS) -c -o modules/macosx/module_coreaudio_detect_la-module-coreaudio-detect.lo `test -f 'modules/macosx/module-coreaudio-detect.c' || echo '$(srcdir)/'`modules/macosx/module-coreaudio-detect.c
+
+modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo: modules/macosx/module-coreaudio-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_coreaudio_device_la_CFLAGS) $(CFLAGS) -MT modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo -MD -MP -MF modules/macosx/$(DEPDIR)/module_coreaudio_device_la-module-coreaudio-device.Tpo -c -o modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo `test -f 'modules/macosx/module-coreaudio-device.c' || echo '$(srcdir)/'`modules/macosx/module-coreaudio-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/macosx/$(DEPDIR)/module_coreaudio_device_la-module-coreaudio-device.Tpo modules/macosx/$(DEPDIR)/module_coreaudio_device_la-module-coreaudio-device.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/macosx/module-coreaudio-device.c' object='modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_coreaudio_device_la_CFLAGS) $(CFLAGS) -c -o modules/macosx/module_coreaudio_device_la-module-coreaudio-device.lo `test -f 'modules/macosx/module-coreaudio-device.c' || echo '$(srcdir)/'`modules/macosx/module-coreaudio-device.c
+
 modules/dbus/module_dbus_protocol_la-iface-card.lo: modules/dbus/iface-card.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT modules/dbus/module_dbus_protocol_la-iface-card.lo -MD -MP -MF modules/dbus/$(DEPDIR)/module_dbus_protocol_la-iface-card.Tpo -c -o modules/dbus/module_dbus_protocol_la-iface-card.lo `test -f 'modules/dbus/iface-card.c' || echo '$(srcdir)/'`modules/dbus/iface-card.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/dbus/$(DEPDIR)/module_dbus_protocol_la-iface-card.Tpo modules/dbus/$(DEPDIR)/module_dbus_protocol_la-iface-card.Plo
@@ -8991,6 +9141,20 @@ modules/module_equalizer_sink_la-module-equalizer-sink.lo: modules/module-equali
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_equalizer_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_equalizer_sink_la-module-equalizer-sink.lo `test -f 'modules/module-equalizer-sink.c' || echo '$(srcdir)/'`modules/module-equalizer-sink.c
 
+modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo: modules/module-esound-compat-spawnfd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_compat_spawnfd_la_CFLAGS) $(CFLAGS) -MT modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo -MD -MP -MF modules/$(DEPDIR)/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.Tpo -c -o modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo `test -f 'modules/module-esound-compat-spawnfd.c' || echo '$(srcdir)/'`modules/module-esound-compat-spawnfd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.Tpo modules/$(DEPDIR)/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-esound-compat-spawnfd.c' object='modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_compat_spawnfd_la_CFLAGS) $(CFLAGS) -c -o modules/module_esound_compat_spawnfd_la-module-esound-compat-spawnfd.lo `test -f 'modules/module-esound-compat-spawnfd.c' || echo '$(srcdir)/'`modules/module-esound-compat-spawnfd.c
+
+modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo: modules/module-esound-compat-spawnpid.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_compat_spawnpid_la_CFLAGS) $(CFLAGS) -MT modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo -MD -MP -MF modules/$(DEPDIR)/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.Tpo -c -o modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo `test -f 'modules/module-esound-compat-spawnpid.c' || echo '$(srcdir)/'`modules/module-esound-compat-spawnpid.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.Tpo modules/$(DEPDIR)/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-esound-compat-spawnpid.c' object='modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_compat_spawnpid_la_CFLAGS) $(CFLAGS) -c -o modules/module_esound_compat_spawnpid_la-module-esound-compat-spawnpid.lo `test -f 'modules/module-esound-compat-spawnpid.c' || echo '$(srcdir)/'`modules/module-esound-compat-spawnpid.c
+
 modules/module_esound_protocol_tcp_la-module-protocol-stub.lo: modules/module-protocol-stub.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_protocol_tcp_la_CFLAGS) $(CFLAGS) -MT modules/module_esound_protocol_tcp_la-module-protocol-stub.lo -MD -MP -MF modules/$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Tpo -c -o modules/module_esound_protocol_tcp_la-module-protocol-stub.lo `test -f 'modules/module-protocol-stub.c' || echo '$(srcdir)/'`modules/module-protocol-stub.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Tpo modules/$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Plo
@@ -9005,6 +9169,34 @@ modules/module_esound_protocol_unix_la-module-protocol-stub.lo: modules/module-p
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_protocol_unix_la_CFLAGS) $(CFLAGS) -c -o modules/module_esound_protocol_unix_la-module-protocol-stub.lo `test -f 'modules/module-protocol-stub.c' || echo '$(srcdir)/'`modules/module-protocol-stub.c
 
+modules/module_esound_sink_la-module-esound-sink.lo: modules/module-esound-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_esound_sink_la-module-esound-sink.lo -MD -MP -MF modules/$(DEPDIR)/module_esound_sink_la-module-esound-sink.Tpo -c -o modules/module_esound_sink_la-module-esound-sink.lo `test -f 'modules/module-esound-sink.c' || echo '$(srcdir)/'`modules/module-esound-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_esound_sink_la-module-esound-sink.Tpo modules/$(DEPDIR)/module_esound_sink_la-module-esound-sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-esound-sink.c' object='modules/module_esound_sink_la-module-esound-sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_esound_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_esound_sink_la-module-esound-sink.lo `test -f 'modules/module-esound-sink.c' || echo '$(srcdir)/'`modules/module-esound-sink.c
+
+modules/module_filter_apply_la-module-filter-apply.lo: modules/module-filter-apply.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_filter_apply_la_CFLAGS) $(CFLAGS) -MT modules/module_filter_apply_la-module-filter-apply.lo -MD -MP -MF modules/$(DEPDIR)/module_filter_apply_la-module-filter-apply.Tpo -c -o modules/module_filter_apply_la-module-filter-apply.lo `test -f 'modules/module-filter-apply.c' || echo '$(srcdir)/'`modules/module-filter-apply.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_filter_apply_la-module-filter-apply.Tpo modules/$(DEPDIR)/module_filter_apply_la-module-filter-apply.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-filter-apply.c' object='modules/module_filter_apply_la-module-filter-apply.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_filter_apply_la_CFLAGS) $(CFLAGS) -c -o modules/module_filter_apply_la-module-filter-apply.lo `test -f 'modules/module-filter-apply.c' || echo '$(srcdir)/'`modules/module-filter-apply.c
+
+modules/module_filter_heuristics_la-module-filter-heuristics.lo: modules/module-filter-heuristics.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_filter_heuristics_la_CFLAGS) $(CFLAGS) -MT modules/module_filter_heuristics_la-module-filter-heuristics.lo -MD -MP -MF modules/$(DEPDIR)/module_filter_heuristics_la-module-filter-heuristics.Tpo -c -o modules/module_filter_heuristics_la-module-filter-heuristics.lo `test -f 'modules/module-filter-heuristics.c' || echo '$(srcdir)/'`modules/module-filter-heuristics.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_filter_heuristics_la-module-filter-heuristics.Tpo modules/$(DEPDIR)/module_filter_heuristics_la-module-filter-heuristics.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-filter-heuristics.c' object='modules/module_filter_heuristics_la-module-filter-heuristics.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_filter_heuristics_la_CFLAGS) $(CFLAGS) -c -o modules/module_filter_heuristics_la-module-filter-heuristics.lo `test -f 'modules/module-filter-heuristics.c' || echo '$(srcdir)/'`modules/module-filter-heuristics.c
+
+modules/module_gconf_la-stdin-util.lo: modules/stdin-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gconf_la_CFLAGS) $(CFLAGS) -MT modules/module_gconf_la-stdin-util.lo -MD -MP -MF modules/$(DEPDIR)/module_gconf_la-stdin-util.Tpo -c -o modules/module_gconf_la-stdin-util.lo `test -f 'modules/stdin-util.c' || echo '$(srcdir)/'`modules/stdin-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_gconf_la-stdin-util.Tpo modules/$(DEPDIR)/module_gconf_la-stdin-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/stdin-util.c' object='modules/module_gconf_la-stdin-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gconf_la_CFLAGS) $(CFLAGS) -c -o modules/module_gconf_la-stdin-util.lo `test -f 'modules/stdin-util.c' || echo '$(srcdir)/'`modules/stdin-util.c
+
 modules/gconf/module_gconf_la-module-gconf.lo: modules/gconf/module-gconf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gconf_la_CFLAGS) $(CFLAGS) -MT modules/gconf/module_gconf_la-module-gconf.lo -MD -MP -MF modules/gconf/$(DEPDIR)/module_gconf_la-module-gconf.Tpo -c -o modules/gconf/module_gconf_la-module-gconf.lo `test -f 'modules/gconf/module-gconf.c' || echo '$(srcdir)/'`modules/gconf/module-gconf.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/gconf/$(DEPDIR)/module_gconf_la-module-gconf.Tpo modules/gconf/$(DEPDIR)/module_gconf_la-module-gconf.Plo
@@ -9012,6 +9204,20 @@ modules/gconf/module_gconf_la-module-gconf.lo: modules/gconf/module-gconf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gconf_la_CFLAGS) $(CFLAGS) -c -o modules/gconf/module_gconf_la-module-gconf.lo `test -f 'modules/gconf/module-gconf.c' || echo '$(srcdir)/'`modules/gconf/module-gconf.c
 
+modules/module_gsettings_la-stdin-util.lo: modules/stdin-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gsettings_la_CFLAGS) $(CFLAGS) -MT modules/module_gsettings_la-stdin-util.lo -MD -MP -MF modules/$(DEPDIR)/module_gsettings_la-stdin-util.Tpo -c -o modules/module_gsettings_la-stdin-util.lo `test -f 'modules/stdin-util.c' || echo '$(srcdir)/'`modules/stdin-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_gsettings_la-stdin-util.Tpo modules/$(DEPDIR)/module_gsettings_la-stdin-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/stdin-util.c' object='modules/module_gsettings_la-stdin-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gsettings_la_CFLAGS) $(CFLAGS) -c -o modules/module_gsettings_la-stdin-util.lo `test -f 'modules/stdin-util.c' || echo '$(srcdir)/'`modules/stdin-util.c
+
+modules/gsettings/module_gsettings_la-module-gsettings.lo: modules/gsettings/module-gsettings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gsettings_la_CFLAGS) $(CFLAGS) -MT modules/gsettings/module_gsettings_la-module-gsettings.lo -MD -MP -MF modules/gsettings/$(DEPDIR)/module_gsettings_la-module-gsettings.Tpo -c -o modules/gsettings/module_gsettings_la-module-gsettings.lo `test -f 'modules/gsettings/module-gsettings.c' || echo '$(srcdir)/'`modules/gsettings/module-gsettings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/gsettings/$(DEPDIR)/module_gsettings_la-module-gsettings.Tpo modules/gsettings/$(DEPDIR)/module_gsettings_la-module-gsettings.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/gsettings/module-gsettings.c' object='modules/gsettings/module_gsettings_la-module-gsettings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_gsettings_la_CFLAGS) $(CFLAGS) -c -o modules/gsettings/module_gsettings_la-module-gsettings.lo `test -f 'modules/gsettings/module-gsettings.c' || echo '$(srcdir)/'`modules/gsettings/module-gsettings.c
+
 modules/module_hal_detect_la-module-hal-detect-compat.lo: modules/module-hal-detect-compat.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_hal_detect_la_CFLAGS) $(CFLAGS) -MT modules/module_hal_detect_la-module-hal-detect-compat.lo -MD -MP -MF modules/$(DEPDIR)/module_hal_detect_la-module-hal-detect-compat.Tpo -c -o modules/module_hal_detect_la-module-hal-detect-compat.lo `test -f 'modules/module-hal-detect-compat.c' || echo '$(srcdir)/'`modules/module-hal-detect-compat.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_hal_detect_la-module-hal-detect-compat.Tpo modules/$(DEPDIR)/module_hal_detect_la-module-hal-detect-compat.Plo
@@ -9075,6 +9281,20 @@ modules/module_lirc_la-module-lirc.lo: modules/module-lirc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_lirc_la_CFLAGS) $(CFLAGS) -c -o modules/module_lirc_la-module-lirc.lo `test -f 'modules/module-lirc.c' || echo '$(srcdir)/'`modules/module-lirc.c
 
+modules/module_loopback_la-module-loopback.lo: modules/module-loopback.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_loopback_la_CFLAGS) $(CFLAGS) -MT modules/module_loopback_la-module-loopback.lo -MD -MP -MF modules/$(DEPDIR)/module_loopback_la-module-loopback.Tpo -c -o modules/module_loopback_la-module-loopback.lo `test -f 'modules/module-loopback.c' || echo '$(srcdir)/'`modules/module-loopback.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_loopback_la-module-loopback.Tpo modules/$(DEPDIR)/module_loopback_la-module-loopback.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-loopback.c' object='modules/module_loopback_la-module-loopback.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_loopback_la_CFLAGS) $(CFLAGS) -c -o modules/module_loopback_la-module-loopback.lo `test -f 'modules/module-loopback.c' || echo '$(srcdir)/'`modules/module-loopback.c
+
+modules/module_match_la-module-match.lo: modules/module-match.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_match_la_CFLAGS) $(CFLAGS) -MT modules/module_match_la-module-match.lo -MD -MP -MF modules/$(DEPDIR)/module_match_la-module-match.Tpo -c -o modules/module_match_la-module-match.lo `test -f 'modules/module-match.c' || echo '$(srcdir)/'`modules/module-match.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_match_la-module-match.Tpo modules/$(DEPDIR)/module_match_la-module-match.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-match.c' object='modules/module_match_la-module-match.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_match_la_CFLAGS) $(CFLAGS) -c -o modules/module_match_la-module-match.lo `test -f 'modules/module-match.c' || echo '$(srcdir)/'`modules/module-match.c
+
 modules/module_mmkbd_evdev_la-module-mmkbd-evdev.lo: modules/module-mmkbd-evdev.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_mmkbd_evdev_la_CFLAGS) $(CFLAGS) -MT modules/module_mmkbd_evdev_la-module-mmkbd-evdev.lo -MD -MP -MF modules/$(DEPDIR)/module_mmkbd_evdev_la-module-mmkbd-evdev.Tpo -c -o modules/module_mmkbd_evdev_la-module-mmkbd-evdev.lo `test -f 'modules/module-mmkbd-evdev.c' || echo '$(srcdir)/'`modules/module-mmkbd-evdev.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_mmkbd_evdev_la-module-mmkbd-evdev.Tpo modules/$(DEPDIR)/module_mmkbd_evdev_la-module-mmkbd-evdev.Plo
@@ -9103,6 +9323,41 @@ modules/module_native_protocol_unix_la-module-protocol-stub.lo: modules/module-p
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_native_protocol_unix_la_CFLAGS) $(CFLAGS) -c -o modules/module_native_protocol_unix_la-module-protocol-stub.lo `test -f 'modules/module-protocol-stub.c' || echo '$(srcdir)/'`modules/module-protocol-stub.c
 
+modules/module_null_sink_la-module-null-sink.lo: modules/module-null-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_null_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_null_sink_la-module-null-sink.lo -MD -MP -MF modules/$(DEPDIR)/module_null_sink_la-module-null-sink.Tpo -c -o modules/module_null_sink_la-module-null-sink.lo `test -f 'modules/module-null-sink.c' || echo '$(srcdir)/'`modules/module-null-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_null_sink_la-module-null-sink.Tpo modules/$(DEPDIR)/module_null_sink_la-module-null-sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-null-sink.c' object='modules/module_null_sink_la-module-null-sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_null_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_null_sink_la-module-null-sink.lo `test -f 'modules/module-null-sink.c' || echo '$(srcdir)/'`modules/module-null-sink.c
+
+modules/module_null_source_la-module-null-source.lo: modules/module-null-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_null_source_la_CFLAGS) $(CFLAGS) -MT modules/module_null_source_la-module-null-source.lo -MD -MP -MF modules/$(DEPDIR)/module_null_source_la-module-null-source.Tpo -c -o modules/module_null_source_la-module-null-source.lo `test -f 'modules/module-null-source.c' || echo '$(srcdir)/'`modules/module-null-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_null_source_la-module-null-source.Tpo modules/$(DEPDIR)/module_null_source_la-module-null-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-null-source.c' object='modules/module_null_source_la-module-null-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_null_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_null_source_la-module-null-source.lo `test -f 'modules/module-null-source.c' || echo '$(srcdir)/'`modules/module-null-source.c
+
+modules/oss/module_oss_la-module-oss.lo: modules/oss/module-oss.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_oss_la_CFLAGS) $(CFLAGS) -MT modules/oss/module_oss_la-module-oss.lo -MD -MP -MF modules/oss/$(DEPDIR)/module_oss_la-module-oss.Tpo -c -o modules/oss/module_oss_la-module-oss.lo `test -f 'modules/oss/module-oss.c' || echo '$(srcdir)/'`modules/oss/module-oss.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/oss/$(DEPDIR)/module_oss_la-module-oss.Tpo modules/oss/$(DEPDIR)/module_oss_la-module-oss.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/oss/module-oss.c' object='modules/oss/module_oss_la-module-oss.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_oss_la_CFLAGS) $(CFLAGS) -c -o modules/oss/module_oss_la-module-oss.lo `test -f 'modules/oss/module-oss.c' || echo '$(srcdir)/'`modules/oss/module-oss.c
+
+modules/module_pipe_sink_la-module-pipe-sink.lo: modules/module-pipe-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_pipe_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_pipe_sink_la-module-pipe-sink.lo -MD -MP -MF modules/$(DEPDIR)/module_pipe_sink_la-module-pipe-sink.Tpo -c -o modules/module_pipe_sink_la-module-pipe-sink.lo `test -f 'modules/module-pipe-sink.c' || echo '$(srcdir)/'`modules/module-pipe-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_pipe_sink_la-module-pipe-sink.Tpo modules/$(DEPDIR)/module_pipe_sink_la-module-pipe-sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-pipe-sink.c' object='modules/module_pipe_sink_la-module-pipe-sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_pipe_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_pipe_sink_la-module-pipe-sink.lo `test -f 'modules/module-pipe-sink.c' || echo '$(srcdir)/'`modules/module-pipe-sink.c
+
+modules/module_pipe_source_la-module-pipe-source.lo: modules/module-pipe-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_pipe_source_la_CFLAGS) $(CFLAGS) -MT modules/module_pipe_source_la-module-pipe-source.lo -MD -MP -MF modules/$(DEPDIR)/module_pipe_source_la-module-pipe-source.Tpo -c -o modules/module_pipe_source_la-module-pipe-source.lo `test -f 'modules/module-pipe-source.c' || echo '$(srcdir)/'`modules/module-pipe-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_pipe_source_la-module-pipe-source.Tpo modules/$(DEPDIR)/module_pipe_source_la-module-pipe-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-pipe-source.c' object='modules/module_pipe_source_la-module-pipe-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_pipe_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_pipe_source_la-module-pipe-source.lo `test -f 'modules/module-pipe-source.c' || echo '$(srcdir)/'`modules/module-pipe-source.c
+
 modules/module_position_event_sounds_la-module-position-event-sounds.lo: modules/module-position-event-sounds.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_position_event_sounds_la_CFLAGS) $(CFLAGS) -MT modules/module_position_event_sounds_la-module-position-event-sounds.lo -MD -MP -MF modules/$(DEPDIR)/module_position_event_sounds_la-module-position-event-sounds.Tpo -c -o modules/module_position_event_sounds_la-module-position-event-sounds.lo `test -f 'modules/module-position-event-sounds.c' || echo '$(srcdir)/'`modules/module-position-event-sounds.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_position_event_sounds_la-module-position-event-sounds.Tpo modules/$(DEPDIR)/module_position_event_sounds_la-module-position-event-sounds.Plo
@@ -9124,6 +9379,20 @@ modules/raop/module_raop_sink_la-module-raop-sink.lo: modules/raop/module-raop-s
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_raop_sink_la_CFLAGS) $(CFLAGS) -c -o modules/raop/module_raop_sink_la-module-raop-sink.lo `test -f 'modules/raop/module-raop-sink.c' || echo '$(srcdir)/'`modules/raop/module-raop-sink.c
 
+modules/module_remap_sink_la-module-remap-sink.lo: modules/module-remap-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_remap_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_remap_sink_la-module-remap-sink.lo -MD -MP -MF modules/$(DEPDIR)/module_remap_sink_la-module-remap-sink.Tpo -c -o modules/module_remap_sink_la-module-remap-sink.lo `test -f 'modules/module-remap-sink.c' || echo '$(srcdir)/'`modules/module-remap-sink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_remap_sink_la-module-remap-sink.Tpo modules/$(DEPDIR)/module_remap_sink_la-module-remap-sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-remap-sink.c' object='modules/module_remap_sink_la-module-remap-sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_remap_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_remap_sink_la-module-remap-sink.lo `test -f 'modules/module-remap-sink.c' || echo '$(srcdir)/'`modules/module-remap-sink.c
+
+modules/module_remap_source_la-module-remap-source.lo: modules/module-remap-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_remap_source_la_CFLAGS) $(CFLAGS) -MT modules/module_remap_source_la-module-remap-source.lo -MD -MP -MF modules/$(DEPDIR)/module_remap_source_la-module-remap-source.Tpo -c -o modules/module_remap_source_la-module-remap-source.lo `test -f 'modules/module-remap-source.c' || echo '$(srcdir)/'`modules/module-remap-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_remap_source_la-module-remap-source.Tpo modules/$(DEPDIR)/module_remap_source_la-module-remap-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-remap-source.c' object='modules/module_remap_source_la-module-remap-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_remap_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_remap_source_la-module-remap-source.lo `test -f 'modules/module-remap-source.c' || echo '$(srcdir)/'`modules/module-remap-source.c
+
 modules/module_rescue_streams_la-module-rescue-streams.lo: modules/module-rescue-streams.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_rescue_streams_la_CFLAGS) $(CFLAGS) -MT modules/module_rescue_streams_la-module-rescue-streams.lo -MD -MP -MF modules/$(DEPDIR)/module_rescue_streams_la-module-rescue-streams.Tpo -c -o modules/module_rescue_streams_la-module-rescue-streams.lo `test -f 'modules/module-rescue-streams.c' || echo '$(srcdir)/'`modules/module-rescue-streams.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_rescue_streams_la-module-rescue-streams.Tpo modules/$(DEPDIR)/module_rescue_streams_la-module-rescue-streams.Plo
@@ -9194,6 +9463,27 @@ modules/module_simple_protocol_unix_la-module-protocol-stub.lo: modules/module-p
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_simple_protocol_unix_la_CFLAGS) $(CFLAGS) -c -o modules/module_simple_protocol_unix_la-module-protocol-stub.lo `test -f 'modules/module-protocol-stub.c' || echo '$(srcdir)/'`modules/module-protocol-stub.c
 
+modules/module_sine_source_la-module-sine-source.lo: modules/module-sine-source.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_sine_source_la_CFLAGS) $(CFLAGS) -MT modules/module_sine_source_la-module-sine-source.lo -MD -MP -MF modules/$(DEPDIR)/module_sine_source_la-module-sine-source.Tpo -c -o modules/module_sine_source_la-module-sine-source.lo `test -f 'modules/module-sine-source.c' || echo '$(srcdir)/'`modules/module-sine-source.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_sine_source_la-module-sine-source.Tpo modules/$(DEPDIR)/module_sine_source_la-module-sine-source.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-sine-source.c' object='modules/module_sine_source_la-module-sine-source.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_sine_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_sine_source_la-module-sine-source.lo `test -f 'modules/module-sine-source.c' || echo '$(srcdir)/'`modules/module-sine-source.c
+
+modules/module_sine_la-module-sine.lo: modules/module-sine.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_sine_la_CFLAGS) $(CFLAGS) -MT modules/module_sine_la-module-sine.lo -MD -MP -MF modules/$(DEPDIR)/module_sine_la-module-sine.Tpo -c -o modules/module_sine_la-module-sine.lo `test -f 'modules/module-sine.c' || echo '$(srcdir)/'`modules/module-sine.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_sine_la-module-sine.Tpo modules/$(DEPDIR)/module_sine_la-module-sine.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-sine.c' object='modules/module_sine_la-module-sine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_sine_la_CFLAGS) $(CFLAGS) -c -o modules/module_sine_la-module-sine.lo `test -f 'modules/module-sine.c' || echo '$(srcdir)/'`modules/module-sine.c
+
+modules/module_solaris_la-module-solaris.lo: modules/module-solaris.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_solaris_la_CFLAGS) $(CFLAGS) -MT modules/module_solaris_la-module-solaris.lo -MD -MP -MF modules/$(DEPDIR)/module_solaris_la-module-solaris.Tpo -c -o modules/module_solaris_la-module-solaris.lo `test -f 'modules/module-solaris.c' || echo '$(srcdir)/'`modules/module-solaris.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_solaris_la-module-solaris.Tpo modules/$(DEPDIR)/module_solaris_la-module-solaris.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-solaris.c' object='modules/module_solaris_la-module-solaris.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_solaris_la_CFLAGS) $(CFLAGS) -c -o modules/module_solaris_la-module-solaris.lo `test -f 'modules/module-solaris.c' || echo '$(srcdir)/'`modules/module-solaris.c
+
 modules/module_stream_restore_la-module-stream-restore.lo: modules/module-stream-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_stream_restore_la_CFLAGS) $(CFLAGS) -MT modules/module_stream_restore_la-module-stream-restore.lo -MD -MP -MF modules/$(DEPDIR)/module_stream_restore_la-module-stream-restore.Tpo -c -o modules/module_stream_restore_la-module-stream-restore.lo `test -f 'modules/module-stream-restore.c' || echo '$(srcdir)/'`modules/module-stream-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_stream_restore_la-module-stream-restore.Tpo modules/$(DEPDIR)/module_stream_restore_la-module-stream-restore.Plo
@@ -9208,6 +9498,20 @@ modules/module_suspend_on_idle_la-module-suspend-on-idle.lo: modules/module-susp
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_suspend_on_idle_la_CFLAGS) $(CFLAGS) -c -o modules/module_suspend_on_idle_la-module-suspend-on-idle.lo `test -f 'modules/module-suspend-on-idle.c' || echo '$(srcdir)/'`modules/module-suspend-on-idle.c
 
+modules/module_switch_on_connect_la-module-switch-on-connect.lo: modules/module-switch-on-connect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_switch_on_connect_la_CFLAGS) $(CFLAGS) -MT modules/module_switch_on_connect_la-module-switch-on-connect.lo -MD -MP -MF modules/$(DEPDIR)/module_switch_on_connect_la-module-switch-on-connect.Tpo -c -o modules/module_switch_on_connect_la-module-switch-on-connect.lo `test -f 'modules/module-switch-on-connect.c' || echo '$(srcdir)/'`modules/module-switch-on-connect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_switch_on_connect_la-module-switch-on-connect.Tpo modules/$(DEPDIR)/module_switch_on_connect_la-module-switch-on-connect.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-switch-on-connect.c' object='modules/module_switch_on_connect_la-module-switch-on-connect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_switch_on_connect_la_CFLAGS) $(CFLAGS) -c -o modules/module_switch_on_connect_la-module-switch-on-connect.lo `test -f 'modules/module-switch-on-connect.c' || echo '$(srcdir)/'`modules/module-switch-on-connect.c
+
+modules/module_switch_on_port_available_la-module-switch-on-port-available.lo: modules/module-switch-on-port-available.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_switch_on_port_available_la_CFLAGS) $(CFLAGS) -MT modules/module_switch_on_port_available_la-module-switch-on-port-available.lo -MD -MP -MF modules/$(DEPDIR)/module_switch_on_port_available_la-module-switch-on-port-available.Tpo -c -o modules/module_switch_on_port_available_la-module-switch-on-port-available.lo `test -f 'modules/module-switch-on-port-available.c' || echo '$(srcdir)/'`modules/module-switch-on-port-available.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_switch_on_port_available_la-module-switch-on-port-available.Tpo modules/$(DEPDIR)/module_switch_on_port_available_la-module-switch-on-port-available.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-switch-on-port-available.c' object='modules/module_switch_on_port_available_la-module-switch-on-port-available.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_switch_on_port_available_la_CFLAGS) $(CFLAGS) -c -o modules/module_switch_on_port_available_la-module-switch-on-port-available.lo `test -f 'modules/module-switch-on-port-available.c' || echo '$(srcdir)/'`modules/module-switch-on-port-available.c
+
 modules/module_systemd_login_la-module-systemd-login.lo: modules/module-systemd-login.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_systemd_login_la_CFLAGS) $(CFLAGS) -MT modules/module_systemd_login_la-module-systemd-login.lo -MD -MP -MF modules/$(DEPDIR)/module_systemd_login_la-module-systemd-login.Tpo -c -o modules/module_systemd_login_la-module-systemd-login.lo `test -f 'modules/module-systemd-login.c' || echo '$(srcdir)/'`modules/module-systemd-login.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_systemd_login_la-module-systemd-login.Tpo modules/$(DEPDIR)/module_systemd_login_la-module-systemd-login.Plo
@@ -9215,6 +9519,13 @@ modules/module_systemd_login_la-module-systemd-login.lo: modules/module-systemd-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_systemd_login_la_CFLAGS) $(CFLAGS) -c -o modules/module_systemd_login_la-module-systemd-login.lo `test -f 'modules/module-systemd-login.c' || echo '$(srcdir)/'`modules/module-systemd-login.c
 
+modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo: modules/module-tunnel-sink-new.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_sink_new_la_CFLAGS) $(CFLAGS) -MT modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo -MD -MP -MF modules/$(DEPDIR)/module_tunnel_sink_new_la-module-tunnel-sink-new.Tpo -c -o modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo `test -f 'modules/module-tunnel-sink-new.c' || echo '$(srcdir)/'`modules/module-tunnel-sink-new.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_tunnel_sink_new_la-module-tunnel-sink-new.Tpo modules/$(DEPDIR)/module_tunnel_sink_new_la-module-tunnel-sink-new.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-tunnel-sink-new.c' object='modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_sink_new_la_CFLAGS) $(CFLAGS) -c -o modules/module_tunnel_sink_new_la-module-tunnel-sink-new.lo `test -f 'modules/module-tunnel-sink-new.c' || echo '$(srcdir)/'`modules/module-tunnel-sink-new.c
+
 modules/module_tunnel_sink_la-module-tunnel.lo: modules/module-tunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_sink_la_CFLAGS) $(CFLAGS) -MT modules/module_tunnel_sink_la-module-tunnel.lo -MD -MP -MF modules/$(DEPDIR)/module_tunnel_sink_la-module-tunnel.Tpo -c -o modules/module_tunnel_sink_la-module-tunnel.lo `test -f 'modules/module-tunnel.c' || echo '$(srcdir)/'`modules/module-tunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_tunnel_sink_la-module-tunnel.Tpo modules/$(DEPDIR)/module_tunnel_sink_la-module-tunnel.Plo
@@ -9222,6 +9533,20 @@ modules/module_tunnel_sink_la-module-tunnel.lo: modules/module-tunnel.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_sink_la_CFLAGS) $(CFLAGS) -c -o modules/module_tunnel_sink_la-module-tunnel.lo `test -f 'modules/module-tunnel.c' || echo '$(srcdir)/'`modules/module-tunnel.c
 
+modules/module_tunnel_source_new_la-module-tunnel-source-new.lo: modules/module-tunnel-source-new.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_source_new_la_CFLAGS) $(CFLAGS) -MT modules/module_tunnel_source_new_la-module-tunnel-source-new.lo -MD -MP -MF modules/$(DEPDIR)/module_tunnel_source_new_la-module-tunnel-source-new.Tpo -c -o modules/module_tunnel_source_new_la-module-tunnel-source-new.lo `test -f 'modules/module-tunnel-source-new.c' || echo '$(srcdir)/'`modules/module-tunnel-source-new.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_tunnel_source_new_la-module-tunnel-source-new.Tpo modules/$(DEPDIR)/module_tunnel_source_new_la-module-tunnel-source-new.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-tunnel-source-new.c' object='modules/module_tunnel_source_new_la-module-tunnel-source-new.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_source_new_la_CFLAGS) $(CFLAGS) -c -o modules/module_tunnel_source_new_la-module-tunnel-source-new.lo `test -f 'modules/module-tunnel-source-new.c' || echo '$(srcdir)/'`modules/module-tunnel-source-new.c
+
+modules/module_tunnel_source_la-module-tunnel.lo: modules/module-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_source_la_CFLAGS) $(CFLAGS) -MT modules/module_tunnel_source_la-module-tunnel.lo -MD -MP -MF modules/$(DEPDIR)/module_tunnel_source_la-module-tunnel.Tpo -c -o modules/module_tunnel_source_la-module-tunnel.lo `test -f 'modules/module-tunnel.c' || echo '$(srcdir)/'`modules/module-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_tunnel_source_la-module-tunnel.Tpo modules/$(DEPDIR)/module_tunnel_source_la-module-tunnel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/module-tunnel.c' object='modules/module_tunnel_source_la-module-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_tunnel_source_la_CFLAGS) $(CFLAGS) -c -o modules/module_tunnel_source_la-module-tunnel.lo `test -f 'modules/module-tunnel.c' || echo '$(srcdir)/'`modules/module-tunnel.c
+
 modules/module_udev_detect_la-module-udev-detect.lo: modules/module-udev-detect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_udev_detect_la_CFLAGS) $(CFLAGS) -MT modules/module_udev_detect_la-module-udev-detect.lo -MD -MP -MF modules/$(DEPDIR)/module_udev_detect_la-module-udev-detect.Tpo -c -o modules/module_udev_detect_la-module-udev-detect.lo `test -f 'modules/module-udev-detect.c' || echo '$(srcdir)/'`modules/module-udev-detect.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_udev_detect_la-module-udev-detect.Tpo modules/$(DEPDIR)/module_udev_detect_la-module-udev-detect.Plo
@@ -9684,6 +10009,20 @@ tests/get_binary_name_test-get-binary-name-test.obj: tests/get-binary-name-test.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_binary_name_test_CFLAGS) $(CFLAGS) -c -o tests/get_binary_name_test-get-binary-name-test.obj `if test -f 'tests/get-binary-name-test.c'; then $(CYGPATH_W) 'tests/get-binary-name-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/get-binary-name-test.c'; fi`
 
+modules/gsettings/gsettings_helper-gsettings-helper.o: modules/gsettings/gsettings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsettings_helper_CFLAGS) $(CFLAGS) -MT modules/gsettings/gsettings_helper-gsettings-helper.o -MD -MP -MF modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Tpo -c -o modules/gsettings/gsettings_helper-gsettings-helper.o `test -f 'modules/gsettings/gsettings-helper.c' || echo '$(srcdir)/'`modules/gsettings/gsettings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Tpo modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/gsettings/gsettings-helper.c' object='modules/gsettings/gsettings_helper-gsettings-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsettings_helper_CFLAGS) $(CFLAGS) -c -o modules/gsettings/gsettings_helper-gsettings-helper.o `test -f 'modules/gsettings/gsettings-helper.c' || echo '$(srcdir)/'`modules/gsettings/gsettings-helper.c
+
+modules/gsettings/gsettings_helper-gsettings-helper.obj: modules/gsettings/gsettings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsettings_helper_CFLAGS) $(CFLAGS) -MT modules/gsettings/gsettings_helper-gsettings-helper.obj -MD -MP -MF modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Tpo -c -o modules/gsettings/gsettings_helper-gsettings-helper.obj `if test -f 'modules/gsettings/gsettings-helper.c'; then $(CYGPATH_W) 'modules/gsettings/gsettings-helper.c'; else $(CYGPATH_W) '$(srcdir)/modules/gsettings/gsettings-helper.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Tpo modules/gsettings/$(DEPDIR)/gsettings_helper-gsettings-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/gsettings/gsettings-helper.c' object='modules/gsettings/gsettings_helper-gsettings-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsettings_helper_CFLAGS) $(CFLAGS) -c -o modules/gsettings/gsettings_helper-gsettings-helper.obj `if test -f 'modules/gsettings/gsettings-helper.c'; then $(CYGPATH_W) 'modules/gsettings/gsettings-helper.c'; else $(CYGPATH_W) '$(srcdir)/modules/gsettings/gsettings-helper.c'; fi`
+
 tests/gtk_test-gtk-test.o: tests/gtk-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_test_CFLAGS) $(CFLAGS) -MT tests/gtk_test-gtk-test.o -MD -MP -MF tests/$(DEPDIR)/gtk_test-gtk-test.Tpo -c -o tests/gtk_test-gtk-test.o `test -f 'tests/gtk-test.c' || echo '$(srcdir)/'`tests/gtk-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/gtk_test-gtk-test.Tpo tests/$(DEPDIR)/gtk_test-gtk-test.Po
@@ -10412,6 +10751,7 @@ clean-libtool:
 	-rm -rf modules/dbus/.libs modules/dbus/_libs
 	-rm -rf modules/echo-cancel/.libs modules/echo-cancel/_libs
 	-rm -rf modules/gconf/.libs modules/gconf/_libs
+	-rm -rf modules/gsettings/.libs modules/gsettings/_libs
 	-rm -rf modules/jack/.libs modules/jack/_libs
 	-rm -rf modules/macosx/.libs modules/macosx/_libs
 	-rm -rf modules/oss/.libs modules/oss/_libs
@@ -10509,6 +10849,27 @@ uninstall-dist_udevrulesDATA:
 	@list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
+install-gsettingsdataconvertDATA: $(gsettingsdataconvert_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(gsettingsdataconvert_DATA)'; test -n "$(gsettingsdataconvertdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(gsettingsdataconvertdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(gsettingsdataconvertdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gsettingsdataconvertdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsdataconvertdir)" || exit $$?; \
+	done
+
+uninstall-gsettingsdataconvertDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gsettingsdataconvert_DATA)'; test -n "$(gsettingsdataconvertdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(gsettingsdataconvertdir)'; $(am__uninstall_files_from_dir)
 install-pulseconfDATA: $(pulseconf_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pulseconf_DATA)'; test -n "$(pulseconfdir)" || list=; \
@@ -11094,7 +11455,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(commonlibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(padsplibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
+	for dir in "$(DESTDIR)$(commonlibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(padsplibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(gsettingsdataconvertdir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -11142,6 +11503,8 @@ distclean-generic:
 	-rm -f modules/echo-cancel/$(am__dirstamp)
 	-rm -f modules/gconf/$(DEPDIR)/$(am__dirstamp)
 	-rm -f modules/gconf/$(am__dirstamp)
+	-rm -f modules/gsettings/$(DEPDIR)/$(am__dirstamp)
+	-rm -f modules/gsettings/$(am__dirstamp)
 	-rm -f modules/jack/$(DEPDIR)/$(am__dirstamp)
 	-rm -f modules/jack/$(am__dirstamp)
 	-rm -f modules/macosx/$(DEPDIR)/$(am__dirstamp)
@@ -11184,7 +11547,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS \
 	clean-pulselibexecPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/gsettings/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -11203,9 +11566,10 @@ info-am:
 
 install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
 	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
-	install-dist_udevrulesDATA install-padsplibLTLIBRARIES \
-	install-pulseconfDATA install-pulseincludeHEADERS \
-	install-systemduserunitDATA install-xdgautostartDATA
+	install-dist_udevrulesDATA install-gsettingsdataconvertDATA \
+	install-padsplibLTLIBRARIES install-pulseconfDATA \
+	install-pulseincludeHEADERS install-systemduserunitDATA \
+	install-xdgautostartDATA
 
 install-dvi: install-dvi-am
 
@@ -11237,7 +11601,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/gsettings/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -11258,7 +11622,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-commonlibLTLIBRARIES uninstall-dbuspolicyDATA \
 	uninstall-dist_alsapathsDATA \
 	uninstall-dist_alsaprofilesetsDATA \
-	uninstall-dist_udevrulesDATA uninstall-libLTLIBRARIES \
+	uninstall-dist_udevrulesDATA \
+	uninstall-gsettingsdataconvertDATA uninstall-libLTLIBRARIES \
 	uninstall-modlibexecLTLIBRARIES uninstall-padsplibLTLIBRARIES \
 	uninstall-pkglibLTLIBRARIES uninstall-pulseconfDATA \
 	uninstall-pulseincludeHEADERS uninstall-pulselibexecPROGRAMS \
@@ -11282,23 +11647,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	install-data-am install-dbuspolicyDATA \
 	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
 	install-dist_udevrulesDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man \
-	install-modlibexecLTLIBRARIES install-padsplibLTLIBRARIES \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-pulseconfDATA \
-	install-pulseincludeHEADERS install-pulselibexecPROGRAMS \
-	install-strip install-systemduserunitDATA \
-	install-xdgautostartDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-commonlibLTLIBRARIES \
-	uninstall-dbuspolicyDATA uninstall-dist_alsapathsDATA \
+	install-exec install-exec-am install-exec-hook \
+	install-gsettingsdataconvertDATA install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-modlibexecLTLIBRARIES \
+	install-padsplibLTLIBRARIES install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-pulseconfDATA install-pulseincludeHEADERS \
+	install-pulselibexecPROGRAMS install-strip \
+	install-systemduserunitDATA install-xdgautostartDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-commonlibLTLIBRARIES uninstall-dbuspolicyDATA \
+	uninstall-dist_alsapathsDATA \
 	uninstall-dist_alsaprofilesetsDATA \
-	uninstall-dist_udevrulesDATA uninstall-hook \
+	uninstall-dist_udevrulesDATA \
+	uninstall-gsettingsdataconvertDATA uninstall-hook \
 	uninstall-libLTLIBRARIES uninstall-modlibexecLTLIBRARIES \
 	uninstall-padsplibLTLIBRARIES uninstall-pkglibLTLIBRARIES \
 	uninstall-pulseconfDATA uninstall-pulseincludeHEADERS \
@@ -11327,14 +11694,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 @HAVE_OSS_WRAPPER_TRUE@padsp: utils/padsp.in
 @HAVE_OSS_WRAPPER_TRUE@	$(edit) $< > $@
-
-$(SYMDEF_FILES): modules/module-defs.h.m4
-	$(AM_V_at)$(MKDIR_P) modules
-	$(AM_V_GEN)$(M4) -Dfname="$@" $< > $@
-
-.PHONY: builddirs
-builddirs:
-	$(AM_V_at)$(MKDIR_P) daemon modules
+@HAVE_GSETTINGS_TRUE@@GSETTINGS_RULES@
 install-exec-hook:
 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
author	Felipe Sateler <fsateler@debian.org>	2018-05-13 09:53:54 -0400
committer	Felipe Sateler <fsateler@debian.org>	2018-05-13 09:53:54 -0400
commit	eec08ca9a73ade8fe18fc49a2c9bda804825beb7 (patch)
tree	ff2520583a4e2989fce5e01f40e8d827264ce2fd /src/Makefile.in
parent	566eb308e762546c787714da8f6f4b8f1f54e42e (diff)