From 1824b2138991772f5f3baa1cc40f60d303eecd68 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 19 Jun 2019 22:10:35 +0200 Subject: [PATCH] Makefile: Don't add monitor/ twice to common-obj-y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-Id: <20190619201050.19040-3-armbru@redhat.com> Reviewed-by: Daniel P. Berrangé --- Makefile.objs | 1 - 1 file changed, 1 deletion(-) 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 #######################################################################