[PATCH xserver] dmx: only conditionnaly distribute html files

[Gaetan Nadon]

On Sat, 2010-01-09 at 09:14 -0800, Dan Nicholson wrote:

> On Sat, Jan 9, 2010 at 9:04 AM, Julien Cristau <jcristau at debian.org> wrote:
> > On Sat, Jan  9, 2010 at 11:53:24 -0500, Gaetan Nadon wrote:
> >
> >> When building of docs is disabled (the default) the
> >> distribution of the doc output must be as well.
> >> Otherwise the make dist target fails.
> >>
> > I disagree with this.  make dist should give reproducible results.
> 
> Right. Also, the onus is on the developer making the tarball to have
> all the necessary doc tools so that people building from tarballs
> don't need them.
> 


I must have overlooked something. As it is now, the make dist target
fails (and so does distcheck). Simply type 'make dist' to confirm. The
docs are not built by default, which is fine. If I do build them, they
build successfully. What is different and confusing is that the output
of the build process is distributed. 

My only intention was to prevent the dist/distcheck target to fail. I
agree that the tarball must always be the same and not subject to
variable. The solution is no good, so I withdraw the patch. 

That leaves us with the broken dist target to fix. Based on comments in
git, the html files used to be checked-in, they were removed in favour
of being built. 


        We probably shouldn't include the built versions in the tarball, but we do, 
        so this is an attempt to make that work by having both the 'all' and 'dist' 
        targets depends on the doxygen output.


I see two options:
Always build docs *and* distribute html. Only clean using
maintainer-clean target as doxygen is then considered a special tool.
Consider doxygen as a normal build process tool *and* do not distribute
html.
Suggestions?

I had a quick look and doxygen is only used in xserver/dmx and in
xcb/libxcb/doc.

This reminds me a lot  of the INSTALL/ChangeLog targets.

Thanks a lot!

Gaetan


> --
> Dan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20100109/a58e08d9/attachment.html