From nobody Mon Feb 9 20:59:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580237296734357.6102597249567; Tue, 28 Jan 2020 10:48:16 -0800 (PST) Received: from localhost ([::1]:35456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVuJ-00077D-Do for importer@patchew.org; Tue, 28 Jan 2020 13:48:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV7L-0002ul-9P for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:57:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV7J-000722-7t for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:57:39 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV7I-0006ya-Uo for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:57:37 -0500 Received: by mail-wm1-x330.google.com with SMTP id f129so3584822wmf.2 for ; Tue, 28 Jan 2020 09:57:36 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:57:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d6l4tZ9pfhRBA9Czb1QwHQR1aHPqNcmnt0bAAwSfWBM=; b=rbEFGWGVu7HIM6A3qDFBA+ZFva4kwMezhr/N0idbJREmahdpjqVF5pM3u3bJwDJ/er B2pl6mtkjcZtg8ycYBFHO9b8YMd2gH+qzEFBqrYjERLyGhOCDyayQ4uNtvevi9tM8qXH T4I+euraVGIxcRiHfeko0ZiqRjB1VWlsUKx8yVOFandxdR8PVsEwPygnI97XUr+4kdqG cpUubYrM+xgDN6R/keVn41PQomNeUFHNrbSTyVBHVAqlmPvufx1Qy/J3uKhfg88XxEbA 4X6Zw7S8J62YqpoWqaeEwQV76cVjOqM2zvqkwtzw1woAJ3Y9v5oB7p99qIWRigPNrv+I qz9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=d6l4tZ9pfhRBA9Czb1QwHQR1aHPqNcmnt0bAAwSfWBM=; b=k3tdkjjw/nuiiIHOiWS2CQey5jdYx0cx+oy1q8bWb+11p4tT5Gif1Pk7OOhib9cNAa 8aoUEPZL+/FR04seGLtiX21liQ+IyCuT844KrmGBENGy165mpgB0QIumqTBRtRmalIVq sBfrNsX7VoF0A07/VynyEl33TxGJTDm816EnMso+vV9y6sC+OiHH2g6AFnSR4i0eD7nf ujV4LWJoY0ixHElyg72DAy0dNye83qGzHzDRkuJqy8K2RpWPly/rTvctBxjPAaa7PYgq OLUfUfFHBRAn/QFMGRNJzBVevYsRtK85KqByykpO2hFI5s+iwSyFK3nYAEY3Lx26nFbs bmqQ== X-Gm-Message-State: APjAAAXir5qNEPnrmF2xC4QF7dYqdH3Jrv3mDN8xMBPvjotaJlao1eZ6 bHGJevjaxRU60F5DfWy80IcJmSHX X-Google-Smtp-Source: APXvYqz3RvjxQ5S23twztyV9bwbB4OvMj/TRCpyMXEC11IKKMU19o7S6MBKzQY2Gg97bYMd3PFye0A== X-Received: by 2002:a1c:1f56:: with SMTP id f83mr6233998wmf.93.1580234255351; Tue, 28 Jan 2020 09:57:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 097/142] meson: convert hw/input Date: Tue, 28 Jan 2020 18:52:57 +0100 Message-Id: <20200128175342.9066-98-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/Makefile.objs | 1 - hw/input/Makefile.objs | 17 ----------------- hw/input/meson.build | 17 +++++++++++++++++ hw/meson.build | 1 + 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 hw/input/Makefile.objs create mode 100644 hw/input/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 1e52bc3b1a..52a99a8760 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -12,7 +12,6 @@ devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-y +=3D ide/ -devices-dirs-y +=3D input/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs deleted file mode 100644 index a1bc502ed0..0000000000 --- a/hw/input/Makefile.objs +++ /dev/null @@ -1,17 +0,0 @@ -common-obj-$(CONFIG_ADB) +=3D adb.o adb-mouse.o adb-kbd.o -common-obj-y +=3D hid.o -common-obj-$(CONFIG_LM832X) +=3D lm832x.o -common-obj-$(CONFIG_PCKBD) +=3D pckbd.o -common-obj-$(CONFIG_PL050) +=3D pl050.o -common-obj-$(CONFIG_PS2) +=3D ps2.o -common-obj-$(CONFIG_STELLARIS_INPUT) +=3D stellaris_input.o -common-obj-$(CONFIG_TSC2005) +=3D tsc2005.o - -common-obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-input.o -common-obj-$(CONFIG_VIRTIO_INPUT) +=3D virtio-input-hid.o -common-obj-$(CONFIG_VIRTIO_INPUT_HOST) +=3D virtio-input-host.o -common-obj-$(CONFIG_VHOST_USER_INPUT) +=3D vhost-user-input.o - -obj-$(CONFIG_MILKYMIST) +=3D milkymist-softusb.o -obj-$(CONFIG_PXA2XX) +=3D pxa2xx_keypad.o -obj-$(CONFIG_TSC210X) +=3D tsc210x.o diff --git a/hw/input/meson.build b/hw/input/meson.build new file mode 100644 index 0000000000..6cc59e6037 --- /dev/null +++ b/hw/input/meson.build @@ -0,0 +1,17 @@ +softmmu_ss.add(files('hid.c')) +softmmu_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', = 'adb-kbd.c')) +softmmu_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c')) +softmmu_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c')) +softmmu_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c')) +softmmu_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_i= nput.c')) +softmmu_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c')) + +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c= ')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-h= id.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-in= put-host.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user= -input.c')) + +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-softus= b.c')) +specific_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c')) +specific_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c')) diff --git a/hw/meson.build b/hw/meson.build index 986e710287..b15c8d0970 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('input') subdir('intc') subdir('ipack') subdir('ipmi') --=20 2.21.0