zeroconf-discover: Specify the interface when connecting to a link-local IPv6 address

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b5814bf2eed1c73e63eed08b95d6c4dbbb9a0cce..83046a6eaa7f4540426cfc805875e9d73695e5f8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -601,6 +601,7 @@ pkglib_LTLIBRARIES = \
 libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulse/client-conf.c pulse/client-conf.h \
                pulse/fork-detect.c pulse/fork-detect.h \
+               pulse/format.c pulse/format.h \
                pulse/xmalloc.c pulse/xmalloc.h \
                pulse/proplist.c pulse/proplist.h \
                pulse/utf8.c pulse/utf8.h \
@@ -614,6 +615,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/authkey.c pulsecore/authkey.h \
                pulsecore/conf-parser.c pulsecore/conf-parser.h \
                pulsecore/core-error.c pulsecore/core-error.h \
+               pulsecore/core-format.c pulsecore/core-format.h \
                pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
                pulsecore/core-util.c pulsecore/core-util.h \
                pulsecore/creds.h \
@@ -675,9 +677,9 @@ else
 libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulsecore/poll-posix.c pulsecore/poll.h
 endif
 
-libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
+libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS)
 libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
-libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS)  $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
 
 if HAVE_X11
 libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
@@ -687,6 +689,11 @@ libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS)
 libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS)
 endif
 
+if HAVE_SYSTEMD_JOURNAL
+libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(JOURNAL_FLAGS)
+libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(JOURNAL_LIBS)
+endif
+
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(GLIB20_CFLAGS) $(GTK30_CFLAGS)
 
@@ -889,6 +896,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/remap_mmx.c pulsecore/remap_sse.c \
                pulsecore/resampler.c pulsecore/resampler.h \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
+               pulsecore/stream-util.c pulsecore/stream-util.h \
                pulsecore/mix.c pulsecore/mix.h \
                pulsecore/cpu.h \
                pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
@@ -1322,6 +1330,7 @@ endif
 
 if HAVE_BLUEZ
 modlibexec_LTLIBRARIES += \
+               module-bluetooth-discover.la \
                module-bluetooth-policy.la
 endif
 
@@ -1335,7 +1344,8 @@ endif
 if HAVE_BLUEZ_5
 modlibexec_LTLIBRARIES += \
                libbluez5-util.la \
-               module-bluez5-discover.la
+               module-bluez5-discover.la \
+               module-bluez5-device.la
 endif
 
 if HAVE_OPENSSL
@@ -1425,9 +1435,11 @@ SYMDEF_FILES = \
                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 \
@@ -2029,6 +2041,12 @@ module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
 module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+# 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)
+
 # Bluetooth BlueZ 4 sink / source
 module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c
 module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -2062,6 +2080,11 @@ module_bluez5_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez5-util.la
 module_bluez5_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+module_bluez5_device_la_SOURCES = modules/bluetooth/module-bluez5-device.c
+module_bluez5_device_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluez5_device_la_LIBADD = $(MODULE_LIBADD) $(SBC_LIBS) libbluez5-util.la
+module_bluez5_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS)
+
 # Apple Airtunes/RAOP
 module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c
 module_raop_sink_la_LDFLAGS = $(MODULE_LDFLAGS)