alsa/0002-conf-ucm-Rearrange-Makefile.am.patch
Tomáš Chvátal fb2f7d70b7 Accepting request 558222 from home:tiwai:branches:multimedia:libs
- Backport fix patches from upstream:
  0001-pcm-route-Fix-use_getput-flag-computation-for-3-byte.patch
  0002-conf-ucm-Rearrange-Makefile.am.patch
  0003-conf-ucm-Add-dual-HD-audio-codecs-config-for-Lenovo.patch
  0004-conf-ucm-Add-Gigabyte-mobo-UCM-profile-with-dual-HD-.patch
- Add missing UCM profile for chtcx2072x (bsc#1068546)

OBS-URL: https://build.opensuse.org/request/show/558222
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=223
2017-12-18 19:36:19 +00:00

79 lines
2.6 KiB
Diff

From 91896be6bc326b5b9c1b5ef52b9dbac243fefa27 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 5 Dec 2017 14:58:30 +0100
Subject: [PATCH] conf/ucm: Rearrange Makefile.am
Just rearrange and split to multiple lines to make future patches
cleaner. No actual code change.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
configure.ac | 16 ++++++++--------
src/conf/ucm/Makefile.am | 16 +++++++++++++++-
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index afe4306d2062..c232236dc193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,19 +709,20 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
src/conf/cards/Makefile \
src/conf/pcm/Makefile \
src/conf/ucm/Makefile \
+ src/conf/ucm/broadwell-rt286/Makefile \
+ src/conf/ucm/broxton-rt298/Makefile \
+ src/conf/ucm/bytcr-rt5651/Makefile \
+ src/conf/ucm/chtrt5645/Makefile \
src/conf/ucm/DAISY-I2S/Makefile \
+ src/conf/ucm/DB410c/Makefile \
+ src/conf/ucm/GoogleNyan/Makefile \
src/conf/ucm/PandaBoard/Makefile \
src/conf/ucm/PandaBoardES/Makefile \
- src/conf/ucm/SDP4430/Makefile \
- src/conf/ucm/tegraalc5632/Makefile \
src/conf/ucm/PAZ00/Makefile \
- src/conf/ucm/GoogleNyan/Makefile \
- src/conf/ucm/broadwell-rt286/Makefile \
+ src/conf/ucm/SDP4430/Makefile \
src/conf/ucm/skylake-rt286/Makefile \
+ src/conf/ucm/tegraalc5632/Makefile \
src/conf/ucm/VEYRON-I2S/Makefile \
- src/conf/ucm/chtrt5645/Makefile \
- src/conf/ucm/DB410c/Makefile \
- src/conf/ucm/bytcr-rt5651/Makefile \
src/conf/topology/Makefile \
src/conf/topology/broadwell/Makefile \
modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
@@ -729,7 +730,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
src/conf/topology/bxtrt298/Makefile \
alsalisp/Makefile aserver/Makefile \
test/Makefile test/lsb/Makefile \
- src/conf/ucm/broxton-rt298/Makefile \
utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
dnl Create asoundlib.h dynamically according to configure options
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index 2bd4ebe761ae..060d025f1bb5 100644
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -1 +1,15 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c broxton-rt298 bytcr-rt5651
+SUBDIRS=\
+broadwell-rt286 \
+broxton-rt298 \
+bytcr-rt5651 \
+chtrt5645 \
+DAISY-I2S \
+DB410c \
+GoogleNyan \
+PandaBoard \
+PandaBoardES \
+PAZ00 \
+SDP4430 \
+skylake-rt286 \
+tegraalc5632 \
+VEYRON-I2S
--
2.15.1