[PATCH wayland] docs: remove and ignore doc/doxygen_sqlite3.db

Pekka Paalanen ppaalanen at gmail.com
Fri May 29 01:49:23 PDT 2015


On Thu, 28 May 2015 14:35:21 -0700
"Jon A. Cruz" <jonc at osg.samsung.com> wrote:

> On 05/28/2015 08:19 AM, Derek Foreman wrote:
> > Some newer versions of doxygen are generating this file now, and if
> > we don't clean it up distcheck will fail.
> > 
> > Known to affect doxygen 1.8.8 from debian jessie.
> > 
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> 
> Looks good.
> 
> Reviewed-by: Jon A. Cruz <jonc at osg.samsung.com>
> Tested-by: Jon A. Cruz <jonc at osg.samsung.com>

Should we have this in the Wayland 1.8.0 release?
I'd be ok with that, so feel free to push.

Funny, distcheck doesn't fail for me and I have doxygen 1.8.9, but
maybe it's because of doxygen's own build configuration. I'm weird.

> > ---
> >  Makefile.am            | 2 +-
> >  doc/doxygen/.gitignore | 1 +
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index c19494f..0ea300a 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -96,7 +96,7 @@ BUILT_SOURCES =					\
> >  	$(nodist_libwayland_client_la_SOURCES)	\
> >  	$(nodist_headers_test_SOURCES)
> >  
> > -CLEANFILES = $(BUILT_SOURCES)
> > +CLEANFILES = $(BUILT_SOURCES) doc/doxygen/doxygen_sqlite3.db
> >  DISTCLEANFILES = src/wayland-version.h
> >  EXTRA_DIST = src/wayland-version.h.in
> >  
> > diff --git a/doc/doxygen/.gitignore b/doc/doxygen/.gitignore
> > index 5f82598..730a1ef 100644
> > --- a/doc/doxygen/.gitignore
> > +++ b/doc/doxygen/.gitignore
> > @@ -1,2 +1,3 @@
> > +doxygen_sqlite3.db
> >  wayland.doxygen
> >  xml/

Thanks,
pq

PS. Please use reply-to-all.


More information about the wayland-devel mailing list