From: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
hw/Makefile.objs | 1 -
hw/bt/Makefile.objs | 3 ---
hw/bt/meson.build | 8 ++++++++
hw/meson.build | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
delete mode 100644 hw/bt/Makefile.objs
create mode 100644 hw/bt/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6752297..6ddffce 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -4,7 +4,6 @@ devices-dirs-y += acpi/
devices-dirs-y += adc/
devices-dirs-y += audio/
devices-dirs-y += block/
-devices-dirs-y += bt/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
deleted file mode 100644
index 867a7d2..0000000
--- a/hw/bt/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
-common-obj-y += hci-csr.o
-
diff --git a/hw/bt/meson.build b/hw/bt/meson.build
new file mode 100644
index 0000000..ab45116
--- /dev/null
+++ b/hw/bt/meson.build
@@ -0,0 +1,8 @@
+softmmu_ss.add(files(
+ 'core.c',
+ 'hci-csr.c',
+ 'hci.c',
+ 'hid.c',
+ 'l2cap.c',
+ 'sdp.c',
+))
diff --git a/hw/meson.build b/hw/meson.build
index d8a7493..54414a6 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('bt')
subdir('char')
subdir('core')
subdir('cpu')
--
1.8.3.1
