@@ -35,8 +35,7 @@ qom-obj-y = qom/libqom.fa
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = monitor/
-common-obj-y += net/
+common-obj-y = net/
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += accel/
@@ -156,7 +156,6 @@ ifdef CONFIG_SOFTMMU
obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o
obj-y += qtest.o
obj-y += hw/
-obj-y += monitor/
obj-y += qapi/
obj-y += memory.o
obj-y += memory_mapping.o
@@ -600,6 +600,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
+subdir('monitor')
+
mods = []
block_mods = []
softmmu_mods = []
deleted file mode 100644
@@ -1,3 +0,0 @@
-obj-y += misc.o
-common-obj-y += monitor.o qmp.o hmp.o
-common-obj-y += qmp-cmds.o hmp-cmds.o
new file mode 100644
@@ -0,0 +1,9 @@
+softmmu_ss.add(files(
+ 'hmp-cmds.c',
+ 'hmp.c',
+ 'monitor.c',
+ 'qmp-cmds.c',
+ 'qmp.c',
+))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('misc.c'))