Add audio/ to common-obj-m variable. Also run both audio and ui variables through unnest-vars. This avoids sdl.mo (exists in both audio/ and ui/) name clashes.
Signed-off-by: Gerd Hoffmann <kra...@redhat.com> --- Makefile | 4 ++++ Makefile.objs | 1 + 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 4df1f67fe4..20abbe66ad 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 diff --git a/Makefile.objs b/Makefile.objs index 69413d33b1..ffae665ea9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -104,6 +104,7 @@ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration/ common-obj-y += audio/ +common-obj-m += audio/ common-obj-y += hw/ common-obj-y += replay/ -- 2.9.3