openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Keep build quiet for generated file 

Adds $(AM_V_GEN) to many more manual makefile.am rules that
were generating files
This commit is contained in:
Daniel P. Berrange 2010-03-31 13:10:08 +01:00
parent cd2404a3c3
commit f983c32675
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon/Makefile.am
View File

@ -172,16 +172,16 @@ remote.c: remote_dispatch_prototypes.h \
REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL) 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) 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) 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) 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 \ LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
libvirtd.uml.logrotate libvirtd.uml.logrotate
@ -195,16 +195,16 @@ libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
mv $@-t $@ mv $@-t $@
libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
sed \ $(AM_V_GEN)sed \
-e 's![@]localstatedir[@]!$(localstatedir)!g' \ -e 's![@]localstatedir[@]!$(localstatedir)!g' \
< $< > $@-t < $< > $@-t && \
mv $@-t $@ mv $@-t $@
libvirtd.uml.logrotate: libvirtd.uml.logrotate.in libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
sed \ $(AM_V_GEN)sed \
-e 's![@]localstatedir[@]!$(localstatedir)!g' \ -e 's![@]localstatedir[@]!$(localstatedir)!g' \
< $< > $@-t < $< > $@-t && \
mv $@-t $@ mv $@-t $@
install-logrotate: $(LOGROTATE_CONFS) install-logrotate: $(LOGROTATE_CONFS)
mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
@ -231,13 +231,13 @@ uninstall-init:
BUILT_SOURCES += libvirtd.init BUILT_SOURCES += libvirtd.init
libvirtd.init: libvirtd.init.in libvirtd.init: libvirtd.init.in
sed \ $(AM_V_GEN)sed \
-e s!\@localstatedir\@!@localstatedir@!g \ -e s!\@localstatedir\@!@localstatedir@!g \
-e s!\@sbindir\@!@sbindir@!g \ -e s!\@sbindir\@!@sbindir@!g \
-e s!\@sysconfdir\@!@sysconfdir@!g \ -e s!\@sysconfdir\@!@sysconfdir@!g \
< $< > $@-t < $< > $@-t && \
chmod a+x $@-t chmod a+x $@-t && \
mv $@-t $@ mv $@-t $@
check-local: check-local:
test -x '$(AUGPARSE)' \ test -x '$(AUGPARSE)' \

18
src/Makefile.am
View File

@ -891,17 +891,17 @@ EXTRA_DIST += \
BUILT_SOURCES += libvirt.syms BUILT_SOURCES += libvirt.syms
libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) libvirt.syms: libvirt_public.syms $(USED_SYM_FILES)
rm -f $@-tmp $@ $(AM_V_GEN)rm -f $@-tmp $@ ; \
printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \
cat $(srcdir)/libvirt_public.syms >>$@-tmp cat $(srcdir)/libvirt_public.syms >>$@-tmp && \
printf '\n\n# Private symbols\n\n' >>$@-tmp printf '\n\n# Private symbols\n\n' >>$@-tmp && \
printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \
printf 'global:\n\n' >>$@-tmp printf 'global:\n\n' >>$@-tmp && \
for file in $(USED_SYM_FILES); do \ for file in $(USED_SYM_FILES); do \
cat $(srcdir)/$$file >>$@-tmp; \ cat $(srcdir)/$$file >>$@-tmp; \
done done && \
printf '\n\nlocal:\n*;\n\n};' >>$@-tmp printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \
chmod a-w $@-tmp chmod a-w $@-tmp && \
mv $@-tmp libvirt.syms mv $@-tmp libvirt.syms
# Empty source list - it merely links a bunch of convenience libs together # Empty source list - it merely links a bunch of convenience libs together

40
tools/Makefile.am
View File

