External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs/Makefile.am: remove unnecessary subshells

Browse Source 
* docs/Makefile.am (ChangeLog.html.in, %.html.tmp, %.html)
(html/index.html, $(devhelphtml)): Avoid spurious subshells.
This commit is contained in:
Eric Blake 2010-04-28 19:32:20 -06:00
parent 7cdf26637e
commit 1c5891204d
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
docs/Makefile.am
View File

@ -91,44 +91,49 @@ ChangeLog.xml: ../ChangeLog ChangeLog.awk
awk -f ChangeLog.awk < $< > $@ awk -f ChangeLog.awk < $< > $@
ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl
@(if [ -x $(XSLTPROC) ] ; then \ @if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \ echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \ name=`echo $@ | sed -e 's/.tmp//'`; \
$(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ || (rm $@ && exit 1) ; fi ) $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ \
|| { rm $@ && exit 1; }; fi
%.png: %.fig %.png: %.fig
convert -rotate 90 $< $@ convert -rotate 90 $< $@
%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
@(if [ -x $(XSLTPROC) ] ; then \ @if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \ echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \ name=`echo $@ | sed -e 's/.tmp//'`; \
$(XSLTPROC) --stringparam pagename $$name --nonet --html $(top_srcdir)/docs/site.xsl $< > $@ || (rm $@ && exit 1) ; fi ) $(XSLTPROC) --stringparam pagename $$name --nonet --html \
$(top_srcdir)/docs/site.xsl $< > $@ \
|| { rm $@ && exit 1; }; fi
%.html: %.html.tmp %.html: %.html.tmp
@(if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ @if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ if $(XMLCATALOG) /etc/xml/catalog \
"-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
echo "Validating $@" ; \ echo "Validating $@" ; \
$(XMLLINT) --nonet --format --valid $< > $@ || (rm $@ && exit 1) ; \ $(XMLLINT) --nonet --format --valid $< > $@ \
else echo "missing XHTML1 DTD" ; fi ; fi ); || { rm $@ && exit 1; }; \
else echo "missing XHTML1 DTD" ; fi ; fi
html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
-@(if [ -x $(XSLTPROC) ] ; then \ -@if [ -x $(XSLTPROC) ] ; then \
echo "Rebuilding the HTML pages from the XML API" ; \ echo "Rebuilding the HTML pages from the XML API" ; \
$(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi ) $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi
-@(if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" \ if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" \
> /dev/null ; then \ > /dev/null ; then \
echo "Validating the resulting XHTML pages" ; \ echo "Validating the resulting XHTML pages" ; \
$(XMLLINT) --nonet --valid --noout html/*.html ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; \
else echo "missing XHTML1 DTD" ; fi ; fi ); else echo "missing XHTML1 DTD" ; fi ; fi
$(devhelphtml): libvirt-api.xml $(devhelpxsl) $(devhelphtml): libvirt-api.xml $(devhelpxsl)
-@(echo Rebuilding devhelp files) -@echo Rebuilding devhelp files
-@(if [ -x $(XSLTPROC) ] ; then \ -@if [ -x $(XSLTPROC) ] ; then \
$(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \
$(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi ); $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi
html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py
-srcdir=$(srcdir) $(srcdir)/apibuild.py -srcdir=$(srcdir) $(srcdir)/apibuild.py