[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCHv2] build: simplify sanlock distribution



EXTRA_DIST files should unconditionally be part of the tarball,
rather than depending on the presence of sanlock-devel.

Meanwhile, parallel builds could fail if we don't use mkdir -p.

* src/Makefile.am (EXTRA_DIST): Always ship sanlock .aug and
template .conf files.
(%-sanlock.conf): Use MKDIR_P.
---
 src/Makefile.am |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8f99cc2..956bc0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1186,6 +1186,10 @@ libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
 EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)


+EXTRA_DIST += locking/sanlock.conf \
+    locking/libvirt_sanlock.aug \
+    locking/test_libvirt_sanlock.aug
+
 if HAVE_SANLOCK
 lockdriverdir = $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES = sanlock.la
@@ -1199,12 +1203,8 @@ sanlock_la_LIBADD = -lsanlock \
 augeas_DATA += locking/libvirt_sanlock.aug
 augeastest_DATA += locking/test_libvirt_sanlock.aug

-EXTRA_DIST += locking/sanlock.conf \
-    locking/libvirt_sanlock.aug \
-    locking/test_libvirt_sanlock.aug
-
 $(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
-	$(AM_V_GEN)mkdir locking ; \
+	$(AM_V_GEN)$(MKDIR_P) locking ; \
 	cp $< $@

 if WITH_QEMU
@@ -1212,7 +1212,7 @@ conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
 endif
 else
-EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) locking/sanlock.conf
+EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
 endif

 noinst_LTLIBRARIES += libvirt-net-rpc.la libvirt-net-rpc-server.la libvirt-net-rpc-client.la
-- 
1.7.4.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]