[PATCH 1/2] Build system: Make DMX doc generation distcheck-clean

Gaetan Nadon memsize at videotron.ca
Wed Jan 5 17:07:55 PST 2011

On Wed, 2011-01-05 at 11:04 -0500, Gaetan Nadon wrote:

> > Previously, distcheck failed if documentation generation was disabled,
> > and was also not safe for srcdir != builddir.  This patch makes sure
> > that documents are always generated during distcheck, and that the rules
> > to generate them can be found.  It also fixes srcdir != builddir for
> > doxygen, following the lead of Telepathy and pretty much everyone else
> > in generating doxygen.conf.
> > 
> > The following, which previously failed, now passes for me:
> > cd xserver
> > mkdir build
> > cd build
> > ../configure

Changing makefile.am sometimes require autoreconf. I am not sure and I
don't know why.

> > make distcheck
> > 
> This is fairly complex, it would be nice to identify which code fixes
> which problem:
> 1- you want to build devel docs at dist time when --disable-devel-docs
> is specified. Whatever code makes it work that way should be commented
> as such as it maybe upset by future changes. It will remind others to
> test for it. 
> 2- fix doxygen when running make distcheck from a VPATH build.

Some test results. I used my regular plain xserver build and applied the
patch. I cleaned up the doc directory.
Ran autogen,.sh --disable-devel-docs

git status:

        # Untracked files:
        #   (use "git add <file>..." to include in what will be committed)
        #	hw/dmx/doc/doxygen.conf


The DocBook/XML dmx and scaled docs html/pdf/txt are generated while
they should not.
I cleaned the doc dir again to pretend they had not built.

make dist: (which is always ran before distcheck)
The DocBook/XML dmx.txt and scaled.txt docs are generated, but then:

        cp: cannot stat `./html': No such file or directory

I created the directory and ran make dist again. The tarball is created
but the html generated files are missing.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110105/dca5008d/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/20110105/dca5008d/attachment.pgp>

More information about the xorg-devel mailing list