[Libvir] [PATCH] avoid "make distcheck" failure
"make distcheck" was failing. This fixes it: avoid "make distcheck" failure * docs/Makefile.am (EXTRA_DIST): Replace wildcards html/*.html and html/*.png the corresponding lists of file names. Signed-off-by: Jim Meyering <meyering@redhat.com> --- docs/Makefile.am | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index feb72c1..c6f6032 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -63,8 +63,15 @@ fig = \ EXTRA_DIST= \ libvirt-api.xml libvirt-refs.xml apibuild.py \ site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ - $(dot_html) $(dot_html_in) $(gif) html/*.html html/*.png \ - $(xml) $(rng) $(fig) $(png) \ + $(dot_html) $(dot_html_in) $(gif) \ + html/index.html \ + html/libvirt-libvirt.html \ + html/libvirt-virterror.html \ + html/home.png \ + html/left.png \ + html/right.png \ + html/up.png \ + $(xml) $(rng) $(fig) $(png) \ virsh.pod ChangeLog.awk all: web $(top_builddir)/NEWS $(man_MANS) -- 1.5.5.1.69.g2ffd
On Fri, Apr 25, 2008 at 07:27:00PM +0200, Jim Meyering wrote:
"make distcheck" was failing. This fixes it:
avoid "make distcheck" failure * docs/Makefile.am (EXTRA_DIST): Replace wildcards html/*.html and html/*.png the corresponding lists of file names.
Hum, that's still changing a bit. For example we are likely to include the HTML for the ocaml and ruby bindings as part of the distribution, and parts of the graphic design, including images are gonna change. Anyway I'm still wondering why using wildcards would break in principle, any good reason to not use them ? Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
Daniel Veillard <veillard@redhat.com> wrote:
On Fri, Apr 25, 2008 at 07:27:00PM +0200, Jim Meyering wrote:
"make distcheck" was failing. This fixes it:
avoid "make distcheck" failure * docs/Makefile.am (EXTRA_DIST): Replace wildcards html/*.html and html/*.png the corresponding lists of file names.
Hum, that's still changing a bit.
All the more reason *not* to use wildcards.
For example we are likely to include the HTML for the ocaml and ruby bindings as part of the distribution, and parts of the graphic design, including images are gonna change. Anyway I'm still wondering why using wildcards would break in principle, any good reason to not use them ?
If fixing a failing "make distcheck" isn't a good enough reason, take a look at the automake manual's section: 27.3 Why doesn't Automake support wildcards? it gives several good reasons. By the way, I made similar changes back in November.
On Mon, Apr 28, 2008 at 09:30:45AM +0200, Jim Meyering wrote:
Daniel Veillard <veillard@redhat.com> wrote:
On Fri, Apr 25, 2008 at 07:27:00PM +0200, Jim Meyering wrote:
"make distcheck" was failing. This fixes it:
avoid "make distcheck" failure * docs/Makefile.am (EXTRA_DIST): Replace wildcards html/*.html and html/*.png the corresponding lists of file names.
Hum, that's still changing a bit.
All the more reason *not* to use wildcards.
I was just trying to carry the point that "docs/ is a work in progress, will be fixed, sorry for the inconvenience"
For example we are likely to include the HTML for the ocaml and ruby bindings as part of the distribution, and parts of the graphic design, including images are gonna change. Anyway I'm still wondering why using wildcards would break in principle, any good reason to not use them ?
If fixing a failing "make distcheck" isn't a good enough reason, take a look at the automake manual's section:
27.3 Why doesn't Automake support wildcards?
it gives several good reasons.
Okay thanks, will fix. But cleaner fix is by fixing/reusing $(apihtml) and $(apipng) that will be done as part of the docs/ fixup commit later. Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
Daniel Veillard <veillard@redhat.com> wrote: ...
Okay thanks, will fix. But cleaner fix is by fixing/reusing $(apihtml) and $(apipng) that will be done as part of the docs/ fixup commit later.
As you say, it could be cleaner. This patch relies on a gnu-make'ism, but there are already several others in the vicinity: avoid "make distcheck" failure * docs/Makefile.am (EXTRA_DIST): Replace wildcards html/*.html and html/*.png the corresponding lists of file names. diff --git a/docs/Makefile.am b/docs/Makefile.am index feb72c1..d3f4c35 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -63,8 +63,10 @@ fig = \ EXTRA_DIST= \ libvirt-api.xml libvirt-refs.xml apibuild.py \ site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ - $(dot_html) $(dot_html_in) $(gif) html/*.html html/*.png \ - $(xml) $(rng) $(fig) $(png) \ + $(dot_html) $(dot_html_in) $(gif) \ + $(apihtml:%=html/%) \ + $(apipng:%=html/%) \ + $(xml) $(rng) $(fig) $(png) \ virsh.pod ChangeLog.awk all: web $(top_builddir)/NEWS $(man_MANS) -- 1.5.5.1.69.g2ffd
On Mon, Apr 28, 2008 at 10:44:16AM +0200, Jim Meyering wrote:
Daniel Veillard <veillard@redhat.com> wrote: ...
Okay thanks, will fix. But cleaner fix is by fixing/reusing $(apihtml) and $(apipng) that will be done as part of the docs/ fixup commit later.
As you say, it could be cleaner.
I fixed in CVS already, redefining apihtml and apipng to include the html prefixes. Thanks, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
participants (2)
-
Daniel Veillard -
Jim Meyering