From nobody Mon Dec 15 01:49:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519812888762315.5382194785295; Wed, 28 Feb 2018 02:14:48 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 83BF0C04AC49; Wed, 28 Feb 2018 10:14:47 +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 5F17712A6D; Wed, 28 Feb 2018 10:14:47 +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 C962E18033EE; Wed, 28 Feb 2018 10:14:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1SAEgcu005590 for ; Wed, 28 Feb 2018 05:14:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 32EB82026E04; Wed, 28 Feb 2018 10:14:42 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3532E2024CA6; Wed, 28 Feb 2018 10:14:40 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:22 +0000 Message-Id: <20180228101435.464-5-berrange@redhat.com> In-Reply-To: <20180228101435.464-1-berrange@redhat.com> References: <20180228101435.464-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/17] make: split nodedev driver build rules into node_device/Makefile.inc.am 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 28 Feb 2018 10:14:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 46 +---------------------------- src/node_device/Makefile.inc.am | 65 +++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 src/node_device/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8c21453ec7..bbaab675f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,6 +101,7 @@ include lxc/Makefile.inc.am include interface/Makefile.inc.am include network/Makefile.inc.am include nwfilter/Makefile.inc.am +include node_device/Makefile.inc.am =20 =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -781,16 +782,12 @@ check-drivername: EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(NODE_DEVICE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -931,18 +928,6 @@ ACCESS_DRIVER_POLKIT_POLICY =3D \ $(srcdir)/access/org.libvirt.api.policy =20 =20 -NODE_DEVICE_DRIVER_SOURCES =3D \ - node_device/node_device_driver.c \ - node_device/node_device_driver.h - -NODE_DEVICE_DRIVER_HAL_SOURCES =3D \ - node_device/node_device_hal.c \ - node_device/node_device_hal.h - -NODE_DEVICE_DRIVER_UDEV_SOURCES =3D \ - node_device/node_device_udev.c \ - node_device/node_device_udev.h - CPU_SOURCES =3D \ cpu/cpu.h cpu/cpu.c \ cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ @@ -1321,32 +1306,6 @@ libvirt_storage_backend_vstorage_la_LDFLAGS =3D $(AM= _LDFLAGS_MOD) libvirt_storage_backend_vstorage_la_LIBADD =3D libvirt.la ../gnulib/lib/li= bgnu.la endif WITH_STORAGE_VSTORAGE =20 -if WITH_NODE_DEVICES -# Needed to keep automake quiet about conditionals -mod_LTLIBRARIES +=3D libvirt_driver_nodedev.la -libvirt_driver_nodedev_la_SOURCES =3D $(NODE_DEVICE_DRIVER_SOURCES) - -libvirt_driver_nodedev_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nodedev_la_LIBADD =3D - -if WITH_HAL -libvirt_driver_nodedev_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_HAL_SOURCES) -libvirt_driver_nodedev_la_CFLAGS +=3D $(HAL_CFLAGS) -libvirt_driver_nodedev_la_LIBADD +=3D $(HAL_LIBS) -endif WITH_HAL -if WITH_UDEV -libvirt_driver_nodedev_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_UDEV_SOURCES) -libvirt_driver_nodedev_la_CFLAGS +=3D $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) -libvirt_driver_nodedev_la_LIBADD +=3D $(UDEV_LIBS) $(PCIACCESS_LIBS) -endif WITH_UDEV - -libvirt_driver_nodedev_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -endif WITH_NODE_DEVICES - =20 =20 libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) @@ -1472,9 +1431,6 @@ EXTRA_DIST +=3D \ $(STORAGE_DRIVER_GLUSTER_SOURCES) \ $(STORAGE_DRIVER_ZFS_SOURCES) \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am new file mode 100644 index 0000000000..5f5ec68b29 --- /dev/null +++ b/src/node_device/Makefile.inc.am @@ -0,0 +1,65 @@ +NODE_DEVICE_DRIVER_SOURCES =3D \ + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + $(NULL) + +NODE_DEVICE_DRIVER_HAL_SOURCES =3D \ + node_device/node_device_hal.c \ + node_device/node_device_hal.h \ + $(NULL) + +NODE_DEVICE_DRIVER_UDEV_SOURCES =3D \ + node_device/node_device_udev.c \ + node_device/node_device_udev.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + +STATEFUL_DRIVER_SOURCE_FILES +=3D \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NULL) + +EXTRA_DIST +=3D \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + + +if WITH_NODE_DEVICES +# Needed to keep automake quiet about conditionals +mod_LTLIBRARIES +=3D libvirt_driver_nodedev.la +libvirt_driver_nodedev_la_SOURCES =3D $(NODE_DEVICE_DRIVER_SOURCES) + +libvirt_driver_nodedev_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_nodedev_la_LIBADD =3D + +if WITH_HAL +libvirt_driver_nodedev_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_HAL_SOURCES) +libvirt_driver_nodedev_la_CFLAGS +=3D $(HAL_CFLAGS) +libvirt_driver_nodedev_la_LIBADD +=3D $(HAL_LIBS) +endif WITH_HAL +if WITH_UDEV +libvirt_driver_nodedev_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS +=3D \ + $(UDEV_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LIBADD +=3D \ + $(UDEV_LIBS) \ + $(PCIACCESS_LIBS) \ + $(NULL) +endif WITH_UDEV + +libvirt_driver_nodedev_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la +endif WITH_NODE_DEVICES --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list