summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-11-14 22:23:10 +0000
committerColin Guthrie <cguthrie@mandriva.org>2009-11-16 23:26:02 +0000
commit8edf2f0ed81a1c5d823e88a04e073af075aaeb13 (patch)
treea005e975fc0215ec0cc1bda7537b55ce55a8a443
parenta79585e042088b73632a4773b2d3b59a7371611f (diff)
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
-rw-r--r--src/Makefile.am62
1 files changed, 25 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index de15a8f2..21629f97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,25 +107,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 \
- utils/padsp \
- modules/module-defs.h.m4 \
- daemon/pulseaudio.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 \
@@ -144,6 +131,25 @@ 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 \
+ utils/padsp \
+ modules/module-defs.h.m4 \
+ daemon/pulseaudio.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 \
@@ -1072,32 +1078,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