xserver distcheck broken with and without --disable-devel-docs

[Gaetan Nadon]

On Mon, 2011-01-03 at 17:52 -0500, Gaetan Nadon wrote:

> On Mon, 2011-01-03 at 14:06 +0000, Daniel Stone wrote: 
> 
> > Hi,
> > So, the DMX doc stuff breaks distcheck quite badly.  If I have
> > --disable-devel-docs set in my ./configure run, I get:
> > make[3]: Entering directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> >   GEN    dmx.txt
> >   GEN    scaled.txt
> > make[3]: *** No rule to make target `html/annotated.html', needed by `distdir'.  Stop.
> > make[3]: Leaving directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> > make[2]: *** [distdir] Error 1
> > 
> > Without it (or shuffling around some if's in hw/dmx/doc/Makefile.am),
> > I get:
> >  (cd doc && make  top_distdir=../../../xorg-server-1.9.99.901 distdir=../../../xorg-server-1.9.99.901/hw/dmx/doc \
> >      am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
> > make[3]: Entering directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> > /usr/bin/doxygen ../../../../hw/dmx/doc/doxygen.conf
> > error: tag HTML_HEADER: header file `doxygen.head' does not exist
> > make[3]: *** [html/annotated.html] Error 1
> > make[3]: Leaving directory `/home/daniels/x/xorg/xserver/obj-amd64/hw/dmx/doc'
> > 
> > Can someone please take a look at this?
> 
> 
> The xserver requires the generated html from doxygen to be included in
> the tarball. If I recall correctly, the makefiles dependencies will
> attempt to generate the html files at distribution time, regardless of
> the configure options. I think this is by design, as to ensure the
> content of the tarball is the same, regardless of who creates it and
> from which platform it is created. 
> 
> In the last path I did on master
> http://cgit.freedesktop.org/xorg/xserver/commit/?id=03ea0b7726487b96df73936518da73d023e51334
> I had tested those various scenarios and worked correctly. This was
> after 1.9.99.901. You should be able to create a tarball that includes
> the generated html files. This is just around the timeframe where the
> doc options changed as a result of the overall doc book xml
> conversion. Check the configure options that are in effect in
> 1.9.99.901, you may have to use --enable-builddocs in order to create
> a tarball.
> 

FYI, I ran distcheck from master with no configuration options and it
was successful.


> > Cheers,
> > Daniel
> > _______________________________________________
> > xorg-devel at lists.x.org: X.Org development
> > Archives: http://lists.x.org/archives/xorg-devel
> > Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110103/06294782/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110103/06294782/attachment.pgp>