aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-12 16:14:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-12 16:14:37 +0000
commit6ceb1b51f05f9e1892d082960ed602dca7b6696e (patch)
tree32715c1c06bb716fe7ce7966855ff1f39d52e9ad /Makefile
parentb16a54da0696efc5d91b6c3597a37a317abb5de7 (diff)
parent051c7d5c1e2f4a392a4b89027b27aa4c50c16fe0 (diff)
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180312-pull-request' into staging
modules: use gmodule-export. audio: add driver registry, enable module builds. # gpg: Signature made Mon 12 Mar 2018 10:42:19 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/audio-20180312-pull-request: audio/sdl: build as module audio/pulseaudio: build as module audio/oss: build as module audio/alsa: build as module build: enable audio modules audio: add module loading support audio: add driver registry modules: use gmodule-export Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 026fa17dc0..c8116694a0 100644
--- a/Makefile
+++ b/Makefile
@@ -425,6 +425,10 @@ dummy := $(call unnest-vars,, \
io-obj-y \
common-obj-y \
common-obj-m \
+ ui-obj-y \
+ ui-obj-m \
+ audio-obj-y \
+ audio-obj-m \
trace-obj-y)
include $(SRC_PATH)/tests/Makefile.include