[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-243-g14eaf24

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  dad36acea34f91cc1d4a7f8e4909369d2225525b (commit)

- Log -----------------------------------------------------------------
14eaf24 build-sys: Make sure all alsa path config files are installed
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |   66 ++++++++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 39 deletions(-)

-----------------------------------------------------------------------

commit 14eaf245c63de8b4ec0f0b6845284e52d5f8bcd4
Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
Date:   Sat Nov 14 22:23:10 2009 +0000

    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

diff --git a/src/Makefile.am b/src/Makefile.am
index f0d5a5e..9860bbe 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
 

-- 
hooks/post-receive
PulseAudio Sound Server