From nobody Wed May 14 18:26:04 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 1519812895184473.8079637882645; Wed, 28 Feb 2018 02:14:55 -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 90ECF80B29; Wed, 28 Feb 2018 10:14:53 +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 468F15D964; Wed, 28 Feb 2018 10:14:53 +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 E16DD18033F1; Wed, 28 Feb 2018 10:14:52 +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 w1SAElF2005647 for ; Wed, 28 Feb 2018 05:14:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id B27542024CA8; Wed, 28 Feb 2018 10:14:47 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F9B72024CA6; Wed, 28 Feb 2018 10:14:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:29 +0000 Message-Id: <20180228101435.464-12-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 11/17] make: split access driver build rules into access/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:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 130 +-------------------------------------- src/access/Makefile.inc.am | 148 +++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 149 insertions(+), 129 deletions(-) create mode 100644 src/access/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 7dd50dacec..e4822e1b40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,6 +94,7 @@ man8_MANS =3D include conf/Makefile.inc.am include cpu/Makefile.inc.am include security/Makefile.inc.am +include access/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -643,39 +644,6 @@ UTIL_IO_HELPER_SOURCES =3D \ util/iohelper.c =20 =20 -ACCESS_DRIVER_GENERATED =3D \ - access/viraccessapicheck.h \ - access/viraccessapicheck.c \ - access/viraccessapicheckqemu.h \ - access/viraccessapicheckqemu.c \ - access/viraccessapichecklxc.h \ - access/viraccessapichecklxc.c \ - $(NULL) - -ACCESS_DRIVER_SYM_FILES =3D \ - libvirt_access.syms \ - libvirt_access_qemu.syms \ - libvirt_access_lxc.syms - -ACCESS_DRIVER_API_FILES =3D \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml - -ACCESS_DRIVER_SOURCES =3D \ - access/viraccessperm.h access/viraccessperm.c \ - access/viraccessmanager.h access/viraccessmanager.c \ - access/viraccessdriver.h \ - access/viraccessdrivernop.h access/viraccessdrivernop.c \ - access/viraccessdriverstack.h access/viraccessdriverstack.c - -ACCESS_DRIVER_POLKIT_SOURCES =3D \ - access/viraccessdriverpolkit.h access/viraccessdriverpolkit.c - -ACCESS_DRIVER_POLKIT_POLICY =3D \ - $(srcdir)/access/org.libvirt.api.policy - - =20 VMX_SOURCES =3D \ vmx/vmx.c vmx/vmx.h @@ -731,7 +699,6 @@ libvirt_driver_la_LIBADD =3D \ SYM_FILES +=3D $(USED_SYM_FILES) USED_SYM_FILES +=3D $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES +=3D \ - $(ACCESS_DRIVER_SYM_FILES) \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ libvirt_admin.syms libvirt_admin.def \ $(NULL) @@ -751,101 +718,6 @@ GENERATED_SYM_FILES +=3D \ =20 =20 =20 -libvirt_driver_access_la_SOURCES =3D \ - $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) -noinst_LTLIBRARIES +=3D libvirt_driver_access.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_access.la -libvirt_driver_access_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_access_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_access_la_LIBADD =3D - -EXTRA_DIST +=3D access/genpolkit.pl - -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/genpolkit.pl Makefile.am - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - -if WITH_POLKIT1 -libvirt_driver_access_la_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) - -polkitactiondir =3D $(datadir)/polkit-1/actions -if WITH_LIBVIRTD -polkitaction_DATA =3D $(ACCESS_DRIVER_POLKIT_POLICY) -endif WITH_LIBVIRTD - -CLEANFILES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) -BUILT_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) -else ! WITH_POLKIT1 -EXTRA_DIST +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) -endif ! WITH_POLKIT1 - - -BUILT_SOURCES +=3D $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES) -CLEANFILES +=3D $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES) - -libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.syms: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - lxc LXC $(LXC_PROTOCOL) > $@ - -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - lxc LXC $(LXC_PROTOCOL) > $@ - -access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheck.h -access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \ - > $(srcdir)/access/viraccessapicheck.c - -access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheckqemu.h -access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \ - > $(srcdir)/access/viraccessapicheckqemu.c - -access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/access/viraccessapichecklxc.h -access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ - > $(srcdir)/access/viraccessapichecklxc.c - -# Add all conditional sources just in case... -EXTRA_DIST +=3D \ - $(ACCESS_DRIVER_POLKIT_POLICY) =20 check-local: check-augeas =20 diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am new file mode 100644 index 0000000000..c68ba5f044 --- /dev/null +++ b/src/access/Makefile.inc.am @@ -0,0 +1,148 @@ +ACCESS_DRIVER_GENERATED =3D \ + access/viraccessapicheck.h \ + access/viraccessapicheck.c \ + access/viraccessapicheckqemu.h \ + access/viraccessapicheckqemu.c \ + access/viraccessapichecklxc.h \ + access/viraccessapichecklxc.c \ + $(NULL) + +ACCESS_DRIVER_SYM_FILES =3D \ + libvirt_access.syms \ + libvirt_access_qemu.syms \ + libvirt_access_lxc.syms \ + $(NULL) + +ACCESS_DRIVER_API_FILES =3D \ + libvirt_access.xml \ + libvirt_access_qemu.xml \ + libvirt_access_lxc.xml \ + $(NULL) + +ACCESS_DRIVER_SOURCES =3D \ + access/viraccessperm.h \ + access/viraccessperm.c \ + access/viraccessmanager.h \ + access/viraccessmanager.c \ + access/viraccessdriver.h \ + access/viraccessdrivernop.h \ + access/viraccessdrivernop.c \ + access/viraccessdriverstack.h \ + access/viraccessdriverstack.c \ + $(NULL) + +ACCESS_DRIVER_POLKIT_SOURCES =3D \ + access/viraccessdriverpolkit.h \ + access/viraccessdriverpolkit.c \ + $(NULL) + +ACCESS_DRIVER_POLKIT_POLICY =3D $(srcdir)/access/org.libvirt.api.policy + +GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) + +EXTRA_DIST +=3D \ + $(ACCESS_DRIVER_POLKIT_POLICY) \ + access/genpolkit.pl \ + $(NULL) + + +libvirt_driver_access_la_SOURCES =3D \ + $(ACCESS_DRIVER_SOURCES) \ + $(ACCESS_DRIVER_GENERATED) \ + $(NULL) +noinst_LTLIBRARIES +=3D libvirt_driver_access.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_access.la +libvirt_driver_access_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_access_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_access_la_LIBADD =3D + + +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + +if WITH_POLKIT1 +libvirt_driver_access_la_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) + +polkitactiondir =3D $(datadir)/polkit-1/actions +if WITH_LIBVIRTD +polkitaction_DATA =3D $(ACCESS_DRIVER_POLKIT_POLICY) +endif WITH_LIBVIRTD + +CLEANFILES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) +BUILT_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) +else ! WITH_POLKIT1 +EXTRA_DIST +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) +endif ! WITH_POLKIT1 + + +BUILT_SOURCES +=3D \ + $(ACCESS_DRIVER_GENERATED) \ + $(ACCESS_DRIVER_API_FILES) \ + $(NULL) +CLEANFILES +=3D \ + $(ACCESS_DRIVER_GENERATED) \ + $(ACCESS_DRIVER_API_FILES) \ + $(NULL) + +libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ + remote REMOTE $(REMOTE_PROTOCOL) > $@ +libvirt_access_qemu.syms: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ + qemu QEMU $(QEMU_PROTOCOL) > $@ +libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ + lxc LXC $(LXC_PROTOCOL) > $@ + +libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ + remote REMOTE $(REMOTE_PROTOCOL) > $@ +libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ + qemu QEMU $(QEMU_PROTOCOL) > $@ +libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ + lxc LXC $(LXC_PROTOCOL) > $@ + +access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ + remote REMOTE $(REMOTE_PROTOCOL) \ + > $(srcdir)/access/viraccessapicheck.h +access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ + remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \ + > $(srcdir)/access/viraccessapicheck.c + +access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ + qemu QEMU $(QEMU_PROTOCOL) \ + > $(srcdir)/access/viraccessapicheckqemu.h +access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ + qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \ + > $(srcdir)/access/viraccessapicheckqemu.c + +access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ + lxc LXC $(LXC_PROTOCOL) \ + > $(srcdir)/access/viraccessapichecklxc.h +access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ + lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ + > $(srcdir)/access/viraccessapichecklxc.c --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list