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

[Daniel Stone]

On Tue, Jan 04, 2011 at 10:17:44AM +1000, Peter Hutterer wrote:
> On Mon, 3 Jan 2011 14:06:37 +0000, Daniel Stone <daniel at fooishbar.org> wrote:
> > 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?
> 
> both errors look like there's $(srcdir) missing in the
> Makefile.am. have you tried that yet?

The 'no target to make html/annotated.html' is just because the include
statement for the Makefile fragment that has the rules for html/* isn't
included unless ENABLE_DEVEL_DOCS is true; the latter error is doxygen
being rubbish.  I went to have a look at fixing it, but doxygen --help
and the manpage both say nothing more useful than 'read the manual'.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110105/52557370/attachment.pgp>