External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

build: simplify sanlock distribution

Browse Source 
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.
This commit is contained in:
Eric Blake 2011-06-29 09:24:12 -06:00
parent addaa5374c
commit bf8fba1e75
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Makefile.am
View File

@ -1185,7 +1185,6 @@ libvirt_qemu_la_CFLAGS = $(AM_CFLAGS)
libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE) EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)
if HAVE_SANLOCK if HAVE_SANLOCK
lockdriverdir = $(libdir)/libvirt/lock-driver lockdriverdir = $(libdir)/libvirt/lock-driver
lockdriver_LTLIBRARIES = sanlock.la lockdriver_LTLIBRARIES = sanlock.la
@ -1199,12 +1198,8 @@ sanlock_la_LIBADD = -lsanlock \
augeas_DATA += locking/libvirt_sanlock.aug augeas_DATA += locking/libvirt_sanlock.aug
augeastest_DATA += locking/test_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 $(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
$(AM_V_GEN)mkdir locking ; \ $(AM_V_GEN)$(MKDIR_P) locking ; \
cp $< $@ cp $< $@
if WITH_QEMU if WITH_QEMU
@ -1212,10 +1207,16 @@ conf_DATA += locking/qemu-sanlock.conf
BUILT_SOURCES += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf
endif endif
else else
EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) locking/sanlock.conf EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
endif endif
EXTRA_DIST += locking/sanlock.conf \
locking/libvirt_sanlock.aug \
locking/test_libvirt_sanlock.aug
noinst_LTLIBRARIES += libvirt-net-rpc.la libvirt-net-rpc-server.la libvirt-net-rpc-client.la noinst_LTLIBRARIES += \
libvirt-net-rpc.la \
libvirt-net-rpc-server.la \
libvirt-net-rpc-client.la
EXTRA_DIST += \ EXTRA_DIST += \
rpc/virnetprotocol.x \ rpc/virnetprotocol.x \