From nobody Wed May 14 18:20:06 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 1519812883092472.1157931641104; Wed, 28 Feb 2018 02:14:43 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 903E9356CE; Wed, 28 Feb 2018 10:14:41 +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 58DF45D9C8; Wed, 28 Feb 2018 10:14:41 +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 E5C8A18033EB; Wed, 28 Feb 2018 10:14:40 +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 w1SAEddf005556 for ; Wed, 28 Feb 2018 05:14:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id 15D3F2024CA8; Wed, 28 Feb 2018 10:14:39 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 587B12024CA6; Wed, 28 Feb 2018 10:14:38 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:19 +0000 Message-Id: <20180228101435.464-2-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 01/17] make: split interface driver build rules into interface/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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 28 Feb 2018 10:14:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 41 +--------------------------------------= -- src/interface/Makefile.inc.am | 42 +++++++++++++++++++++++++++++++++++++++= +++ 2 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 src/interface/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8d72f2f1e5..e50f6eecb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,6 +98,7 @@ include xen/Makefile.inc.am include xenapi/Makefile.inc.am include vz/Makefile.inc.am include lxc/Makefile.inc.am +include interface/Makefile.inc.am =20 =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -781,7 +782,6 @@ check-drivername: EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ - $(INTERFACE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ @@ -793,7 +793,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NULL) =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(INTERFACE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ @@ -838,23 +837,6 @@ NETWORK_DRIVER_SOURCES =3D \ $(NULL) EXTRA_DIST +=3D network/bridge_driver_linux.c network/bridge_driver_nop.c =20 -INTERFACE_DRIVER_SOURCES =3D - -if WITH_INTERFACE -INTERFACE_DRIVER_SOURCES +=3D \ - interface/interface_driver.h \ - interface/interface_driver.c - -if WITH_NETCF -INTERFACE_DRIVER_SOURCES +=3D \ - interface/interface_backend_netcf.c -endif WITH_NETCF -if WITH_UDEV -INTERFACE_DRIVER_SOURCES +=3D \ - interface/interface_backend_udev.c -endif WITH_UDEV -endif WITH_INTERFACE - SECRET_UTIL_SOURCES =3D \ secret/secret_util.h secret/secret_util.c =20 @@ -1208,26 +1190,6 @@ endif WITH_NETWORK EXTRA_DIST +=3D network/default.xml =20 =20 -if WITH_INTERFACE -mod_LTLIBRARIES +=3D libvirt_driver_interface.la -libvirt_driver_interface_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_interface_la_LIBADD =3D -if WITH_NETCF -libvirt_driver_interface_la_CFLAGS +=3D $(NETCF_CFLAGS) -libvirt_driver_interface_la_LIBADD +=3D $(NETCF_LIBS) -endif WITH_NETCF -if WITH_UDEV -libvirt_driver_interface_la_CFLAGS +=3D $(UDEV_CFLAGS) -libvirt_driver_interface_la_LIBADD +=3D $(UDEV_LIBS) -endif WITH_UDEV -libvirt_driver_interface_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_interface_la_SOURCES =3D $(INTERFACE_DRIVER_SOURCES) -endif WITH_INTERFACE - if WITH_SECRETS mod_LTLIBRARIES +=3D libvirt_driver_secret.la libvirt_driver_secret_la_CFLAGS =3D \ @@ -1569,7 +1531,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ - $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ $(STORAGE_DRIVER_LVM_SOURCES) \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am new file mode 100644 index 0000000000..27fbfe1e1a --- /dev/null +++ b/src/interface/Makefile.inc.am @@ -0,0 +1,42 @@ +INTERFACE_DRIVER_SOURCES =3D \ + interface/interface_driver.h \ + interface/interface_driver.c \ + $(NULL) + +INTERFACE_DRIVER_NETCF_SOURCES =3D interface/interface_backend_netcf.c +INTERFACE_DRIVER_UDEV_SOURCES =3D interface/interface_backend_udev.c + +DRIVER_SOURCE_FILES +=3D $(INTERFACE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(INTERFACE_DRIVER_SOURCES) + +EXTRA_DIST +=3D \ + $(INTERFACE_DRIVER_SOURCES) \ + $(INTERFACE_DRIVER_NETCF_SOURCES) \ + $(INTERFACE_DRIVER_UDEV_SOURCES) \ + $(NULL) + +if WITH_INTERFACE +mod_LTLIBRARIES +=3D libvirt_driver_interface.la +libvirt_driver_interface_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_interface_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_interface_la_SOURCES =3D $(INTERFACE_DRIVER_SOURCES) +if WITH_NETCF +libvirt_driver_interface_la_CFLAGS +=3D $(NETCF_CFLAGS) +libvirt_driver_interface_la_LIBADD +=3D $(NETCF_LIBS) +libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIVER_NETCF_SOURCES) +endif WITH_NETCF +if WITH_UDEV +libvirt_driver_interface_la_CFLAGS +=3D $(UDEV_CFLAGS) +libvirt_driver_interface_la_LIBADD +=3D $(UDEV_LIBS) +libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIVER_UDEV_SOURCES) +endif WITH_UDEV +endif WITH_INTERFACE --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list