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

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>

diff --git a/src/Makefile.am b/src/Makefile.am
index e646e954a4b75c9e39328bf8dcaf9967ca2d228c..17f84402a8c12f772b479efbd73005f4e139adc2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -421,7 +421,8 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA)
        fi
 .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)
 
 
 #

diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index a881a83c564bd140b1dd866f215bf608ca9576ed..96ae2f5044aba0a8224577d1c95ce6b9a8851b29 100644 (file)
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -78,7 +78,7 @@ bhyve/virtbhyved.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \
@@ -92,7 +92,7 @@ augeas_DATA += bhyve/libvirtd_bhyve.aug
 augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
 
 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 $< > $@
 
 endif WITH_BHYVE

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 643e041232fc4442467b93b8b1ca78d00be49f69..780b2277bacc9af1dd9fdc48aca8245c962faead 100644 (file)
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -98,7 +98,7 @@ interface/virtinterfaced.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 49c6b4b12fe24e7fd580bc0d514b7d831a24fcb3..ef8e9613f57031a59dc65103baa618d06fd059b5 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -112,7 +112,7 @@ libxl/virtxend.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \
@@ -126,7 +126,7 @@ augeas_DATA += libxl/libvirtd_libxl.aug
 augeastest_DATA += libxl/test_libvirtd_libxl.aug
 
 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 $< > $@
 
 INSTALL_DATA_DIRS += libxl

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 207aa9d7ef15d06a60c963e77c691c1dfc28117a..eccf7c3a4de45f0adbe3c3d9ba773d4630c0e5c1 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -226,7 +226,7 @@ endif WITH_SANLOCK
 if WITH_SANLOCK
 if WITH_QEMU
 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 $< > $@
 
 endif WITH_QEMU
@@ -234,12 +234,12 @@ endif WITH_SANLOCK
 
 if WITH_QEMU
 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 $< > $@
 endif WITH_QEMU
 
 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 $< > $@
 
 endif WITH_LIBVIRTD

diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index d7cb22f8bc24ffb32e0d2c14cbded9e6417f3150..74e94636a646915eb67c62e76fc9953a3b48e79d 100644 (file)
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -102,7 +102,7 @@ augeas_DATA += logging/virtlogd.aug
 augeastest_DATA += logging/test_virtlogd.aug
 
 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 $< > $@
 
 endif WITH_LIBVIRTD

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 0b8d4e52732d7a4505ca2f3f08988efc4891e0ea..b6db70af7d1cb64f2784e4a527b127a26436f28f 100644 (file)
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -165,7 +165,7 @@ lxc/virtlxcd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \
@@ -226,7 +226,7 @@ augeas_DATA += lxc/libvirtd_lxc.aug
 augeastest_DATA += lxc/test_libvirtd_lxc.aug
 
 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 $< > $@
 
 INSTALL_DATA_DIRS += lxc

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 6a1bea7aedd2d507ba60c32a7fa55c6c7b1e3d96..b58b5ea645dba9f6a276d50ea155cfea69858f92 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -105,7 +105,7 @@ network/virtnetworkd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 9e07bae83905a7cc486dad86a65a75e98e2a4032..9b58636a0c52f01b3758fd7da26ca13344b1c90e 100644 (file)
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -123,7 +123,7 @@ node_device/virtnodedevd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index ceba8558fba9a240dfb3b58c11285f0806f060cd..e24e8aa2a03e418441f08bd1bbaf8b458c1f7e29 100644 (file)
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -106,7 +106,7 @@ nwfilter/virtnwfilterd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index e66da76c0abe650c3401a4b5a9d529c4e4acfff2..2074a5f54f4b4ec60f80e64db29af4736eb9b12f 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -178,7 +178,7 @@ qemu/virtqemud.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \
@@ -193,7 +193,7 @@ augeas_DATA += qemu/libvirtd_qemu.aug
 augeastest_DATA += qemu/test_libvirtd_qemu.aug
 
 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 $< > $@
 
 INSTALL_DATA_DIRS += qemu

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index ae11e6592dea0a6a4f85db9f918dd6c1ea593655..071d19d26a901297fd18710d2ab9ce647d3f1c5b 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -287,7 +287,7 @@ remote/virtproxyd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \
@@ -300,7 +300,7 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
                > $@ || rm -f $@
 
 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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 41a5e23da2337d3a4a0dfc3f982bc01916be4289..fd7c90a1376da610a1a0985639d3a06f5852728a 100644 (file)
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -94,7 +94,7 @@ secret/virtsecretd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 6d5093b6a061d938a47bb83534e4b203d12e6a4e..08a9f4e86c777aca6f383929d7cbb9c9ef297c51 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -198,7 +198,7 @@ storage/virtstoraged.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 35e370ac32c24e74169439761d62fd834cf6bc64..346a84429bc1ce5f08e8d10a67926e66f952c12f 100644 (file)
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -118,7 +118,7 @@ vbox/virtvboxd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \

diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index 63fe28be372b644d186c1502abed4c81c5b69efc..c5bef04088f7d0256b15f8634bfb291cd70a972f 100644 (file)
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -92,7 +92,7 @@ vz/virtvzd.aug: remote/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 \
                $(srcdir)/remote/test_libvirtd.aug.in | \
                $(SED) \