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: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>

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)
 
 
 #

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

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) \

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

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

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

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

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) \

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) \

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) \

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

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) \

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) \

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) \

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) \

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) \