From 14eaf245c63de8b4ec0f0b6845284e52d5f8bcd4 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 14 Nov 2009 22:23:10 +0000 Subject: build-sys: Make sure all alsa path config files are installed While all alsa path configuration files were in EXTRA_DIST not all of them were in in alsapaths_DATA. Fixed by only defining the list in one place --- src/Makefile.am | 66 +++++++++++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 39 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index f0d5a5e8..9860bbed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,27 +109,12 @@ MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) # Extra files # ################################### -EXTRA_DIST = \ - pulse/client.conf.in \ - pulse/version.h.in \ - daemon/daemon.conf.in \ - daemon/default.pa.in \ - daemon/system.pa.in \ - daemon/default.pa.win32 \ - depmod.py \ - daemon/esdcompat.in \ - daemon/start-pulseaudio-x11.in \ - daemon/start-pulseaudio-kde.in \ - utils/padsp \ - modules/module-defs.h.m4 \ - daemon/pulseaudio.desktop.in \ - daemon/pulseaudio-kde.desktop.in \ - map-file \ - daemon/pulseaudio-system.conf \ +ALSA_PROFILES = \ modules/alsa/mixer/profile-sets/default.conf \ modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \ - modules/alsa/mixer/profile-sets/90-pulseaudio.rules \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf + +ALSA_PATHS = \ modules/alsa/mixer/paths/analog-input-aux.conf \ modules/alsa/mixer/paths/analog-input.conf \ modules/alsa/mixer/paths/analog-input.conf.common \ @@ -148,6 +133,27 @@ EXTRA_DIST = \ modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ modules/alsa/mixer/paths/analog-output-mono.conf +EXTRA_DIST = \ + pulse/client.conf.in \ + pulse/version.h.in \ + daemon/daemon.conf.in \ + daemon/default.pa.in \ + daemon/system.pa.in \ + daemon/default.pa.win32 \ + depmod.py \ + daemon/esdcompat.in \ + daemon/start-pulseaudio-x11.in \ + daemon/start-pulseaudio-kde.in \ + utils/padsp \ + modules/module-defs.h.m4 \ + daemon/pulseaudio.desktop.in \ + daemon/pulseaudio-kde.desktop.in \ + map-file \ + daemon/pulseaudio-system.conf \ + modules/alsa/mixer/profile-sets/90-pulseaudio.rules + ${ALSA_PROFILES} \ + ${ALSA_PATHS} + pulseconf_DATA = \ default.pa \ system.pa \ @@ -1088,32 +1094,14 @@ modlibexec_LTLIBRARIES += \ module-alsa-source.la \ module-alsa-card.la -alsaprofilesets_DATA = \ - modules/alsa/mixer/profile-sets/default.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf +alsaprofilesets_DATA = ${ALSA_PROFILES} if HAVE_UDEV udevrules_DATA = \ modules/alsa/mixer/profile-sets/90-pulseaudio.rules endif -alsapaths_DATA = \ - modules/alsa/mixer/paths/analog-input-aux.conf \ - modules/alsa/mixer/paths/analog-input.conf \ - modules/alsa/mixer/paths/analog-input.conf.common \ - modules/alsa/mixer/paths/analog-input-fm.conf \ - modules/alsa/mixer/paths/analog-input-linein.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf.common \ - modules/alsa/mixer/paths/analog-input-mic-line.conf \ - modules/alsa/mixer/paths/analog-input-tvtuner.conf \ - modules/alsa/mixer/paths/analog-input-video.conf \ - modules/alsa/mixer/paths/analog-output.conf \ - modules/alsa/mixer/paths/analog-output.conf.common \ - modules/alsa/mixer/paths/analog-output-headphones.conf \ - modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ - modules/alsa/mixer/paths/analog-output-mono.conf +alsapaths_DATA = ${ALSA_PATHS} endif -- cgit From eb5562637beab22f3f906a116775cb98c752320f Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 16 Nov 2009 23:36:44 +0000 Subject: build-sys: Fix missing trailing slash in 14eaf2 --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9860bbed..b45908b3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -150,7 +150,7 @@ EXTRA_DIST = \ daemon/pulseaudio-kde.desktop.in \ map-file \ daemon/pulseaudio-system.conf \ - modules/alsa/mixer/profile-sets/90-pulseaudio.rules + modules/alsa/mixer/profile-sets/90-pulseaudio.rules \ ${ALSA_PROFILES} \ ${ALSA_PATHS} -- cgit From fe0b393f7ac2f50131d187cc31a74ced52c15bd1 Mon Sep 17 00:00:00 2001 From: Diego Elio 'Flameeyes' Pettenò Date: Sat, 21 Nov 2009 00:53:00 +0100 Subject: Simplify Makefile.am handling of ALSA-related files. Instead of declaring extra variables for the ALSA profiles and PATHS, and using EXTRA_DIST for the udev rule, use the dist_ prefix when declaring them for conditional installation. This relies on the fact that automake *is* smart enough to know that there exist *no* conditional dist, and will always distribute all of them. --- src/Makefile.am | 55 ++++++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b45908b3..5db6b39c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,30 +109,6 @@ MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) # Extra files # ################################### -ALSA_PROFILES = \ - modules/alsa/mixer/profile-sets/default.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf - -ALSA_PATHS = \ - modules/alsa/mixer/paths/analog-input-aux.conf \ - modules/alsa/mixer/paths/analog-input.conf \ - modules/alsa/mixer/paths/analog-input.conf.common \ - modules/alsa/mixer/paths/analog-input-fm.conf \ - modules/alsa/mixer/paths/analog-input-linein.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf.common \ - modules/alsa/mixer/paths/analog-input-mic-line.conf \ - modules/alsa/mixer/paths/analog-input-tvtuner.conf \ - modules/alsa/mixer/paths/analog-input-video.conf \ - modules/alsa/mixer/paths/analog-output.conf \ - modules/alsa/mixer/paths/analog-output-speaker.conf \ - modules/alsa/mixer/paths/analog-output.conf.common \ - modules/alsa/mixer/paths/analog-output-headphones.conf \ - 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 - EXTRA_DIST = \ pulse/client.conf.in \ pulse/version.h.in \ @@ -149,10 +125,7 @@ EXTRA_DIST = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in \ map-file \ - daemon/pulseaudio-system.conf \ - modules/alsa/mixer/profile-sets/90-pulseaudio.rules \ - ${ALSA_PROFILES} \ - ${ALSA_PATHS} + daemon/pulseaudio-system.conf pulseconf_DATA = \ default.pa \ @@ -1094,14 +1067,34 @@ modlibexec_LTLIBRARIES += \ module-alsa-source.la \ module-alsa-card.la -alsaprofilesets_DATA = ${ALSA_PROFILES} +dist_alsaprofilesets_DATA = \ + modules/alsa/mixer/profile-sets/default.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf if HAVE_UDEV -udevrules_DATA = \ +dist_udevrules_DATA = \ modules/alsa/mixer/profile-sets/90-pulseaudio.rules endif -alsapaths_DATA = ${ALSA_PATHS} +dist_alsapaths_DATA = \ + modules/alsa/mixer/paths/analog-input-aux.conf \ + modules/alsa/mixer/paths/analog-input.conf \ + modules/alsa/mixer/paths/analog-input.conf.common \ + modules/alsa/mixer/paths/analog-input-fm.conf \ + modules/alsa/mixer/paths/analog-input-linein.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf.common \ + modules/alsa/mixer/paths/analog-input-mic-line.conf \ + modules/alsa/mixer/paths/analog-input-tvtuner.conf \ + modules/alsa/mixer/paths/analog-input-video.conf \ + modules/alsa/mixer/paths/analog-output.conf \ + modules/alsa/mixer/paths/analog-output-speaker.conf \ + modules/alsa/mixer/paths/analog-output.conf.common \ + modules/alsa/mixer/paths/analog-output-headphones.conf \ + 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 endif -- cgit From f69e81f226e1f165bfe7d792b3c7895a55d43983 Mon Sep 17 00:00:00 2001 From: Jason Newton Date: Fri, 20 Nov 2009 15:34:02 -0800 Subject: Makefile.am: added qpaeq to installed scripts --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b45908b3..fc8803ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1192,6 +1192,7 @@ endif if HAVE_FFTW modlibexec_LTLIBRARIES += \ module-equalizer-sink.la +bin_SCRIPTS += utils/qpaeq endif # These are generated by an M4 script -- cgit