Gaetan Nadon <[email protected]> (19/02/2011): > The scenario in question is running distcheck in a VPATH build when > doc generation is disabled which conflicts with the requirement of > mandating generated docs in the tarball. > > This scenario does not affect distro/OS builds as far as I can tell.
Out-of-tree build (with doc enabled) failed for me. I'm attaching the patch I used to get going. Need to figure out why $(abs_builddir) instead of plain $(builddir), though. Please also note the typo fix for the last target, there was a missing slash. Failure: | make[3]: Entering directory `/home/cyril/debian-x/xserver/xorg-server.git/build-main/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 KiBi.
Without abs_builddir or builddir, out-of-tree building seems to fail since symlinks aren't created. Using builddir didn't seem to work, while abs_builddir did the trick. Stick to that until further investigation. --- a/hw/dmx/doc/Makefile.am +++ b/hw/dmx/doc/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/doc/xml/xmlrules-n if HAVE_DOXYGEN -DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf +DOXYGEN_SRC=$(abs_builddir)/doxygen.head $(abs_builddir)/doxygen.foot $(abs_builddir)/doxygen.css $(srcdir)/doxygen.conf all-local: html/annotated.html @@ -254,12 +254,12 @@ EXTRA_DIST = \ html/usb-private_8h.html \ html/usb-private_8h_source.html -$(builddir)/doxygen.head: +$(abs_builddir)/doxygen.head: $(LN_S) $(srcdir)/doxygen.head $@ -$(builddir)/doxygen.foot: +$(abs_builddir)/doxygen.foot: $(LN_S) $(srcdir)/doxygen.foot $@ -$(builddir)doxygen.css: +$(abs_builddir)/doxygen.css: $(LN_S) $(srcdir)/doxygen.css $@
signature.asc
Description: Digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
