From nobody Wed May 14 18:36:41 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 1519304212313543.6924347448831; Thu, 22 Feb 2018 04:56:52 -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 776C9C0587E2; Thu, 22 Feb 2018 12:56:49 +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 417384C48B; Thu, 22 Feb 2018 12:56:49 +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 09E9C4A48B; Thu, 22 Feb 2018 12:56:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1MCuXlv010913 for ; Thu, 22 Feb 2018 07:56:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9D953B079B; Thu, 22 Feb 2018 12:56:33 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12AFFAB58E; Thu, 22 Feb 2018 12:56:32 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:17 +0000 Message-Id: <20180222125617.6768-17-berrange@redhat.com> In-Reply-To: <20180222125617.6768-1-berrange@redhat.com> References: <20180222125617.6768-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 16/16] make: split lxc driver build rules into lxc/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.32]); Thu, 22 Feb 2018 12:56:49 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 184 ++---------------------------------------- src/lxc/Makefile.inc.am | 207 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 212 insertions(+), 179 deletions(-) create mode 100644 src/lxc/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 7e8be8c05b..6406b01cfd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,6 +79,8 @@ AUGEAS_DIRS =3D if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES +libexec_PROGRAMS =3D +RPC_PROBE_FILES =3D =20 include uml/Makefile.inc.am include phyp/Makefile.inc.am @@ -95,6 +97,7 @@ include libxl/Makefile.inc.am include xen/Makefile.inc.am include xenapi/Makefile.inc.am include vz/Makefile.inc.am +include lxc/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -782,7 +785,6 @@ EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ $(INTERFACE_DRIVER_SOURCES) \ - $(LXC_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ @@ -795,7 +797,6 @@ DRIVER_SOURCE_FILES +=3D \ =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(INTERFACE_DRIVER_SOURCES) \ - $(LXC_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ @@ -829,72 +830,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 -LXC_MONITOR_PROTOCOL_GENERATED =3D \ - lxc/lxc_monitor_protocol.h \ - lxc/lxc_monitor_protocol.c \ - $(NULL) - -LXC_MONITOR_GENERATED =3D \ - lxc/lxc_monitor_dispatch.h \ - $(NULL) - -LXC_CONTROLLER_GENERATED =3D \ - lxc/lxc_controller_dispatch.h \ - $(NULL) - -LXC_GENERATED =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - $(NULL) - -LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x - -lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_MONITOR_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_monitor_dispatch.h - -lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_controller_dispatch.h - -EXTRA_DIST +=3D \ - $(LXC_MONITOR_PROTOCOL) \ - $(LXC_GENERATED) \ - $(NULL) - -BUILT_SOURCES +=3D $(LXC_GENERATED) - -CLEANFILES +=3D $(LXC_GENERATED) - -LXC_DRIVER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - lxc/lxc_conf.c lxc/lxc_conf.h \ - lxc/lxc_container.c lxc/lxc_container.h \ - lxc/lxc_cgroup.c lxc/lxc_cgroup.h \ - lxc/lxc_domain.c lxc/lxc_domain.h \ - lxc/lxc_hostdev.c lxc/lxc_hostdev.h \ - lxc/lxc_monitor.c lxc/lxc_monitor.h \ - lxc/lxc_process.c lxc/lxc_process.h \ - lxc/lxc_fuse.c lxc/lxc_fuse.h \ - lxc/lxc_native.c lxc/lxc_native.h \ - lxc/lxc_driver.c lxc/lxc_driver.h - -LXC_CONTROLLER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - lxc/lxc_conf.c lxc/lxc_conf.h \ - lxc/lxc_container.c lxc/lxc_container.h \ - lxc/lxc_cgroup.c lxc/lxc_cgroup.h \ - lxc/lxc_domain.c lxc/lxc_domain.h \ - lxc/lxc_fuse.c lxc/lxc_fuse.h \ - lxc/lxc_controller.c - SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c @@ -1252,48 +1187,6 @@ EXTRA_DIST +=3D \ $< $(srcdir)/$(subst $(srcdir)/,,$@) =20 =20 - - - -if WITH_LXC -noinst_LTLIBRARIES +=3D libvirt_driver_lxc_impl.la -libvirt_driver_lxc_la_SOURCES =3D -libvirt_driver_lxc_la_LIBADD =3D libvirt_driver_lxc_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_lxc.la -libvirt_driver_lxc_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_lxc_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_lxc_impl_la_CFLAGS =3D \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_lxc_impl_la_LIBADD =3D \ - $(CAPNG_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBXML_LIBS) \ - $(FUSE_LIBS) - -if WITH_BLKID -libvirt_driver_lxc_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_driver_lxc_impl_la_LIBADD +=3D $(BLKID_LIBS) -endif WITH_BLKID -libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) -libvirt_driver_lxc_impl_la_SOURCES =3D $(LXC_DRIVER_SOURCES) - -conf_DATA +=3D lxc/lxc.conf - -augeas_DATA +=3D lxc/libvirtd_lxc.aug -augeastest_DATA +=3D test_libvirtd_lxc.aug -CLEANFILES +=3D test_libvirtd_lxc.aug - -endif WITH_LXC -EXTRA_DIST +=3D lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.au= g.in - - - if WITH_NETWORK noinst_LTLIBRARIES +=3D libvirt_driver_network_impl.la libvirt_driver_network_la_SOURCES =3D @@ -1678,7 +1571,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ # Add all conditional sources just in case... EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ - $(LXC_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -1706,32 +1598,19 @@ EXTRA_DIST +=3D \ check-local: check-augeas =20 .PHONY: check-augeas \ - check-augeas-lxc \ check-augeas-sanlock \ check-augeas-lockd \ check-augeas-libvirtd \ $(NULL) =20 check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%) \ - check-augeas-lxc check-augeas-sanlock \ + check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd \ check-augeas-virtlogd check-augeas-libvirtd =20 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST +=3D $(top_srcdir)/build-aux/augeas-gentest.pl =20 -if WITH_LXC -test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ - $(srcdir)/lxc/lxc.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@ - -check-augeas-lxc: test_libvirtd_lxc.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \ - fi -else ! WITH_LXC -check-augeas-lxc: -endif ! WITH_LXC =20 if WITH_SANLOCK test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ @@ -2034,12 +1913,11 @@ tapset_DATA +=3D libvirt_probes.stp libvirt_functio= ns.stp > $@ =20 # Keep this list synced with PROTOCOL_STRUCTS -RPC_PROBE_FILES =3D $(srcdir)/rpc/virnetprotocol.x \ +RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ $(srcdir)/rpc/virkeepaliveprotocol.x \ $(srcdir)/remote/remote_protocol.x \ $(srcdir)/remote/lxc_protocol.x \ $(srcdir)/remote/qemu_protocol.x \ - $(srcdir)/lxc/lxc_monitor_protocol.x \ $(srcdir)/locking/lock_protocol.x \ $(srcdir)/admin/admin_protocol.x =20 @@ -2794,8 +2672,6 @@ libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_net_rpc_client_la_LIBADD =3D \ $(CYGWIN_EXTRA_LIBADD) =20 -libexec_PROGRAMS =3D - if WITH_LIBVIRTD libexec_PROGRAMS +=3D libvirt_iohelper libvirt_iohelper_SOURCES =3D $(UTIL_IO_HELPER_SOURCES) @@ -2882,46 +2758,6 @@ libvirt_sanlock_helper_LDFLAGS =3D \ libvirt_sanlock_helper_LDADD =3D libvirt.la endif WITH_SANLOCK =20 -if WITH_LXC -if WITH_LIBVIRTD -libexec_PROGRAMS +=3D libvirt_lxc - -libvirt_lxc_SOURCES =3D \ - $(LXC_CONTROLLER_SOURCES) \ - $(DATATYPES_SOURCES) -libvirt_lxc_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(CAPNG_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_lxc_LDADD =3D \ - $(FUSE_LIBS) \ - libvirt.la \ - ../gnulib/lib/libgnu.la -if WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) -libvirt_lxc_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -if WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_lxc_LDADD +=3D $(BLKID_LIBS) -endif WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(SECDRIVER_CFLAGS) -endif WITH_LIBVIRTD -endif WITH_LXC -EXTRA_DIST +=3D $(LXC_CONTROLLER_SOURCES) =20 if WITH_SECDRIVER_APPARMOR if WITH_LIBVIRTD @@ -3037,11 +2873,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" endif WITH_SANLOCK -if WITH_LXC - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" -endif WITH_LXC if WITH_NETWORK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" @@ -3078,11 +2909,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: endif WITH_SANLOCK -if WITH_LXC - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: -endif WITH_LXC if WITH_NETWORK rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am new file mode 100644 index 0000000000..8a3d4c4789 --- /dev/null +++ b/src/lxc/Makefile.inc.am @@ -0,0 +1,207 @@ +LXC_MONITOR_PROTOCOL_GENERATED =3D \ + lxc/lxc_monitor_protocol.h \ + lxc/lxc_monitor_protocol.c \ + $(NULL) + +LXC_MONITOR_GENERATED =3D \ + lxc/lxc_monitor_dispatch.h \ + $(NULL) + +LXC_CONTROLLER_GENERATED =3D \ + lxc/lxc_controller_dispatch.h \ + $(NULL) + +LXC_GENERATED =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_CONTROLLER_GENERATED) \ + $(NULL) + +LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x + +LXC_DRIVER_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + lxc/lxc_conf.c \ + lxc/lxc_conf.h \ + lxc/lxc_container.c \ + lxc/lxc_container.h \ + lxc/lxc_cgroup.c \ + lxc/lxc_cgroup.h \ + lxc/lxc_domain.c \ + lxc/lxc_domain.h \ + lxc/lxc_hostdev.c \ + lxc/lxc_hostdev.h \ + lxc/lxc_monitor.c \ + lxc/lxc_monitor.h \ + lxc/lxc_process.c \ + lxc/lxc_process.h \ + lxc/lxc_fuse.c \ + lxc/lxc_fuse.h \ + lxc/lxc_native.c \ + lxc/lxc_native.h \ + lxc/lxc_driver.c \ + lxc/lxc_driver.h \ + $(NULL) + +LXC_CONTROLLER_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_CONTROLLER_GENERATED) \ + lxc/lxc_conf.c \ + lxc/lxc_conf.h \ + lxc/lxc_container.c \ + lxc/lxc_container.h \ + lxc/lxc_cgroup.c \ + lxc/lxc_cgroup.h \ + lxc/lxc_domain.c \ + lxc/lxc_domain.h \ + lxc/lxc_fuse.c \ + lxc/lxc_fuse.h \ + lxc/lxc_controller.c \ + $(NULL) + + +DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) +EXTRA_DIST +=3D \ + $(LXC_DRIVER_SOURCES) \ + $(LXC_MONITOR_PROTOCOL) \ + $(LXC_GENERATED) \ + $(LXC_CONTROLLER_SOURCES) \ + $(NULL) + +BUILT_SOURCES +=3D $(LXC_GENERATED) +CLEANFILES +=3D $(LXC_GENERATED) + + +if WITH_LXC + +noinst_LTLIBRARIES +=3D libvirt_driver_lxc_impl.la +libvirt_driver_lxc_la_SOURCES =3D +libvirt_driver_lxc_la_LIBADD =3D \ + libvirt_driver_lxc_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_lxc.la +libvirt_driver_lxc_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_lxc_impl_la_CFLAGS =3D \ + $(LIBNL_CFLAGS) \ + $(FUSE_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_lxc_impl_la_LIBADD =3D \ + $(CAPNG_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBXML_LIBS) \ + $(FUSE_LIBS) \ + $(NULL) + +if WITH_BLKID +libvirt_driver_lxc_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) +libvirt_driver_lxc_impl_la_LIBADD +=3D $(BLKID_LIBS) +endif WITH_BLKID +libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) +libvirt_driver_lxc_impl_la_SOURCES =3D $(LXC_DRIVER_SOURCES) + +libexec_PROGRAMS +=3D libvirt_lxc + +libvirt_lxc_SOURCES =3D \ + $(LXC_CONTROLLER_SOURCES) \ + $(DATATYPES_SOURCES) \ + $(NULL) +libvirt_lxc_LDFLAGS =3D \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(CAPNG_LIBS) \ + $(LIBXML_LIBS) \ + $(NULL) +libvirt_lxc_LDADD =3D \ + $(FUSE_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +if WITH_DTRACE_PROBES +libvirt_lxc_LDADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES +libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) +libvirt_lxc_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(CAPNG_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(FUSE_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +if WITH_BLKID +libvirt_lxc_CFLAGS +=3D $(BLKID_CFLAGS) +libvirt_lxc_LDADD +=3D $(BLKID_LIBS) +endif WITH_BLKID +libvirt_lxc_CFLAGS +=3D $(SECDRIVER_CFLAGS) + + +if WITH_DTRACE_PROBES +RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x +endif + +conf_DATA +=3D lxc/lxc.conf + +augeas_DATA +=3D lxc/libvirtd_lxc.aug +augeastest_DATA +=3D test_libvirtd_lxc.aug +CLEANFILES +=3D test_libvirtd_lxc.aug + +AUGEAS_DIRS +=3D lxc + +test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ + $(srcdir)/lxc/lxc.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@ + +check-augeas-lxc: test_libvirtd_lxc.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \ + fi + +INSTALL_DATA_DIRS +=3D lxc + +install-data-lxc: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" + +uninstall-data-lxc: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: + +endif WITH_LXC + +lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_MONITOR_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ + virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ + $(srcdir)/lxc/lxc_monitor_dispatch.h + +lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ + virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ + $(srcdir)/lxc/lxc_controller_dispatch.h + +.PHONY: \ + check-agueas-lxc \ + install-data-lxc \ + uninstall-data-lxc \ + $(NULL) + +EXTRA_DIST +=3D \ + lxc/lxc.conf \ + lxc/libvirtd_lxc.aug \ + lxc/test_libvirtd_lxc.aug.in \ + $(NULL) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list