7:13 a.m.
Adds $(AM_V_GEN) to many more manual makefile.am rules that
were generating files
---
daemon/Makefile.am | 28 ++++++++++++++--------------
src/Makefile.am | 18 +++++++++---------
tools/Makefile.am | 40 ++++++++++++++++++++--------------------
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e117b97..a82e9a9 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -172,16 +172,16 @@ remote.c: remote_dispatch_prototypes.h \
REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
- perl -w $(srcdir)/remote_generate_stubs.pl -p $(REMOTE_PROTOCOL) > $@
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -p $(REMOTE_PROTOCOL) > $@
remote_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
- perl -w $(srcdir)/remote_generate_stubs.pl -t $(REMOTE_PROTOCOL) > $@
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -t $(REMOTE_PROTOCOL) > $@
remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
- perl -w $(srcdir)/remote_generate_stubs.pl -a $(REMOTE_PROTOCOL) > $@
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -a $(REMOTE_PROTOCOL) > $@
remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
- perl -w $(srcdir)/remote_generate_stubs.pl -r $(REMOTE_PROTOCOL) > $@
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -r $(REMOTE_PROTOCOL) > $@
LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
libvirtd.uml.logrotate
@@ -195,16 +195,16 @@ libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
mv $@-t $@
libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
- sed \
+ $(AM_V_GEN)sed \
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
- < $< > $@-t
- mv $@-t $@
+ < $< > $@-t && \
+ mv $@-t $@
libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
- sed \
+ $(AM_V_GEN)sed \
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
- < $< > $@-t
- mv $@-t $@
+ < $< > $@-t && \
+ mv $@-t $@
install-logrotate: $(LOGROTATE_CONFS)
mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
@@ -231,13 +231,13 @@ uninstall-init:
BUILT_SOURCES += libvirtd.init
libvirtd.init: libvirtd.init.in
- sed \
+ $(AM_V_GEN)sed \
-e s!\@localstatedir\@!@localstatedir@!g \
-e s!\@sbindir\@!@sbindir@!g \
-e s!\@sysconfdir\@!@sysconfdir@!g \
- < $< > $@-t
- chmod a+x $@-t
- mv $@-t $@
+ < $< > $@-t && \
+ chmod a+x $@-t && \
+ mv $@-t $@
check-local:
test -x '$(AUGPARSE)' \
diff --git a/src/Makefile.am b/src/Makefile.am
index c661a5c..cc0a7d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -870,17 +870,17 @@ EXTRA_DIST += \
BUILT_SOURCES = libvirt.syms
libvirt.syms: libvirt_public.syms $(USED_SYM_FILES)
- rm -f $@-tmp $@
- printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp
- cat $(srcdir)/libvirt_public.syms >>$@-tmp
- printf '\n\n# Private symbols\n\n' >>$@-tmp
- printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp
- printf 'global:\n\n' >>$@-tmp
+ $(AM_V_GEN)rm -f $@-tmp $@ ; \
+ printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp
&& \
+ cat $(srcdir)/libvirt_public.syms >>$@-tmp && \
+ printf '\n\n# Private symbols\n\n' >>$@-tmp && \
+ printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \
+ printf 'global:\n\n' >>$@-tmp && \
for file in $(USED_SYM_FILES); do \
cat $(srcdir)/$$file >>$@-tmp; \
- done
- printf '\n\nlocal:\n*;\n\n};' >>$@-tmp
- chmod a-w $@-tmp
+ done && \
+ printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \
+ chmod a-w $@-tmp && \
mv $@-tmp libvirt.syms
# Empty source list - it merely links a bunch of convenience libs together
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 46107f6..33a3216 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,18 +17,18 @@ man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1
virt-xml-validate: virt-xml-validate.in Makefile
- sed -e 's,@SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ || (rm $@
&& exit 1)
- chmod +x $@
+ $(AM_V_GEN)sed -e 's,@SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \
+ || (rm $@ && exit 1) && chmod +x $@
virt-xml-validate.1: virt-xml-validate
- $(POD2MAN) $< $@
+ $(AM_V_GEN)$(POD2MAN) $< $@
virt-pki-validate: virt-pki-validate.in Makefile
- sed -e 's,@SYSCONFDIR@,$(sysconfdir),' < $< > $@ || (rm $@ &&
exit 1)
- chmod +x $@
+ $(AM_V_GEN)sed -e 's,@SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
+ || (rm $@ && exit 1) && chmod +x $@
virt-pki-validate.1: virt-pki-validate
- $(POD2MAN) $< $@
+ $(AM_V_GEN)$(POD2MAN) $< $@
virsh_SOURCES = \
console.c console.h \
@@ -55,24 +55,24 @@ virsh_CFLAGS = \
BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c
virsh-net-edit.c: virsh.c Makefile.am
- rm -f $@-tmp
- echo '/* Automatically generated from: $^ */' > $@-tmp
- echo 'static int' >> $@-tmp
+ $(AM_V_GEN)rm -f $@-tmp && \
+ echo '/* Automatically generated from: $^ */' > $@-tmp && \
+ echo 'static int' >> $@-tmp && \
awk '/^cmdEdit/, /^}/' $< \
| sed -e 's/domain/network/g' \
-e 's/Domain/Network/g' \
-e 's/cmdEdit/cmdNetworkEdit/g' \
-e 's/dom/network/g' \
-e 's/int flags.*/int flags = 0;/g' \
- >> $@-tmp
- chmod a-w $@-tmp
- rm -f $@
+ >> $@-tmp && \
+ chmod a-w $@-tmp && \
+ rm -f $@ && \
mv $@-tmp $@
virsh-pool-edit.c: virsh.c Makefile.am
- rm -f $@-tmp
- echo '/* Automatically generated from: $^ */' > $@-tmp
- echo 'static int' >> $@-tmp
+ $(AM_V_GEN)rm -f $@-tmp && \
+ echo '/* Automatically generated from: $^ */' > $@-tmp && \
+ echo 'static int' >> $@-tmp && \
awk '/^cmdEdit/, /^}/' $< \
| sed -e 's/domain/pool/g' \
-e 's/vshCommandOptDomain/vshCommandOptPool/g' \
@@ -83,9 +83,9 @@ virsh-pool-edit.c: virsh.c Makefile.am
-e 's/\(virStoragePoolDefineXML.*\));/\1, 0);/' \
-e 's/dom/pool/g' \
-e 's/int flags.*/int flags = 0;/g' \
- >> $@-tmp
- chmod a-w $@-tmp
- rm -f $@
+ >> $@-tmp && \
+ chmod a-w $@-tmp && \
+ rm -f $@ && \
mv $@-tmp $@
@@ -110,13 +110,13 @@ virsh_LDADD += virsh_win_icon.$(OBJEXT)
# information is needed in this area.
virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
- $(WINDRES) \
+ $(AM_V_GEN)$(WINDRES) \
--input-format rc --input $< \
--output-format coff --output $@
endif
virsh.1: virsh.pod
- $(POD2MAN) $< $@
+ $(AM_V_GEN)$(POD2MAN) $< $@
CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)
--
1.6.2.5