From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 19 Jun 2019 20:10:35 +0000 (+0200)
Subject: Makefile: Don't add monitor/ twice to common-obj-y
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1824b2138991772f5f3baa1cc40f60d303eecd68;p=qemu.git

Makefile: Don't add monitor/ twice to common-obj-y

Both commit f1b3ccfaa68 "monitor: Move {hmp, qmp}.c to monitor/{hmp,
qmp}-cmds.c" and commit 7e3c0deab1b "monitor: Split out monitor/qmp.c"
added monitor/ to common-obj-y ifeq ($(CONFIG_SOFTMMU),y).  Revert the
second addition.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190619201050.19040-3-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/Makefile.objs b/Makefile.objs
index 3b83621f32..fe4f339b7c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -85,7 +85,6 @@ common-obj-$(CONFIG_FDT) += device_tree.o
 # qapi
 
 common-obj-y += qapi/
-common-obj-y += monitor/
 endif
 
 #######################################################################