From nobody Sun Feb 8 18:08:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594894052; cv=none; d=zohomail.com; s=zohoarc; b=AALulHZki0mQ6+7JH67/UIlHg2TS5JsythKXwYOwjdaJU/SOATwWxNlDJ560pYLgmVkLmhcNJrYTlDOIElKywK8I+PmBumLHcn1VueFgHw0pxvc1UIqcs+1bxTGn+OkzfL9nkIwlenY6BtkqLa+LTDDHIfif+6s9UK62eMp2xDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894052; 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=xQTppeqJMmdDBalIjzhKii9b6zyvjPAOqK1SHU3Lz+4=; b=gY0yac2TGI1w4YkkOzcbo6hc3OZ43zi8ZnAMr8ifJcceMpbEWzbe4YtqrAUZFFWxLfXphRiGs5WKHuNavSBuWHIJR/JanndEgHmZSE3vzu7SiCgFMesuXVwYEBdL0BTbAqdA1AhkuDZDA3K/AaMAkOqBTMY6dpNRJjpwmjSDxlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894052410412.7598348043997; Thu, 16 Jul 2020 03:07:32 -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-114-4DzX1o6jNHG4tRh0o-O1-g-1; Thu, 16 Jul 2020 06:07:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42F121091; Thu, 16 Jul 2020 10:07:23 +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 1E2921001B07; Thu, 16 Jul 2020 10:07:23 +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 CEE9596237; Thu, 16 Jul 2020 10:07:21 +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 06GA3SE4017228 for ; Thu, 16 Jul 2020 06:03:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0B4A2B6DB; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A5562DE72 for ; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894051; 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=xQTppeqJMmdDBalIjzhKii9b6zyvjPAOqK1SHU3Lz+4=; b=SHx5dO/2tYi1k64f6JXAK2kD7iHAg59KrNG7DiomzD2V6XRY7I/BF//mknpLHWHaoffQaO YszV+EIWT+EMnSLq29+X3lafRX5ybfLmQctZo3RQgEym5PCKT7v4AAZmV/OL9N9Spb06fM N44uzkiqZ84WlC1mQ30ryjv4bXs7MNk= X-MC-Unique: 4DzX1o6jNHG4tRh0o-O1-g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 127/351] meson: introduce src directory Date: Thu, 16 Jul 2020 11:56:03 +0200 Message-Id: <3fdc10cdc95032455a177050d6b89ed7b703b066.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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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" WARN_FLAGS are not relevant for meson as all warning flags are set to the whole project using add_project_arguments(). Signed-off-by: Pavel Hrdina --- meson.build | 2 ++ src/Makefile.am | 19 +------------------ src/meson.build | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 src/meson.build diff --git a/meson.build b/meson.build index 48db9aa0d0a..457d752ffb5 100644 --- a/meson.build +++ b/meson.build @@ -2200,6 +2200,8 @@ subdir('scripts') =20 subdir('include') =20 +subdir('src') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/src/Makefile.am b/src/Makefile.am index 6cf23bb0bdf..7d0e7b2e96c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,28 +19,11 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. -AM_CPPFLAGS =3D -I$(top_srcdir) \ - -I../include \ - -I$(top_srcdir)/include \ +AM_CPPFLAGS =3D \ -I$(srcdir)/util \ -I./util \ - -DIN_LIBVIRT \ - -Dabs_top_builddir=3D"\"$(abs_top_builddir)\"" \ - -Dabs_top_srcdir=3D"\"$(abs_top_srcdir)\"" \ $(NULL) =20 -AM_CFLAGS =3D $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(WARN_CFLAGS) \ - $(WIN32_EXTRA_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) -AM_LDFLAGS =3D $(DRIVER_MODULES_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(MINGW_EXTRA_LDFLAGS) \ - $(NULL) AM_LDFLAGS_MOD =3D \ -module \ -avoid-version \ diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 00000000000..0f5b83744fd --- /dev/null +++ b/src/meson.build @@ -0,0 +1,19 @@ +src_inc_dir =3D include_directories('.') + +src_dep =3D declare_dependency( + compile_args: [ + '-DIN_LIBVIRT', + '-Dabs_top_builddir=3D"@0@"'.format(meson.build_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + ] + coverage_flags + win32_flags, + dependencies: [ + glib_dep, + libxml_dep, + ], + include_directories: [ + libvirt_inc, + src_inc_dir, + top_inc_dir, + ], + link_args: libvirt_relro + libvirt_no_indirect + coverage_flags + driver= _modules_flags + win32_link_flags, +) --=20 2.26.2