From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 5/8] audio/alsa: build as module
Date: Mon, 12 Mar 2018 11:42:38 +0100 [thread overview]
Message-ID: <20180312104241.24965-6-kraxel@redhat.com> (raw)
In-Reply-To: <20180312104241.24965-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180306074053.22856-5-kraxel@redhat.com
---
configure | 7 ++++++-
audio/Makefile.objs | 7 +++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 973dbb99ac..b150ee80c6 100755
--- a/configure
+++ b/configure
@@ -5973,7 +5973,12 @@ fi
echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak
for drv in $audio_drv_list; do
def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
- echo "$def=y" >> $config_host_mak
+ case "$drv" in
+ alsa)
+ echo "$def=m" >> $config_host_mak ;;
+ *)
+ echo "$def=y" >> $config_host_mak ;;
+ esac
done
echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak
echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
diff --git a/audio/Makefile.objs b/audio/Makefile.objs
index f6ce5c6744..97f22ec097 100644
--- a/audio/Makefile.objs
+++ b/audio/Makefile.objs
@@ -3,7 +3,6 @@ common-obj-$(CONFIG_AUDIO_SDL) += sdlaudio.o
common-obj-$(CONFIG_AUDIO_OSS) += ossaudio.o
common-obj-$(CONFIG_SPICE) += spiceaudio.o
common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o
-common-obj-$(CONFIG_AUDIO_ALSA) += alsaaudio.o
common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o
common-obj-$(CONFIG_AUDIO_PA) += paaudio.o
common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
@@ -12,8 +11,12 @@ common-obj-y += wavcapture.o
sdlaudio.o-cflags := $(SDL_CFLAGS)
sdlaudio.o-libs := $(SDL_LIBS)
-alsaaudio.o-libs := $(ALSA_LIBS)
paaudio.o-libs := $(PULSE_LIBS)
coreaudio.o-libs := $(COREAUDIO_LIBS)
dsoundaudio.o-libs := $(DSOUND_LIBS)
ossaudio.o-libs := $(OSS_LIBS)
+
+# alsa module
+common-obj-$(CONFIG_AUDIO_ALSA) += alsa.mo
+alsa.mo-objs = alsaaudio.o
+alsa.mo-libs := $(ALSA_LIBS)
--
2.9.3
next prev parent reply other threads:[~2018-03-12 10:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 10:42 [Qemu-devel] [PULL 0/8] Audio 20180312 patches Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 1/8] modules: use gmodule-export Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 2/8] audio: add driver registry Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 3/8] audio: add module loading support Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 4/8] build: enable audio modules Gerd Hoffmann
2018-03-12 10:42 ` Gerd Hoffmann [this message]
2018-03-12 10:42 ` [Qemu-devel] [PULL 6/8] audio/oss: build as module Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 7/8] audio/pulseaudio: " Gerd Hoffmann
2018-03-12 10:42 ` [Qemu-devel] [PULL 8/8] audio/sdl: " Gerd Hoffmann
2018-03-12 18:35 ` [Qemu-devel] [PULL 0/8] Audio 20180312 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180312104241.24965-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).