From nobody Sun Feb 8 09:41:14 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=1594894692; cv=none; d=zohomail.com; s=zohoarc; b=j8x2AY0x44s03aCKvIusRe9WDeFvLSmu+WlMQsiI+KmlJESZSJZoStqljSgVglJZIU3n/8svJi713FKRUdDlVn3V7Be5TW1XCEnIqnhUMRnkawxMdRhK9SZBpqGnY6xSkmXDAPfcsGfSLmazap9HE0ucZskKSffIydkeg9y55hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894692; 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=8rIU4qteu/nQDSYVNgmuGLoErxb8H1v+Ua57hPuVKFs=; b=XD2nisM3xULRAdvTN32mU5FENC0frZY/rP1XMsHP5+q3ae91oWVe9YCcogRfh01KY9Bj2YBfBEU7XrWI455iFG/IoP3nSKxq/jNtTNrhe5Q11dUDT4rePrhhk+EVPtEBeJV6mmysTL3DXoCL1ZyNQmEAx03rQwXvJGHQ1aN+gZg= 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 1594894692494959.8776279861163; Thu, 16 Jul 2020 03:18:12 -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-314-UXP-6ZN_M16hQWTpt_gSPQ-1; Thu, 16 Jul 2020 06:08:58 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC50E10059C0; Thu, 16 Jul 2020 10:08:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B6C65D9DC; Thu, 16 Jul 2020 10:08:52 +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 571161800FEA; Thu, 16 Jul 2020 10:08:52 +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 06GA6BRK019391 for ; Thu, 16 Jul 2020 06:06:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A33D32B6DC; Thu, 16 Jul 2020 10:06:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E44F2B6DB for ; Thu, 16 Jul 2020 10:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894691; 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=8rIU4qteu/nQDSYVNgmuGLoErxb8H1v+Ua57hPuVKFs=; b=L4r8PBPgadtDMJkrgvJKjb0YGLtEn7cuf6n3hDuu6wxsAIlqyruxQWKsGzyaPIT8dOYtii NTGJBABvd+9EwAoX0Ut17faFAUxjcleZQnWQsvw/3yTzPVnoxA4hUgUyoPs+NqtyQRTZDx QynuxBhEh5RGYF8QJPyFFueIbk5OSzM= X-MC-Unique: UXP-6ZN_M16hQWTpt_gSPQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 253/351] meson: add tools directory Date: Thu, 16 Jul 2020 11:58:09 +0200 Message-Id: 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.14 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 --- meson.build | 2 ++ tools/Makefile.am | 20 -------------------- tools/meson.build | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 tools/meson.build diff --git a/meson.build b/meson.build index eb659c64aa0..69145512519 100644 --- a/meson.build +++ b/meson.build @@ -2203,6 +2203,8 @@ subdir('include') =20 subdir('src') =20 +subdir('tools') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/tools/Makefile.am b/tools/Makefile.am index 19c3b88777c..f266d3e72e7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,32 +15,12 @@ ## License along with this library. If not, see ## . =20 -AM_CPPFLAGS =3D \ - -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/src -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir) \ - $(NULL) - # We do not want to accidentally include stuff from src/ # dir or public API dir. Specific files can # still be included via their path relative to the root if # needed STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 -AM_CFLAGS =3D \ - $(WARN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(NULL) - -AM_LDFLAGS =3D \ - $(RELRO_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - ICON_FILES =3D \ libvirt_win_icon_16x16.ico \ libvirt_win_icon_32x32.ico \ diff --git a/tools/meson.build b/tools/meson.build new file mode 100644 index 00000000000..49214e5706f --- /dev/null +++ b/tools/meson.build @@ -0,0 +1,16 @@ +tools_inc_dir =3D include_directories('.') + +tools_dep =3D declare_dependency( + compile_args: coverage_flags, + dependencies: [ + libxml_dep, + glib_dep, + ], + include_directories: [ + libvirt_inc, + src_inc_dir, + util_inc_dir, + top_inc_dir, + ], + link_args: libvirt_relro + libvirt_no_indirect + libvirt_no_undefined, +) --=20 2.26.2