aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-06-19 22:10:35 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-07-02 07:19:32 +0200
commit1824b2138991772f5f3baa1cc40f60d303eecd68 (patch)
treec46cbfdec236ae6bc42449f26236ac272c381e22
parent8f920054f541749f1137a039deb3a210d9da4791 (diff)
downloadqemu-1824b2138991772f5f3baa1cc40f60d303eecd68.zip
qemu-1824b2138991772f5f3baa1cc40f60d303eecd68.tar.gz
qemu-1824b2138991772f5f3baa1cc40f60d303eecd68.tar.bz2
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>
-rw-r--r--Makefile.objs1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 3b83621..fe4f339 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
#######################################################################