[libvirt] [PATCH 08/10] daemon: move configuration files to src/remote
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
daemon/Makefile.am | 26 --------------------------
src/Makefile.am | 24 +++++++++++++++++++++++-
{daemon => src/remote}/libvirtd.aug | 0
{daemon => src/remote}/libvirtd.conf | 0
{daemon => src/remote}/test_libvirtd.aug.in | 0
5 files changed, 23 insertions(+), 27 deletions(-)
rename {daemon => src/remote}/libvirtd.aug (100%)
rename {daemon => src/remote}/libvirtd.conf (100%)
rename {daemon => src/remote}/test_libvirtd.aug.in (100%)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 70de285667..8bac9a550b 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -20,18 +20,15 @@ CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST = \
- libvirtd.conf \
libvirtd.policy.in \
libvirt.rules \
libvirtd.sasl \
libvirtd.sysctl \
- libvirtd.aug \
libvirtd.logrotate.in \
libvirtd.qemu.logrotate.in \
libvirtd.lxc.logrotate.in \
libvirtd.libxl.logrotate.in \
libvirtd.uml.logrotate.in \
- test_libvirtd.aug.in \
THREADS.txt \
$(NULL)
@@ -39,17 +36,6 @@ BUILT_SOURCES =
if WITH_LIBVIRTD
-confdir = $(sysconfdir)/libvirt/
-conf_DATA = libvirtd.conf
-
-augeasdir = $(datadir)/augeas/lenses
-augeas_DATA = libvirtd.aug
-
-augeastestsdir = $(datadir)/augeas/lenses/tests
-augeastests_DATA = test_libvirtd.aug
-
-CLEANFILES += test_libvirtd.aug
-
if WITH_POLKIT
if WITH_POLKIT0
policydir = $(datadir)/PolicyKit/policy
@@ -182,18 +168,6 @@ install-sysctl:
uninstall-sysctl:
endif ! WITH_SYSCTL
-check-local: check-augeas
-
-AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
-
-test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf
- $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@
-
-check-augeas: test_libvirtd.aug
- $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
- '$(AUGPARSE)' -I $(srcdir) test_libvirtd.aug; \
- fi
-
else ! WITH_LIBVIRTD
install-data-local: install-data-sasl
uninstall-local:: uninstall-data-sasl
diff --git a/src/Makefile.am b/src/Makefile.am
index 8988872ce3..e777fcce09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1370,6 +1370,14 @@ sbin_PROGRAMS += libvirtd
BUILT_SOURCES += $(LIBVIRTD_GENERATED)
+augeas_DATA += remote/libvirtd.aug
+
+augeastest_DATA += test_libvirtd.aug
+
+conf_DATA += remote/libvirtd.conf
+
+CLEANFILES += tets_libvirtd.aug
+
libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
libvirtd_CFLAGS = \
@@ -1411,6 +1419,7 @@ libvirtd_LDADD += \
$(NULL)
endif WITH_LIBVIRTD
+EXTRA_DIST += remote/test_libvirtd.aug.in remote/libvirtd.aug remote/libvirtd.conf
%protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
@@ -2149,11 +2158,12 @@ check-local: check-augeas
check-augeas-lockd \
check-augeas-libxl \
check-augeas-bhyve \
+ check-augeas-libvirtd \
$(NULL)
check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock \
check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \
- check-augeas-bhyve check-augeas-virtlogd
+ check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd
AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
@@ -2258,6 +2268,18 @@ check-augeas-virtlogd: test_virtlogd.aug
'$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
fi
+if WITH_LIBVIRTD
+test_libvirtd.aug: remote/test_libvirtd.aug.in \
+ remote/libvirtd.conf $(AUG_GENTEST)
+ $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< $@
+
+check-augeas-libvirtd: test_libvirtd.aug
+ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+ '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \
+ fi
+else ! WITH_LIBVIRTD
+check-augeas-libvirtd:
+endif ! WITH_LIBVIRTD
#
# Build our version script. This is composed of three parts:
#
diff --git a/daemon/libvirtd.aug b/src/remote/libvirtd.aug
similarity index 100%
rename from daemon/libvirtd.aug
rename to src/remote/libvirtd.aug
diff --git a/daemon/libvirtd.conf b/src/remote/libvirtd.conf
similarity index 100%
rename from daemon/libvirtd.conf
rename to src/remote/libvirtd.conf
diff --git a/daemon/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in
similarity index 100%
rename from daemon/test_libvirtd.aug.in
rename to src/remote/test_libvirtd.aug.in
--
2.14.3