External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix use of $(AUG_GENTEST) as a dependency

Browse Source 
The use of $(AUG_GENTEST) as a dependency in the makefiles is
a problem because this was assumed to be the filename of the
script, but is in fact a full shell command line.

Split it into two variables, so it can be correctly used for
dependencies.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-09-27 14:17:54 +01:00
parent c2219efd06
commit b36b20a1b3
16 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -421,7 +421,8 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA)
fi fi
.PHONY: check-augeas .PHONY: check-augeas
AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl AUG_GENTEST_SCRIPT = $(top_srcdir)/build-aux/augeas-gentest.pl
AUG_GENTEST = $(PERL) $(AUG_GENTEST_SCRIPT)
# #

4
src/bhyve/Makefile.inc.am
View File

@ -78,7 +78,7 @@ bhyve/virtbhyved.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
bhyve/virtbhyved.conf $(AUG_GENTEST) bhyve/virtbhyved.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \ $(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \
@ -92,7 +92,7 @@ augeas_DATA += bhyve/libvirtd_bhyve.aug
augeastest_DATA += bhyve/test_libvirtd_bhyve.aug augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
endif WITH_BHYVE endif WITH_BHYVE

2
src/interface/Makefile.inc.am
View File

@ -98,7 +98,7 @@ interface/virtinterfaced.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \ interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \
interface/virtinterfaced.conf $(AUG_GENTEST) interface/virtinterfaced.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \ $(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

4
src/libxl/Makefile.inc.am
View File

@ -112,7 +112,7 @@ libxl/virtxend.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
libxl/virtxend.conf $(AUG_GENTEST) libxl/virtxend.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \ $(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \
@ -126,7 +126,7 @@ augeas_DATA += libxl/libvirtd_libxl.aug
augeastest_DATA += libxl/test_libvirtd_libxl.aug augeastest_DATA += libxl/test_libvirtd_libxl.aug
libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
$(srcdir)/libxl/libxl.conf $(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
INSTALL_DATA_DIRS += libxl INSTALL_DATA_DIRS += libxl

6
src/locking/Makefile.inc.am
View File

@ -226,7 +226,7 @@ endif WITH_SANLOCK
if WITH_SANLOCK if WITH_SANLOCK
if WITH_QEMU if WITH_QEMU
locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
locking/qemu-sanlock.conf $(AUG_GENTEST) locking/qemu-sanlock.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
endif WITH_QEMU endif WITH_QEMU
@ -234,12 +234,12 @@ endif WITH_SANLOCK
if WITH_QEMU if WITH_QEMU
locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
locking/qemu-lockd.conf $(AUG_GENTEST) locking/qemu-lockd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
endif WITH_QEMU endif WITH_QEMU
locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \ locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
locking/virtlockd.conf $(AUG_GENTEST) locking/virtlockd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
endif WITH_LIBVIRTD endif WITH_LIBVIRTD

2
src/logging/Makefile.inc.am
View File

@ -102,7 +102,7 @@ augeas_DATA += logging/virtlogd.aug
augeastest_DATA += logging/test_virtlogd.aug augeastest_DATA += logging/test_virtlogd.aug
logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST) logging/virtlogd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
endif WITH_LIBVIRTD endif WITH_LIBVIRTD

4
src/lxc/Makefile.inc.am
View File

@ -165,7 +165,7 @@ lxc/virtlxcd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \ lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \
lxc/virtlxcd.conf $(AUG_GENTEST) lxc/virtlxcd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \ $(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \
@ -226,7 +226,7 @@ augeas_DATA += lxc/libvirtd_lxc.aug
augeastest_DATA += lxc/test_libvirtd_lxc.aug augeastest_DATA += lxc/test_libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
$(srcdir)/lxc/lxc.conf $(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
INSTALL_DATA_DIRS += lxc INSTALL_DATA_DIRS += lxc

2
src/network/Makefile.inc.am
View File

@ -105,7 +105,7 @@ network/virtnetworkd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \ network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \
network/virtnetworkd.conf $(AUG_GENTEST) network/virtnetworkd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \ $(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/node_device/Makefile.inc.am
View File

@ -123,7 +123,7 @@ node_device/virtnodedevd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \ node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \
node_device/virtnodedevd.conf $(AUG_GENTEST) node_device/virtnodedevd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \ $(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/nwfilter/Makefile.inc.am
View File

@ -106,7 +106,7 @@ nwfilter/virtnwfilterd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \ nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \
nwfilter/virtnwfilterd.conf $(AUG_GENTEST) nwfilter/virtnwfilterd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \ $(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

4
src/qemu/Makefile.inc.am
View File

@ -178,7 +178,7 @@ qemu/virtqemud.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
qemu/virtqemud.conf $(AUG_GENTEST) qemu/virtqemud.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \ $(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \
@ -193,7 +193,7 @@ augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += qemu/test_libvirtd_qemu.aug augeastest_DATA += qemu/test_libvirtd_qemu.aug
qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
$(srcdir)/qemu/qemu.conf $(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
INSTALL_DATA_DIRS += qemu INSTALL_DATA_DIRS += qemu

4
src/remote/Makefile.inc.am
View File

@ -287,7 +287,7 @@ remote/virtproxyd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
remote/libvirtd.conf $(AUG_GENTEST) remote/libvirtd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \ $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \
@ -300,7 +300,7 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
> $@ || rm -f $@ > $@ || rm -f $@
remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \ remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \
remote/virtproxyd.conf $(AUG_GENTEST) remote/virtproxyd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \ $(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/secret/Makefile.inc.am
View File

@ -94,7 +94,7 @@ secret/virtsecretd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \ secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \
secret/virtsecretd.conf $(AUG_GENTEST) secret/virtsecretd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \ $(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/storage/Makefile.inc.am
View File

@ -198,7 +198,7 @@ storage/virtstoraged.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
storage/virtstoraged.conf $(AUG_GENTEST) storage/virtstoraged.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \ $(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/vbox/Makefile.inc.am
View File

@ -118,7 +118,7 @@ vbox/virtvboxd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \ vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \
vbox/virtvboxd.conf $(AUG_GENTEST) vbox/virtvboxd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \ $(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \

2
src/vz/Makefile.inc.am
View File

@ -92,7 +92,7 @@ vz/virtvzd.aug: remote/libvirtd.aug.in
$< > $@ $< > $@
vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \ vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \
vz/virtvzd.conf $(AUG_GENTEST) vz/virtvzd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \ $(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \ $(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \ $(SED) \