diff options
author | Stefano Karapetsas <[email protected]> | 2012-01-22 22:59:41 +0100 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2012-01-22 22:59:41 +0100 |
commit | 8f91d9b2cefd226c60234a6122b624ba65e7b424 (patch) | |
tree | 7b9422f117477da0aa0145a1f14a02ae47493969 /plugins/media-keys/cut-n-paste/Makefile.am | |
parent | 5c00322b3ea38a54d06e6390711dd49c31b77040 (diff) | |
download | mate-settings-daemon-8f91d9b2cefd226c60234a6122b624ba65e7b424.tar.bz2 mate-settings-daemon-8f91d9b2cefd226c60234a6122b624ba65e7b424.tar.xz |
add support for gstreamer/alsa/oss instead of pulse for media-keys
https://bugzilla.gnome.org/show_bug.cgi?id=571145
patch stolen from debian:
http://patch-tracker.debian.org/patch/series/view/gnome-settings-daemon/2.30.2-2+squeeze1/20_gstreamer.patch
Diffstat (limited to 'plugins/media-keys/cut-n-paste/Makefile.am')
-rw-r--r-- | plugins/media-keys/cut-n-paste/Makefile.am | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am index bc59a10..5d8dc4b 100644 --- a/plugins/media-keys/cut-n-paste/Makefile.am +++ b/plugins/media-keys/cut-n-paste/Makefile.am @@ -4,16 +4,24 @@ noinst_LTLIBRARIES = libgvc.la INCLUDES = \ $(WARN_CFLAGS) \ - $(VOLUME_CONTROL_CFLAGS) \ - $(PULSE_CFLAGS) \ $(NULL) libgvc_la_LIBADD = \ - $(VOLUME_CONTROL_LIBS) \ - $(PULSE_LIBS) \ $(NULL) libgvc_la_SOURCES = \ + $(NULL) + +if HAVE_PULSE +INCLUDES += \ + $(VOLUME_CONTROL_CFLAGS) \ + $(PULSE_CFLAGS) + +libgvc_la_LIBADD += \ + $(VOLUME_CONTROL_LIBS) \ + $(PULSE_LIBS) + +libgvc_la_SOURCES += gvc-mixer-stream.h \ gvc-mixer-stream.c \ gvc-channel-map.h \ @@ -31,8 +39,22 @@ libgvc_la_SOURCES = \ gvc-mixer-event-role.h \ gvc-mixer-event-role.c \ gvc-mixer-control.h \ - gvc-mixer-control.c \ - $(NULL) + gvc-mixer-control.c +endif + +if HAVE_GSTREAMER +INCLUDES += \ + $(SETTINGS_PLUGIN_CFLAGS) \ + $(AM_CFLAGS) \ + $(GST_CFLAGS) + +libgvc_la_LIBADD += \ + $(GST_LIBS) + +libgvc_la_SOURCES += \ + gvc-gstreamer-acme-vol.c \ + gvc-gstreamer-acme-vol.h +endif MAINTAINERCLEANFILES = \ *~ \ |