From nobody Wed May 14 18:29:52 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 1519812898911728.6485986086815; Wed, 28 Feb 2018 02:14:58 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABC515F73A; Wed, 28 Feb 2018 10:14:57 +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 84BE9620C8; Wed, 28 Feb 2018 10:14:57 +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 4B4614A47C; Wed, 28 Feb 2018 10:14:57 +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 w1SAEn4c005669 for ; Wed, 28 Feb 2018 05:14:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69AB62024CA8; Wed, 28 Feb 2018 10:14:49 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE0F5202699A; Wed, 28 Feb 2018 10:14:48 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:31 +0000 Message-Id: <20180228101435.464-14-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 13/17] make: split lock daemon build rules into locking/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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 28 Feb 2018 10:14:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 316 +---------------------------------------= --- src/locking/Makefile.inc.am | 321 ++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 325 insertions(+), 312 deletions(-) create mode 100644 src/locking/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index c59faf9aeb..a45f9df894 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,6 +97,7 @@ include cpu/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am +include locking/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -353,57 +354,8 @@ DRIVER_SOURCES +=3D \ libvirt-secret.c \ libvirt-storage.c \ libvirt-stream.c \ - locking/lock_manager.c locking/lock_manager.h \ - locking/lock_driver.h \ - locking/lock_driver_nop.h locking/lock_driver_nop.c \ - locking/domain_lock.h locking/domain_lock.c \ $(NULL) =20 -LOCK_DRIVER_SANLOCK_SOURCES =3D \ - locking/lock_driver_sanlock.c - -LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ - locking/sanlock_helper.c - -LOCK_PROTOCOL_GENERATED =3D \ - locking/lock_protocol.h \ - locking/lock_protocol.c \ - $(NULL) - -LOCK_PROTOCOL =3D $(srcdir)/locking/lock_protocol.x -EXTRA_DIST +=3D $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) -BUILT_SOURCES +=3D $(LOCK_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES +=3D $(LOCK_PROTOCOL_GENERATED) - -LOCK_DAEMON_GENERATED =3D \ - locking/lock_daemon_dispatch_stubs.h - $(NULL) - -BUILT_SOURCES +=3D $(LOCK_DAEMON_GENERATED) -EXTRA_DIST +=3D $(LOCK_DAEMON_GENERATED) -MAINTAINERCLEANFILES +=3D $(LOCK_DAEMON_GENERATED) - -LOCK_DRIVER_LOCKD_SOURCES =3D \ - locking/lock_driver_lockd.c \ - locking/lock_driver_lockd.h \ - $(NULL) - -LOCK_DAEMON_SOURCES =3D \ - locking/lock_daemon.h \ - locking/lock_daemon.c \ - locking/lock_daemon_config.h \ - locking/lock_daemon_config.c \ - locking/lock_daemon_dispatch.c \ - locking/lock_daemon_dispatch.h \ - $(NULL) - -locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ - $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h - =20 =20 ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x @@ -683,58 +635,12 @@ GENERATED_SYM_FILES +=3D \ =20 check-local: check-augeas =20 -.PHONY: check-augeas \ - check-augeas-sanlock \ - check-augeas-lockd \ - $(NULL) - -check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%) \ - check-augeas-sanlock \ - check-augeas-lockd check-augeas-virtlockd +check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%) =20 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST +=3D $(top_srcdir)/build-aux/augeas-gentest.pl =20 =20 -if WITH_SANLOCK -test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ - locking/qemu-sanlock.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ - -check-augeas-sanlock: test_libvirt_sanlock.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ - fi -else ! WITH_SANLOCK -check-augeas-sanlock: -endif ! WITH_SANLOCK - -if WITH_QEMU -test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ - locking/qemu-lockd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ -else ! WITH_QEMU -test_libvirt_lockd.aug: -endif ! WITH_QEMU - -test_virtlockd.aug: locking/test_virtlockd.aug.in \ - locking/virtlockd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@ - -if WITH_QEMU -check-augeas-lockd: test_libvirt_lockd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ - fi -else ! WITH_QEMU -check-augeas-lockd: -endif ! WITH_QEMU - -check-augeas-virtlockd: test_virtlockd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ - fi - # # Build our version script. This is composed of three parts: # @@ -974,7 +880,6 @@ RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ $(srcdir)/remote/remote_protocol.x \ $(srcdir)/remote/lxc_protocol.x \ $(srcdir)/remote/qemu_protocol.x \ - $(srcdir)/locking/lock_protocol.x \ $(srcdir)/admin/admin_protocol.x =20 libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl @@ -1104,89 +1009,7 @@ libvirt_setuid_rpc_client_la_CFLAGS =3D \ $(NULL) endif WITH_SETUID_RPC_CLIENT =20 -lockdriverdir =3D $(libdir)/libvirt/lock-driver -lockdriver_LTLIBRARIES =3D - -if WITH_LIBVIRTD -lockdriver_LTLIBRARIES +=3D lockd.la -lockd_la_SOURCES =3D \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(NULL) -lockd_la_CFLAGS =3D -I$(srcdir)/conf \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -lockd_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la -augeas_DATA +=3D locking/libvirt_lockd.aug -if WITH_DTRACE_PROBES -lockd_la_LIBADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES -if WITH_QEMU -augeastest_DATA +=3D test_libvirt_lockd.aug -CLEANFILES +=3D test_libvirt_lockd.aug -nodist_conf_DATA +=3D locking/qemu-lockd.conf -BUILT_SOURCES +=3D locking/qemu-lockd.conf -DISTCLEANFILES +=3D locking/qemu-lockd.conf -endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-lockd.conf -BUILT_SOURCES +=3D locking/libxl-lockd.conf -DISTCLEANFILES +=3D locking/libxl-lockd.conf -endif WITH_LIBXL - -locking/%-lockd.conf: $(srcdir)/locking/lockd.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - - -sbin_PROGRAMS +=3D virtlockd - -virtlockd_SOURCES =3D \ - $(LOCK_DAEMON_SOURCES) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) -virtlockd_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlockd_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlockd_LDADD =3D \ - libvirt_driver_admin.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc.la \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la \ - $(CYGWIN_EXTRA_LIBADD) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlockd_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - - - -else ! WITH_LIBVIRTD -EXTRA_DIST +=3D $(LOCK_DAEMON_SOURCES) \ - $(LOCK_DRIVER_LOCKD_SOURCES) -endif ! WITH_LIBVIRTD - -SYSCONF_FILES +=3D \ - locking/virtlockd.sysconf \ - $(NULL) - -EXTRA_DIST +=3D \ - locking/lockd.conf \ - locking/libvirt_lockd.aug \ - locking/test_libvirt_lockd.aug.in \ - $(SYSCONF_FILES) \ - $(NULL) +EXTRA_DIST +=3D $(SYSCONF_FILES) =20 install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig @@ -1264,26 +1087,6 @@ uninstall-init:: endif ! LIBVIRT_INIT_SCRIPT_RED_HAT =20 =20 -virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - -virtlockd.8.in: locking/virtlockd.pod - $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - - %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ @@ -1291,37 +1094,11 @@ virtlockd.8.in: locking/virtlockd.pod < $< > $@-t && \ mv $@-t $@ =20 -if WITH_LIBVIRTD -man8_MANS +=3D virtlockd.8 - -conf_DATA +=3D locking/virtlockd.conf - -augeas_DATA +=3D locking/virtlockd.aug -augeastest_DATA +=3D test_virtlockd.aug -endif WITH_LIBVIRTD - -PODFILES +=3D \ - locking/virtlockd.pod \ - $(NULL) - -MANINFILES +=3D \ - virtlockd.8.in \ - $(NULL) - -CLEANFILES +=3D test_virtlockd.aug $(man8_MANS) +CLEANFILES +=3D $(man8_MANS) MAINTAINERCLEANFILES +=3D $(MANINFILES) =20 -SYSTEMD_UNIT_FILES_IN +=3D \ - locking/virtlockd.service.in \ - locking/virtlockd.socket.in \ - locking/virtlockd-admin.socket.in \ - $(NULL) - EXTRA_DIST +=3D \ $(SYSTEMD_UNIT_FILES_IN) \ - locking/virtlockd.aug \ - locking/virtlockd.conf \ - locking/test_virtlockd.aug.in \ $(PODFILES) \ $(MANINFILES) \ $(NULL) @@ -1355,26 +1132,6 @@ install-systemd: uninstall-systemd: endif ! WITH_LIBVIRTD =20 -virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)sed \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - - =20 EXTRA_DIST +=3D $(UPSTART_FILES) =20 @@ -1406,38 +1163,6 @@ install-upstart: uninstall-upstart: endif ! WITH_LIBVIRTD =20 -if WITH_SANLOCK -lockdriver_LTLIBRARIES +=3D sanlock.la -sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS =3D -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la - -augeas_DATA +=3D locking/libvirt_sanlock.aug -augeastest_DATA +=3D test_libvirt_sanlock.aug -CLEANFILES +=3D test_libvirt_sanlock.aug - -locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - -if WITH_QEMU -nodist_conf_DATA +=3D locking/qemu-sanlock.conf -BUILT_SOURCES +=3D locking/qemu-sanlock.conf -DISTCLEANFILES +=3D locking/qemu-sanlock.conf -endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-sanlock.conf -BUILT_SOURCES +=3D locking/libxl-sanlock.conf -DISTCLEANFILES +=3D locking/libxl-sanlock.conf -endif WITH_LIBXL -else ! WITH_SANLOCK -EXTRA_DIST +=3D $(LOCK_DRIVER_SANLOCK_SOURCES) -endif ! WITH_SANLOCK -EXTRA_DIST +=3D locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug.in =20 noinst_LTLIBRARIES +=3D \ libvirt-net-rpc.la \ @@ -1570,23 +1295,6 @@ libvirt_iohelper_CFLAGS =3D \ endif WITH_LIBVIRTD =20 =20 -if WITH_SANLOCK -libexec_PROGRAMS +=3D libvirt_sanlock_helper - -libvirt_sanlock_helper_SOURCES =3D $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) -libvirt_sanlock_helper_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDADD =3D libvirt.la -endif WITH_SANLOCK - - =20 if WITH_NSS noinst_LTLIBRARIES +=3D libvirt-nss.la @@ -1660,34 +1368,18 @@ endif WITH_NSS install-data-local: install-init install-systemd install-upstart \ install-sysctl install-polkit install-sasl \ install-logrotate $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) -if WITH_LIBVIRTD - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" -endif WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" -if WITH_SANLOCK - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" -endif WITH_SANLOCK =20 uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ uninstall-logrotate $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) -if WITH_LIBVIRTD - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: -endif WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: -if WITH_SANLOCK - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: -endif WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: =20 CLEANFILES +=3D *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am new file mode 100644 index 0000000000..649c769e00 --- /dev/null +++ b/src/locking/Makefile.inc.am @@ -0,0 +1,321 @@ +DRIVER_SOURCES +=3D \ + locking/lock_manager.c \ + locking/lock_manager.h \ + locking/lock_driver.h \ + locking/lock_driver_nop.h \ + locking/lock_driver_nop.c \ + locking/domain_lock.h \ + locking/domain_lock.c \ + $(NULL) + +LOCK_DRIVER_SANLOCK_SOURCES =3D \ + locking/lock_driver_sanlock.c + +LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ + locking/sanlock_helper.c + +LOCK_PROTOCOL_GENERATED =3D \ + locking/lock_protocol.h \ + locking/lock_protocol.c \ + $(NULL) + +LOCK_DAEMON_GENERATED =3D \ + locking/lock_daemon_dispatch_stubs.h + $(NULL) + +LOCK_PROTOCOL =3D $(srcdir)/locking/lock_protocol.x + +LOCK_DRIVER_LOCKD_SOURCES =3D \ + locking/lock_driver_lockd.c \ + locking/lock_driver_lockd.h \ + $(NULL) + +LOCK_DAEMON_SOURCES =3D \ + locking/lock_daemon.h \ + locking/lock_daemon.c \ + locking/lock_daemon_config.h \ + locking/lock_daemon_config.c \ + locking/lock_daemon_dispatch.c \ + locking/lock_daemon_dispatch.h \ + $(NULL) + +EXTRA_DIST +=3D \ + $(LOCK_PROTOCOL) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(LOCK_DAEMON_SOURCES) \ + $(LOCK_DRIVER_LOCKD_SOURCES) \ + locking/sanlock.conf \ + locking/libvirt_sanlock.aug \ + locking/test_libvirt_sanlock.aug.in \ + locking/lockd.conf \ + locking/libvirt_lockd.aug \ + locking/test_libvirt_lockd.aug.in \ + locking/virtlockd.aug \ + locking/virtlockd.conf \ + locking/test_virtlockd.aug.in \ + $(NULL) + +BUILT_SOURCES +=3D \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) + +MAINTAINERCLEANFILES +=3D \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) + +RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x +SYSCONF_FILES +=3D locking/virtlockd.sysconf + +PODFILES +=3D locking/virtlockd.pod +MANINFILES +=3D virtlockd.8.in + +CLEANFILES +=3D test_virtlockd.aug $(man8_MANS) +MAINTAINERCLEANFILES +=3D $(MANINFILES) + +SYSTEMD_UNIT_FILES_IN +=3D \ + locking/virtlockd.service.in \ + locking/virtlockd.socket.in \ + locking/virtlockd-admin.socket.in \ + $(NULL) + +lockdriverdir =3D $(libdir)/libvirt/lock-driver +lockdriver_LTLIBRARIES =3D + +if WITH_LIBVIRTD +lockdriver_LTLIBRARIES +=3D lockd.la +lockd_la_SOURCES =3D \ + $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(NULL) +lockd_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +lockd_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +augeas_DATA +=3D locking/libvirt_lockd.aug +if WITH_DTRACE_PROBES +lockd_la_LIBADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES + +if WITH_QEMU +augeastest_DATA +=3D test_libvirt_lockd.aug +CLEANFILES +=3D test_libvirt_lockd.aug +nodist_conf_DATA +=3D locking/qemu-lockd.conf +BUILT_SOURCES +=3D locking/qemu-lockd.conf +DISTCLEANFILES +=3D locking/qemu-lockd.conf +endif WITH_QEMU + +if WITH_LIBXL +nodist_conf_DATA +=3D locking/libxl-lockd.conf +BUILT_SOURCES +=3D locking/libxl-lockd.conf +DISTCLEANFILES +=3D locking/libxl-lockd.conf +endif WITH_LIBXL + +sbin_PROGRAMS +=3D virtlockd + +virtlockd_SOURCES =3D \ + $(LOCK_DAEMON_SOURCES) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) +virtlockd_CFLAGS =3D \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +virtlockd_LDFLAGS =3D \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) +virtlockd_LDADD =3D \ + libvirt_driver_admin.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc.la \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la \ + $(CYGWIN_EXTRA_LIBADD) \ + $(NULL) +if WITH_DTRACE_PROBES +virtlockd_LDADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES + +if WITH_SANLOCK +lockdriver_LTLIBRARIES +=3D sanlock.la +sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) +sanlock_la_CFLAGS =3D -I$(srcdir)/conf $(AM_CFLAGS) +sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la + +augeas_DATA +=3D locking/libvirt_sanlock.aug +augeastest_DATA +=3D test_libvirt_sanlock.aug +CLEANFILES +=3D test_libvirt_sanlock.aug + +if WITH_QEMU +nodist_conf_DATA +=3D locking/qemu-sanlock.conf +BUILT_SOURCES +=3D locking/qemu-sanlock.conf +DISTCLEANFILES +=3D locking/qemu-sanlock.conf +endif WITH_QEMU + +if WITH_LIBXL +nodist_conf_DATA +=3D locking/libxl-sanlock.conf +BUILT_SOURCES +=3D locking/libxl-sanlock.conf +DISTCLEANFILES +=3D locking/libxl-sanlock.conf +endif WITH_LIBXL + +libexec_PROGRAMS +=3D libvirt_sanlock_helper + +libvirt_sanlock_helper_SOURCES =3D $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) +libvirt_sanlock_helper_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +libvirt_sanlock_helper_LDFLAGS =3D \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +libvirt_sanlock_helper_LDADD =3D libvirt.la +endif WITH_SANLOCK + +man8_MANS +=3D virtlockd.8 + +conf_DATA +=3D locking/virtlockd.conf + +augeas_DATA +=3D locking/virtlockd.aug +augeastest_DATA +=3D test_virtlockd.aug + + +INSTALL_DATA_DIRS +=3D locking + +install-data-locking: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" +if WITH_SANLOCK + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" +endif WITH_SANLOCK + +uninstall-data-locking: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: +if WITH_SANLOCK + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: +endif WITH_SANLOCK + +if WITH_SANLOCK +test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ + locking/qemu-sanlock.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ + +check-augeas-sanlock: test_libvirt_sanlock.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ + fi +else ! WITH_SANLOCK +check-augeas-sanlock: +endif ! WITH_SANLOCK + +if WITH_QEMU +test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ + locking/qemu-lockd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ +else ! WITH_QEMU +test_libvirt_lockd.aug: +endif ! WITH_QEMU + +test_virtlockd.aug: locking/test_virtlockd.aug.in \ + locking/virtlockd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@ + +if WITH_QEMU +check-augeas-lockd: test_libvirt_lockd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ + fi +else ! WITH_QEMU +check-augeas-lockd: +endif ! WITH_QEMU + +check-augeas-virtlockd: test_virtlockd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + fi + +AUGEAS_DIRS +=3D locking + +check-augeas-locking: check-augeas-virtlockd check-augeas-lockd check-auge= as-sanlock + +endif WITH_LIBVIRTD + +.PHONY: \ + install-data-locking \ + uninstall-data-locking \ + check-augeas-locking \ + check-augeas-virtlockd \ + check-augeas-lockd \ + check-augeas-sanlock \ + $(NULL) + +locking/%-lockd.conf: $(srcdir)/locking/lockd.conf + $(AM_V_GEN)$(MKDIR_P) locking ; \ + cp $< $@ + +locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf + $(AM_V_GEN)$(MKDIR_P) locking ; \ + cp $< $@ + + +locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ + $(srcdir)/rpc/gendispatch.pl Makefile.am + $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ + virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ + $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h + + +virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus + $(AM_V_GEN)sed \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ + $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ + +virtlockd.8.in: locking/virtlockd.pod + $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list