From nobody Wed May 14 18:22:59 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 1519812898101192.46166037174908; Wed, 28 Feb 2018 02:14:58 -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 6677280474; Wed, 28 Feb 2018 10:14:54 +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 314915D970; Wed, 28 Feb 2018 10:14:54 +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 B890B18033F5; Wed, 28 Feb 2018 10:14:53 +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 w1SAEjW4005627 for ; Wed, 28 Feb 2018 05:14:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 66C702026E0E; Wed, 28 Feb 2018 10:14:45 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A6F2024CA6; Wed, 28 Feb 2018 10:14:44 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:26 +0000 Message-Id: <20180228101435.464-9-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 08/17] make: split XML conf build rules into conf/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.28]); Wed, 28 Feb 2018 10:14:55 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 117 +--------------------------------- src/conf/Makefile.inc.am | 163 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 164 insertions(+), 116 deletions(-) create mode 100644 src/conf/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index bbfd3b0427..f4fb9ac242 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,6 +91,7 @@ SYSCONF_FILES =3D sbin_PROGRAMS =3D man8_MANS =3D =20 +include conf/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -439,114 +440,6 @@ logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h =20 =20 -NETDEV_CONF_SOURCES =3D \ - conf/netdev_bandwidth_conf.h conf/netdev_bandwidth_conf.c \ - conf/netdev_vport_profile_conf.h conf/netdev_vport_profile_conf.c \ - conf/netdev_vlan_conf.h conf/netdev_vlan_conf.c - -# XML configuration format handling sources -# Domain driver generic impl APIs -DOMAIN_CONF_SOURCES =3D \ - conf/capabilities.c conf/capabilities.h \ - conf/domain_addr.c conf/domain_addr.h \ - conf/domain_capabilities.c conf/domain_capabilities.h \ - conf/domain_conf.c conf/domain_conf.h \ - conf/domain_audit.c conf/domain_audit.h \ - conf/domain_nwfilter.c conf/domain_nwfilter.h \ - conf/virsavecookie.c conf/virsavecookie.h \ - conf/snapshot_conf.c conf/snapshot_conf.h \ - conf/numa_conf.c conf/numa_conf.h \ - conf/virdomainobjlist.c conf/virdomainobjlist.h - -OBJECT_EVENT_SOURCES =3D \ - conf/object_event.c conf/object_event.h \ - conf/object_event_private.h - -DOMAIN_EVENT_SOURCES =3D \ - conf/domain_event.c conf/domain_event.h - -NETWORK_EVENT_SOURCES =3D \ - conf/network_event.c conf/network_event.h - -STORAGE_EVENT_SOURCES =3D \ - conf/storage_event.c conf/storage_event.h - -NODE_DEVICE_EVENT_SOURCES =3D \ - conf/node_device_event.c conf/node_device_event.h - -SECRET_EVENT_SOURCES =3D \ - conf/secret_event.c conf/secret_event.h - -# Network driver generic impl APIs -NETWORK_CONF_SOURCES =3D \ - conf/network_conf.c conf/network_conf.h \ - conf/virnetworkobj.c conf/virnetworkobj.h \ - conf/networkcommon_conf.c conf/networkcommon_conf.h - -# Network filter driver generic impl APIs -NWFILTER_PARAM_CONF_SOURCES =3D \ - conf/nwfilter_params.c conf/nwfilter_params.h \ - conf/nwfilter_ipaddrmap.c \ - conf/nwfilter_ipaddrmap.h \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.h - -NWFILTER_CONF_SOURCES =3D \ - $(NWFILTER_PARAM_CONF_SOURCES) \ - conf/nwfilter_conf.c conf/nwfilter_conf.h \ - conf/virnwfilterobj.c conf/virnwfilterobj.h - -# Storage driver generic impl APIs -STORAGE_CONF_SOURCES =3D \ - conf/storage_adapter_conf.h conf/storage_adapter_conf.c \ - conf/storage_conf.h conf/storage_conf.c \ - conf/virstorageobj.h conf/virstorageobj.c - -# Interface driver generic impl APIs -INTERFACE_CONF_SOURCES =3D \ - conf/interface_conf.c conf/interface_conf.h \ - conf/virinterfaceobj.c conf/virinterfaceobj.h - -# Secret driver generic impl APIs -SECRET_CONF_SOURCES =3D \ - conf/secret_conf.h conf/secret_conf.c \ - conf/virsecretobj.h conf/virsecretobj.c - -# Network driver generic impl APIs -NODE_DEVICE_CONF_SOURCES =3D \ - conf/node_device_conf.c conf/node_device_conf.h \ - conf/virnodedeviceobj.c conf/virnodedeviceobj.h - -CPU_CONF_SOURCES =3D \ - conf/cpu_conf.c conf/cpu_conf.h - -# Safe character device handling helper APIs -CHRDEV_CONF_SOURCES =3D \ - conf/virchrdev.c conf/virchrdev.h - -# Device Helper APIs -DEVICE_CONF_SOURCES =3D \ - conf/device_conf.c conf/device_conf.h - -CONF_SOURCES =3D \ - $(NETDEV_CONF_SOURCES) \ - $(DOMAIN_CONF_SOURCES) \ - $(OBJECT_EVENT_SOURCES) \ - $(DOMAIN_EVENT_SOURCES) \ - $(NETWORK_EVENT_SOURCES) \ - $(STORAGE_EVENT_SOURCES) \ - $(NODE_DEVICE_EVENT_SOURCES) \ - $(SECRET_EVENT_SOURCES) \ - $(NETWORK_CONF_SOURCES) \ - $(NWFILTER_CONF_SOURCES) \ - $(NODE_DEVICE_CONF_SOURCES) \ - $(STORAGE_CONF_SOURCES) \ - $(INTERFACE_CONF_SOURCES) \ - $(SECRET_CONF_SOURCES) \ - $(CPU_CONF_SOURCES) \ - $(CHRDEV_CONF_SOURCES) \ - $(DEVICE_CONF_SOURCES) - =20 ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x =20 @@ -838,14 +731,6 @@ libvirt_util_la_LIBADD =3D $(CAPNG_LIBS) $(YAJL_LIBS) = $(LIBNL_LIBS) \ $(POLKIT_LIBS) $(GNUTLS_LIBS) =20 =20 -noinst_LTLIBRARIES +=3D libvirt_conf.la -libvirt_la_BUILT_LIBADD +=3D libvirt_conf.la -libvirt_conf_la_SOURCES =3D $(CONF_SOURCES) -libvirt_conf_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_conf_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_conf_la_LIBADD =3D $(LIBXML_LIBS) - noinst_LTLIBRARIES +=3D libvirt_cpu.la libvirt_la_BUILT_LIBADD +=3D libvirt_cpu.la libvirt_cpu_la_CFLAGS =3D \ diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am new file mode 100644 index 0000000000..6d7b0f076b --- /dev/null +++ b/src/conf/Makefile.inc.am @@ -0,0 +1,163 @@ +NETDEV_CONF_SOURCES =3D \ + conf/netdev_bandwidth_conf.h \ + conf/netdev_bandwidth_conf.c \ + conf/netdev_vport_profile_conf.h \ + conf/netdev_vport_profile_conf.c \ + conf/netdev_vlan_conf.h \ + conf/netdev_vlan_conf.c \ + $(NULL) + +DOMAIN_CONF_SOURCES =3D \ + conf/capabilities.c \ + conf/capabilities.h \ + conf/domain_addr.c \ + conf/domain_addr.h \ + conf/domain_capabilities.c \ + conf/domain_capabilities.h \ + conf/domain_conf.c \ + conf/domain_conf.h \ + conf/domain_audit.c \ + conf/domain_audit.h \ + conf/domain_nwfilter.c \ + conf/domain_nwfilter.h \ + conf/virsavecookie.c \ + conf/virsavecookie.h \ + conf/snapshot_conf.c \ + conf/snapshot_conf.h \ + conf/numa_conf.c \ + conf/numa_conf.h \ + conf/virdomainobjlist.c \ + conf/virdomainobjlist.h \ + $(NULL) + +OBJECT_EVENT_SOURCES =3D \ + conf/object_event.c \ + conf/object_event.h \ + conf/object_event_private.h \ + $(NULL) + +DOMAIN_EVENT_SOURCES =3D \ + conf/domain_event.c \ + conf/domain_event.h \ + $(NULL) + +NETWORK_EVENT_SOURCES =3D \ + conf/network_event.c \ + conf/network_event.h \ + $(NULL) + +STORAGE_EVENT_SOURCES =3D \ + conf/storage_event.c \ + conf/storage_event.h \ + $(NULL) + +NODE_DEVICE_EVENT_SOURCES =3D \ + conf/node_device_event.c \ + conf/node_device_event.h \ + $(NULL) + +SECRET_EVENT_SOURCES =3D \ + conf/secret_event.c \ + conf/secret_event.h \ + $(NULL) + +NETWORK_CONF_SOURCES =3D \ + conf/network_conf.c \ + conf/network_conf.h \ + conf/virnetworkobj.c \ + conf/virnetworkobj.h \ + conf/networkcommon_conf.c \ + conf/networkcommon_conf.h \ + $(NULL) + +NWFILTER_PARAM_CONF_SOURCES =3D \ + conf/nwfilter_params.c \ + conf/nwfilter_params.h \ + conf/nwfilter_ipaddrmap.c \ + conf/nwfilter_ipaddrmap.h \ + conf/nwfilter_conf.h \ + conf/virnwfilterobj.h \ + $(NULL) + +NWFILTER_CONF_SOURCES =3D \ + $(NWFILTER_PARAM_CONF_SOURCES) \ + conf/nwfilter_conf.c \ + conf/nwfilter_conf.h \ + conf/virnwfilterobj.c \ + conf/virnwfilterobj.h \ + $(NULL) + +STORAGE_CONF_SOURCES =3D \ + conf/storage_adapter_conf.h \ + conf/storage_adapter_conf.c \ + conf/storage_conf.h \ + conf/storage_conf.c \ + conf/virstorageobj.h \ + conf/virstorageobj.c \ + $(NULL) + +INTERFACE_CONF_SOURCES =3D \ + conf/interface_conf.c \ + conf/interface_conf.h \ + conf/virinterfaceobj.c \ + conf/virinterfaceobj.h \ + $(NULL) + +SECRET_CONF_SOURCES =3D \ + conf/secret_conf.h \ + conf/secret_conf.c \ + conf/virsecretobj.h \ + conf/virsecretobj.c \ + $(NULL) + +NODE_DEVICE_CONF_SOURCES =3D \ + conf/node_device_conf.c \ + conf/node_device_conf.h \ + conf/virnodedeviceobj.c \ + conf/virnodedeviceobj.h \ + $(NULL) + +CPU_CONF_SOURCES =3D \ + conf/cpu_conf.c \ + conf/cpu_conf.h \ + $(NULL) + +CHRDEV_CONF_SOURCES =3D \ + conf/virchrdev.c \ + conf/virchrdev.h \ + $(NULL) + +DEVICE_CONF_SOURCES =3D \ + conf/device_conf.c \ + conf/device_conf.h \ + $(NULL) + +CONF_SOURCES =3D \ + $(NETDEV_CONF_SOURCES) \ + $(DOMAIN_CONF_SOURCES) \ + $(OBJECT_EVENT_SOURCES) \ + $(DOMAIN_EVENT_SOURCES) \ + $(NETWORK_EVENT_SOURCES) \ + $(STORAGE_EVENT_SOURCES) \ + $(NODE_DEVICE_EVENT_SOURCES) \ + $(SECRET_EVENT_SOURCES) \ + $(NETWORK_CONF_SOURCES) \ + $(NWFILTER_CONF_SOURCES) \ + $(NODE_DEVICE_CONF_SOURCES) \ + $(STORAGE_CONF_SOURCES) \ + $(INTERFACE_CONF_SOURCES) \ + $(SECRET_CONF_SOURCES) \ + $(CPU_CONF_SOURCES) \ + $(CHRDEV_CONF_SOURCES) \ + $(DEVICE_CONF_SOURCES) \ + $(NULL) + +noinst_LTLIBRARIES +=3D libvirt_conf.la +libvirt_la_BUILT_LIBADD +=3D libvirt_conf.la +libvirt_conf_la_SOURCES =3D $(CONF_SOURCES) +libvirt_conf_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_conf_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_conf_la_LIBADD =3D $(LIBXML_LIBS) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list