@ -17,18 +17,18 @@ man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1
virt-xml-validate: virt-xml-validate.in Makefile virt-xml-validate: virt-xml-validate.in Makefile
sed -e 's,@SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ || (rm $@ && exit 1) $(AM_V_GEN)sed -e 's,@SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \
chmod +x $@ || (rm $@ && exit 1) && chmod +x $@
virt-xml-validate.1: virt-xml-validate virt-xml-validate.1: virt-xml-validate
$(POD2MAN) $< $@ $(AM_V_GEN)$(POD2MAN) $< $@
virt-pki-validate: virt-pki-validate.in Makefile virt-pki-validate: virt-pki-validate.in Makefile
sed -e 's,@SYSCONFDIR@,$(sysconfdir),' < $< > $@ || (rm $@ && exit 1) $(AM_V_GEN)sed -e 's,@SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
chmod +x $@ || (rm $@ && exit 1) && chmod +x $@
virt-pki-validate.1: virt-pki-validate virt-pki-validate.1: virt-pki-validate
$(POD2MAN) $< $@ $(AM_V_GEN)$(POD2MAN) $< $@
virsh_SOURCES = \ virsh_SOURCES = \
console.c console.h \ console.c console.h \
@ -55,24 +55,24 @@ virsh_CFLAGS = \
BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c
virsh-net-edit.c: virsh.c Makefile.am virsh-net-edit.c: virsh.c Makefile.am
rm -f $@-tmp $(AM_V_GEN)rm -f $@-tmp && \
echo '/* Automatically generated from: $^ */' > $@-tmp echo '/* Automatically generated from: $^ */' > $@-tmp && \
echo 'static int' >> $@-tmp echo 'static int' >> $@-tmp && \
awk '/^cmdEdit/, /^}/' $< \ awk '/^cmdEdit/, /^}/' $< \
| sed -e 's/domain/network/g' \ | sed -e 's/domain/network/g' \
-e 's/Domain/Network/g' \ -e 's/Domain/Network/g' \
-e 's/cmdEdit/cmdNetworkEdit/g' \ -e 's/cmdEdit/cmdNetworkEdit/g' \
-e 's/dom/network/g' \ -e 's/dom/network/g' \
-e 's/int flags.*/int flags = 0;/g' \ -e 's/int flags.*/int flags = 0;/g' \
>> $@-tmp >> $@-tmp && \
chmod a-w $@-tmp chmod a-w $@-tmp && \
rm -f $@ rm -f $@ && \
mv $@-tmp $@ mv $@-tmp $@
virsh-pool-edit.c: virsh.c Makefile.am virsh-pool-edit.c: virsh.c Makefile.am
rm -f $@-tmp $(AM_V_GEN)rm -f $@-tmp && \
echo '/* Automatically generated from: $^ */' > $@-tmp echo '/* Automatically generated from: $^ */' > $@-tmp && \
echo 'static int' >> $@-tmp echo 'static int' >> $@-tmp && \
awk '/^cmdEdit/, /^}/' $< \ awk '/^cmdEdit/, /^}/' $< \
| sed -e 's/domain/pool/g' \ | sed -e 's/domain/pool/g' \
-e 's/vshCommandOptDomain/vshCommandOptPool/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/\(virStoragePoolDefineXML.*\));/\1, 0);/' \
-e 's/dom/pool/g' \ -e 's/dom/pool/g' \
-e 's/int flags.*/int flags = 0;/g' \ -e 's/int flags.*/int flags = 0;/g' \
>> $@-tmp >> $@-tmp && \
chmod a-w $@-tmp chmod a-w $@-tmp && \
rm -f $@ rm -f $@ && \
mv $@-tmp $@ mv $@-tmp $@
@ -110,13 +110,13 @@ virsh_LDADD += virsh_win_icon.$(OBJEXT)
# information is needed in this area. # information is needed in this area.
virsh_win_icon.$(OBJEXT): virsh_win_icon.rc virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
$(WINDRES) \ $(AM_V_GEN)$(WINDRES) \
--input-format rc --input $< \ --input-format rc --input $< \
--output-format coff --output $@ --output-format coff --output $@
endif endif
virsh.1: virsh.pod virsh.1: virsh.pod
$(POD2MAN) $< $@ $(AM_V_GEN)$(POD2MAN) $< $@
CLEANFILES = $(bin_SCRIPTS) $(man1_MANS) CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)