xen: Add Xen paravirtualized sink support.

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 229c792c11eb20cb4efdf4ecf7510455d3f30102..532770d5e42ce0507809ffcba434611e1ac3db87 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,7 @@ EXTRA_DIST = \
                daemon/esdcompat.in \
                daemon/start-pulseaudio-x11.in \
                daemon/start-pulseaudio-kde.in \
-               utils/padsp \
+               utils/padsp.in \
                utils/qpaeq \
                modules/module-defs.h.m4 \
                daemon/pulseaudio.desktop.in \
@@ -536,14 +536,6 @@ pkglib_LTLIBRARIES = \
 libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulse/client-conf.c pulse/client-conf.h \
                pulse/fork-detect.c pulse/fork-detect.h \
-               pulse/xmalloc.c pulse/xmalloc.h \
-               pulse/proplist.c pulse/proplist.h \
-               pulse/utf8.c pulse/utf8.h \
-               pulse/channelmap.c pulse/channelmap.h \
-               pulse/sample.c pulse/sample.h \
-               pulse/util.c pulse/util.h \
-               pulse/timeval.c pulse/timeval.h \
-               pulse/rtclock.c pulse/rtclock.h \
                pulsecore/atomic.h \
                pulsecore/authkey.c pulsecore/authkey.h \
                pulsecore/conf-parser.c pulsecore/conf-parser.h \
@@ -762,8 +754,18 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
 ###################################
 
 if HAVE_OSS_WRAPPER
-lib_LTLIBRARIES += libpulsedsp.la
-bin_SCRIPTS += utils/padsp
+padsplibdir = $(pkglibdir)
+padsplib_LTLIBRARIES = libpulsedsp.la
+bin_SCRIPTS += padsp
+
+edit = @SED@ \
+       -e "s|@pkglibdir[@]|$(pkglibdir)|g"
+
+padsp: utils/padsp.in
+       $(edit) $< > $@
+
+CLEANFILES += padsp
+
 endif
 
 libpulsedsp_la_SOURCES = utils/padsp.c
@@ -1009,7 +1011,9 @@ modlibexec_LTLIBRARIES += \
                module-loopback.la \
                module-virtual-sink.la \
                module-virtual-source.la \
+               module-virtual-surround-sink.la \
                module-switch-on-connect.la \
+               module-switch-on-port-available.la \
                module-filter-apply.la \
                module-filter-heuristics.la
 
@@ -1088,6 +1092,7 @@ modlibexec_LTLIBRARIES += \
 
 dist_alsaprofilesets_DATA = \
                modules/alsa/mixer/profile-sets/default.conf \
+               modules/alsa/mixer/profile-sets/extra-hdmi.conf \
                modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
                modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
                modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
@@ -1125,7 +1130,11 @@ dist_alsapaths_DATA = \
                modules/alsa/mixer/paths/analog-output-headphones-2.conf \
                modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
                modules/alsa/mixer/paths/analog-output-mono.conf \
-               modules/alsa/mixer/paths/iec958-stereo-output.conf
+               modules/alsa/mixer/paths/iec958-stereo-output.conf \
+               modules/alsa/mixer/paths/hdmi-output-0.conf \
+               modules/alsa/mixer/paths/hdmi-output-1.conf \
+               modules/alsa/mixer/paths/hdmi-output-2.conf \
+               modules/alsa/mixer/paths/hdmi-output-3.conf
 
 endif
 
@@ -1150,6 +1159,12 @@ modlibexec_LTLIBRARIES += \
                module-lirc.la
 endif
 
+if HAVE_XEN
+modlibexec_LTLIBRARIES += \
+               module-xenpv-sink.la
+endif
+
+
 if HAVE_EVDEV
 modlibexec_LTLIBRARIES += \
                module-mmkbd-evdev.la
@@ -1260,6 +1275,7 @@ SYMDEF_FILES = \
                module-zeroconf-discover-symdef.h \
                module-bonjour-publish-symdef.h \
                module-lirc-symdef.h \
+               module-xenpv-sink-symdef.h \
                module-mmkbd-evdev-symdef.h \
                module-http-protocol-tcp-symdef.h \
                module-http-protocol-unix-symdef.h \
@@ -1309,7 +1325,9 @@ SYMDEF_FILES = \
                module-loopback-symdef.h \
                module-virtual-sink-symdef.h \
                module-virtual-source-symdef.h \
+               module-virtual-surround-sink-symdef.h \
                module-switch-on-connect-symdef.h \
+               module-switch-on-port-available-symdef.h \
                module-filter-apply-symdef.h \
                module-filter-heuristics-symdef.h
 
@@ -1476,6 +1494,10 @@ module_switch_on_connect_la_SOURCES = modules/module-switch-on-connect.c
 module_switch_on_connect_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_switch_on_connect_la_LIBADD = $(MODULE_LIBADD)
 
+module_switch_on_port_available_la_SOURCES = modules/module-switch-on-port-available.c
+module_switch_on_port_available_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_switch_on_port_available_la_LIBADD = $(MODULE_LIBADD)
+
 module_filter_apply_la_SOURCES = modules/module-filter-apply.c
 module_filter_apply_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_filter_apply_la_LIBADD = $(MODULE_LIBADD)
@@ -1525,6 +1547,11 @@ module_virtual_source_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS)
 module_virtual_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_virtual_source_la_LIBADD = $(MODULE_LIBADD)
 
+module_virtual_surround_sink_la_SOURCES = modules/module-virtual-surround-sink.c
+module_virtual_surround_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS)
+module_virtual_surround_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_virtual_surround_sink_la_LIBADD = $(MODULE_LIBADD)
+
 # X11
 
 module_x11_bell_la_SOURCES = modules/x11/module-x11-bell.c
@@ -1648,6 +1675,15 @@ module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_lirc_la_LIBADD = $(MODULE_LIBADD) $(LIRC_LIBS)
 module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
 
+
+# Xen PV driver
+
+module_xenpv_sink_la_SOURCES = modules/xen/module-xenpv-sink.c modules/xen/gntalloc.h modules/xen/gntdev.h
+module_xenpv_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_xenpv_sink_la_LIBADD = $(MODULE_LIBADD) $(XEN_LIBS)
+module_xenpv_sink_la_CFLAGS = $(AM_CFLAGS) $(XEN_CFLAGS) -I$(top_srcdir)/src/modules/xen
+
+
 # Linux evdev
 
 module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
@@ -1982,4 +2018,23 @@ update-map-file:
 
 update-all: update-ffmpeg update-sbc update-map-file
 
-.PHONY: utils/padsp massif update-all update-ffmpeg update-sbc update-map-file
+# Force installation order of libraries. libtool relinks on install time, in
+# which case libpulsecommon has to be install before others, but the padsp
+# preload library has to be done after the normal libraries (e.g. libpulse)
+# ...
+# Unfortunately automake behaviour means that rules without commands also
+# override build-in rules, so it's not trivial to add dependencies.
+# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 for the workaround
+# ...
+# Isn't libtool/autotools fun!
+
+installlibLTLIBRARIES = install-libLTLIBRARIES
+$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES
+
+installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES
+$(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES
+
+installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES
+$(installpadsplibLTLIBRARIES): install-libLTLIBRARIES
+
+.PHONY: padsp massif update-all update-ffmpeg update-sbc update-map-file