From patchwork Mon Sep 2 10:21:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172735 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4143612ily; Mon, 2 Sep 2019 03:35:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMtcjgI52iz0/DNgY9F1FT+fBKDwLsjhOrjfsaF6zgEJCvYPVeJo63jkqe3dr8dNplQZPI X-Received: by 2002:a50:a5dd:: with SMTP id b29mr29934024edc.34.1567420524356; Mon, 02 Sep 2019 03:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420524; cv=none; d=google.com; s=arc-20160816; b=0q+ibGKQnkkXftFRGH8CvQO1zalp3hogG2tiCwZPbvtVGcGCIwqH7S5NhZdWE8sefz fTVVf4NG8sgjr/CwoIa4ppWrjeo4oHuKKqlaeVB/+8npXUu/tzERF2FRz90l3Vep51bG 2BITNxU5g3cCyBhtFba3Srw+t5pll4mvSa8mNJ74yNy06+6evV0RreIt6omHxsjg0hDY nNN/q9f2aPRns8hBv1oBetGyxdtFVGvQ8Pa0zKwB3aS0lh7S6baUUyU01mYvs5aX1vDi S0eb0sgIBSqA6H/0X40XH8eRuL5Ryhu6eT6UI7Gdi1JmP/GIMWvQwiHTVfCGDXjvfHNz 7gYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=fz3gqZhSvYpmIqZAxwlZOJof/kYcwu5c3/KDW6yiNDL0KeUoDULcASepHtE9tSmJrU 1ZgGCOp4/5oOXrbbF/C3GbtX8llbw/imy0b7coCF7xR8vjZWekJaGRC/ITpwGwXgRac4 zrXqh/boCwh4EG/18xVjN0i/B7r2hPz4gFtCca45ldrjH69mpj3EVX8EBdGQU1f0Olz2 cmNwgeaoxgxeBAKx2Q5iGbS1duAQ1FxklEG1GylUKiQixgkGi8MZmjVWNFYlzaa1bkAH 1ctuSIKWA/S+0izCVwfG5jCBjZNXaIXBeBQ9xtJ9+/SsH/5YiXXVYRzq/4CTmQtNW+oi 3cQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=APUR2qkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z15si4427675edd.431.2019.09.02.03.35.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:35:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=APUR2qkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jgB-0007dp-8R for patch@linaro.org; Mon, 02 Sep 2019 06:35:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54899) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSp-0004ln-5y for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSm-0004Ik-2j for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:34 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSl-0004IL-TI for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:32 -0400 Received: by mail-wr1-x434.google.com with SMTP id u16so13459746wrr.0 for ; Mon, 02 Sep 2019 03:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=APUR2qkSjavQY9LrtTN+X9EBcWbCADcwA7dDu684VLIm8KOHB0o0CszT2e3igJg2H5 KCtkmU1QHFbt+mCNBqjXeSIyKJk+Qpa7cz5yPuXZel0Ii7JMVqcG04p1X6I4TnJZorSu RYSw/9CZoxN19PoH1coug++kQATONXp7LsFXzkDow0ziK8A3kxl+Q4KjfdXldd5oAg7J tNT4Mby2GjHWygB7QNHIpWwxk4JkasqpOQJ5P6TZ/c/LEPPOKmsIpL1DpefpnJOoYKnX E5Garwl7Hq8YV8FuWvxZJTvJgpOG2mgdOr+Wk/eDK4nrrmmWGW+9R5+vW/GY1k5zOAah sQzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=Kcl1CDaKnAdC/9bTqj5d3gZyVhDVfQusVXNE/c+HkyTy3i6VheQckM5gaGFqDc5U0H FO89iG1cJfQK+cQnIMVw67iCZAsw+pn4sAmL50Rl+ipBx9A2dmJkf2PPpce07DT3N3En UMnY03DvqIpNa7Mi/ZT7bWmUFDtTdEtoN4Lqd0slC/DigJ9sm0DlmJcb4LDufqtVTK7q HE8PfSvK/ME8OkOc3X7Zc8qYVW+0QMN1aHh74Zvb9jzNJRD+AZOr0N2qREkYWJZrh8Wm dm74hgZBgWcUOLhzGkdx8NxCEue2FVR5QdRyQsq5cTNrc6zJerygJ0ck4bMVxF8+cvJo 3tPQ== X-Gm-Message-State: APjAAAVEMpHqjYrOFbR8+Y1i2CkasOWu+CarMAMSzsOKDVQLwFCHALbo bhXCUCbl5YDRosM7BEkxh9ZaFw== X-Received: by 2002:adf:dd0c:: with SMTP id a12mr2875304wrm.289.1567419690813; Mon, 02 Sep 2019 03:21:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u68sm21051837wmu.12.2019.09.02.03.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C5191FF9A; Mon, 2 Sep 2019 11:21:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:20 +0100 Message-Id: <20190902102122.1128-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 10/12] build-sys: build ui-spice-app as a module X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , qemu-devel@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau This reverts commit 45db1ac157 ("modules-test: ui-spice-app is not built as module") and fixes commit d8aec9d9f1 ("display: add -display spice-app launching a Spice client"). Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20190827140241.20818-1-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/modules-test.c b/tests/modules-test.c index f9de3afdb77..a8118e90427 100644 --- a/tests/modules-test.c +++ b/tests/modules-test.c @@ -52,6 +52,9 @@ int main(int argc, char *argv[]) #endif #ifdef CONFIG_SDL "ui-", "sdl", +#endif +#if defined(CONFIG_SPICE) && defined(CONFIG_GIO) + "ui-", "spice-app", #endif }; int i; diff --git a/ui/Makefile.objs b/ui/Makefile.objs index cc2bf5b180f..ba39080edb2 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -49,7 +49,9 @@ curses.mo-objs := curses.o curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS) curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS) -common-obj-$(call land,$(CONFIG_SPICE),$(CONFIG_GIO)) += spice-app.mo +ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) +common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo +endif spice-app.mo-objs := spice-app.o spice-app.mo-cflags := $(GIO_CFLAGS) spice-app.mo-libs := $(GIO_LIBS)