From nobody Sun Feb 8 03:57:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893834; cv=none; d=zohomail.com; s=zohoarc; b=DO72He6EzNPhZhhwywArzuSIpVaaK2LX171uJFe1BWlX7qxJx3jgbwCt9QBwHV8WdjBjPECmeVIww4k0ZrH/0VSw51SWoT7yn4RGgRFBDFbpbOUqMYcMu/6ZsbG5Uuyfyz4PJWiPIqNngznBw/XMqnUvvsoWiah3jY3ddnI55t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893834; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Nk9o7M8MZkXYjYN86TgSYfRY4WeT2bDDSCpbJ40AjtQ=; b=RCBxjECmwjD4jvU3DzOpz8RevBJC9wH0UfSgkeStmbdWEj8IXiDk5K9bMJ8E5lC4/4gC595rACa2Mm3UcSQchOf18++d7GhDBOI9A4segPQ5w7t15zALZUGtMuMUFwaZqUephqBQy35KGQbS/a6WWM6REJIQgMyezI9jOfZyerI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893834760325.74226447046874; Thu, 16 Jul 2020 03:03:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-453-yq5tH46fPlq0GY1bu9Y8aw-1; Thu, 16 Jul 2020 06:00:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A017918A1DEE; Thu, 16 Jul 2020 10:00:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 808C878485; Thu, 16 Jul 2020 10:00:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4FCBD9623A; Thu, 16 Jul 2020 10:00:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA0jVv015460 for ; Thu, 16 Jul 2020 06:00:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0B822DE72; Thu, 16 Jul 2020 10:00:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BFA72DE6F for ; Thu, 16 Jul 2020 10:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893833; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Nk9o7M8MZkXYjYN86TgSYfRY4WeT2bDDSCpbJ40AjtQ=; b=KBSfgym0DOVKKp5BS08zTM+p0jjup4j5VVsWJ63AeKvIiWKKAjE8O3UgLrFIWygevMwXW4 nx5SGStbmKSChH3GTmBg64sJowfLWaoEIB1vZHLOBsoNSnbLHyPigSZwvEnmfdmrzeTqmu oKrpxjzvmoqMTbytsfOSl5CC9Jwx4T8= X-MC-Unique: yq5tH46fPlq0GY1bu9Y8aw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 024/351] meson: add include directory Date: Thu, 16 Jul 2020 11:54:20 +0200 Message-Id: <45bbfd0e02efce538eea96a88a7867bbd7d1ad2e.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- Makefile.am | 2 +- configure.ac | 3 +-- include/libvirt/Makefile.am | 26 -------------------------- include/libvirt/meson.build | 36 ++++++++++++++++++++++++++++++++++++ include/meson.build | 3 +++ meson.build | 2 ++ 6 files changed, 43 insertions(+), 29 deletions(-) delete mode 100644 include/libvirt/Makefile.am create mode 100644 include/libvirt/meson.build create mode 100644 include/meson.build diff --git a/Makefile.am b/Makefile.am index 82ccbac6f91..6df2176364a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . include/libvirt src tools docs \ +SUBDIRS =3D . src tools docs \ tests po examples =20 XZ_OPT ?=3D -v -T0 diff --git a/configure.ac b/configure.ac index cb1aed73828..07b86d8b944 100644 --- a/configure.ac +++ b/configure.ac @@ -689,7 +689,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ + Makefile src/Makefile docs/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ @@ -701,7 +701,6 @@ AC_CONFIG_FILES([\ src/libvirt-lxc.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile \ - include/libvirt/libvirt-common.h \ examples/Makefile \ tests/Makefile \ tools/Makefile]) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am deleted file mode 100644 index e447a5d37da..00000000000 --- a/include/libvirt/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2011, 2013-2016 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -virincdir =3D $(includedir)/libvirt - -allheaders =3D $(wildcard $(srcdir)/*.h) -virinc_HEADERS =3D $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) -nodist_virinc_HEADERS =3D libvirt-common.h - -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/include/libvirt/meson.build b/include/libvirt/meson.build new file mode 100644 index 00000000000..4b77a222f03 --- /dev/null +++ b/include/libvirt/meson.build @@ -0,0 +1,36 @@ +libvirt_common_h_in =3D files('libvirt-common.h.in') + +libvirt_include =3D files( + 'libvirt-admin.h', + 'libvirt-domain-checkpoint.h', + 'libvirt-domain.h', + 'libvirt-domain-snapshot.h', + 'libvirt-event.h', + 'libvirt.h', + 'libvirt-host.h', + 'libvirt-interface.h', + 'libvirt-lxc.h', + 'libvirt-network.h', + 'libvirt-nodedev.h', + 'libvirt-nwfilter.h', + 'libvirt-qemu.h', + 'libvirt-secret.h', + 'libvirt-storage.h', + 'libvirt-stream.h', + 'virterror.h', +) + +include_conf =3D configuration_data() +include_conf.merge_from(conf) + +libvirt_common_h =3D configure_file( + input: libvirt_common_h_in, + output: 'libvirt-common.h', + configuration: include_conf, +) + +install_headers( + libvirt_include, + libvirt_common_h, + install_dir: includedir / 'libvirt', +) diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 00000000000..06658ede6a7 --- /dev/null +++ b/include/meson.build @@ -0,0 +1,3 @@ +libvirt_inc =3D include_directories('.') + +subdir('libvirt') diff --git a/meson.build b/meson.build index 8c6db66a07f..b5430012a79 100644 --- a/meson.build +++ b/meson.build @@ -626,6 +626,8 @@ top_inc_dir =3D include_directories('.') =20 subdir('scripts') =20 +subdir('include') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) --=20 2.26.2