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 1519812885723890.5033180559582; Wed, 28 Feb 2018 02:14:45 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 144884E8BA; Wed, 28 Feb 2018 10:14:44 +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 DB7315E1C1; Wed, 28 Feb 2018 10:14:43 +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 983094A470; Wed, 28 Feb 2018 10:14:43 +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 w1SAEeak005573 for ; Wed, 28 Feb 2018 05:14:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id C60E42024CAC; Wed, 28 Feb 2018 10:14:40 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51BBB2024CA6; 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:21 +0000 Message-Id: <20180228101435.464-4-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 03/17] make: split nwfilter driver build rules into nwfilter/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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 28 Feb 2018 10:14:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 39 +-------------------------------------- src/nwfilter/Makefile.inc.am | 42 ++++++++++++++++++++++++++++++++++++++++= ++ 2 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 src/nwfilter/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index d16cbe2f0c..8c21453ec7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ include vz/Makefile.inc.am include lxc/Makefile.inc.am include interface/Makefile.inc.am include network/Makefile.inc.am +include nwfilter/Makefile.inc.am =20 =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -783,7 +784,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -791,7 +791,6 @@ DRIVER_SOURCE_FILES +=3D \ =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -884,19 +883,6 @@ STORAGE_HELPER_DISK_SOURCES =3D \ UTIL_IO_HELPER_SOURCES =3D \ util/iohelper.c =20 -# Network filters -NWFILTER_DRIVER_SOURCES =3D \ - nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ - nwfilter/nwfilter_tech_driver.h \ - nwfilter/nwfilter_gentech_driver.c \ - nwfilter/nwfilter_gentech_driver.h \ - nwfilter/nwfilter_dhcpsnoop.c \ - nwfilter/nwfilter_dhcpsnoop.h \ - nwfilter/nwfilter_ebiptables_driver.c \ - nwfilter/nwfilter_ebiptables_driver.h \ - nwfilter/nwfilter_learnipaddr.c \ - nwfilter/nwfilter_learnipaddr.h - =20 # Security framework and drivers for various models SECURITY_DRIVER_SOURCES =3D \ @@ -1362,28 +1348,6 @@ libvirt_driver_nodedev_la_LIBADD +=3D libvirt.la ../= gnulib/lib/libgnu.la endif WITH_NODE_DEVICES =20 =20 -if WITH_NWFILTER -noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.la -libvirt_driver_nwfilter_la_SOURCES =3D -libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la -libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ - $(LIBPCAP_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_nwfilter_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_nwfilter_impl_la_LIBADD =3D \ - $(LIBPCAP_LIBS) \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) -libvirt_driver_nwfilter_impl_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgn= u.la -libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) -endif WITH_NWFILTER - =20 libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) noinst_LTLIBRARIES +=3D libvirt_security_manager.la @@ -1511,7 +1475,6 @@ EXTRA_DIST +=3D \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am new file mode 100644 index 0000000000..16345efcb6 --- /dev/null +++ b/src/nwfilter/Makefile.inc.am @@ -0,0 +1,42 @@ +NWFILTER_DRIVER_SOURCES =3D \ + nwfilter/nwfilter_driver.h \ + nwfilter/nwfilter_driver.c \ + nwfilter/nwfilter_tech_driver.h \ + nwfilter/nwfilter_gentech_driver.c \ + nwfilter/nwfilter_gentech_driver.h \ + nwfilter/nwfilter_dhcpsnoop.c \ + nwfilter/nwfilter_dhcpsnoop.h \ + nwfilter/nwfilter_ebiptables_driver.c \ + nwfilter/nwfilter_ebiptables_driver.h \ + nwfilter/nwfilter_learnipaddr.c \ + nwfilter/nwfilter_learnipaddr.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(NWFILTER_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(NWFILTER_DRIVER_SOURCES) +EXTRA_DIST +=3D $(NWFILTER_DRIVER_SOURCES) + +if WITH_NWFILTER +noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.la +libvirt_driver_nwfilter_la_SOURCES =3D +libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la +mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la +libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ + $(LIBPCAP_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_nwfilter_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_nwfilter_impl_la_LIBADD =3D \ + $(LIBPCAP_LIBS) \ + $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) +endif WITH_NWFILTER --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list