[cairo] [cairo-commit] src/Makefile.am
behdad at behdad.org
Fri Jan 11 08:44:44 PST 2008
On Fri, 2008-01-11 at 11:43 -0500, Behdad Esfahbod wrote:
> On Fri, 2008-01-11 at 10:48 -0500, Chris Wilson wrote:
> > src/Makefile.am | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > New commits:
> > commit be146f02e0e220aa70217bf348beef301a56f898
> > Author: Chris Wilson <chris at chris-wilson.co.uk>
> > Date: Fri Jan 11 15:28:52 2008 +0000
> > [Makefile.am] Update cairo.def after the set of enabled features is modified.
> > Bug 13342 corresponds with a rebuild of cairo after removing
> > --enable-glitz from the configure line. Under these circumstances,
> > the remaining installable headers are not modified and therefore
> > cairo.def is not rebuilt and still expects to find a reference to
> > cairo_glitz_surface_create. The solution is to rebuild cairo.def after
> > any modification to the 'public' headers (installable or otherwise).
> You got the right fix for the not so right reason :). It just happens
> that nodist_cairoinclude_HEADERS is cairo-features.h. If we didn't have
> a header like cairo-features.h listing all enabled features, this would
> not fixed the bug and you'd need to add a dep on config.h.
> Anyway, looks good now.
Well, another reason that I prefer cairo-features.h listed explicitly
instead of or in addition of $(nodist_cairoinclude_HEADERS) is that the
instructions for generating cairo.def use cairo-features.h...
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index 243dc56..5986334 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -293,7 +293,7 @@ cairo-features.h:
> > cd $(top_builddir) && ./config.status src/cairo-features.h
> > CLEANFILES = cairo.def
> > -cairo.def: $(cairoinclude_HEADERS)
> > +cairo.def: $(cairoinclude_HEADERS) $(nodist_cairoinclude_HEADERS)
> > @echo Generating $@
> > @(echo EXPORTS; \
> > (cd $(srcdir); cat $(cairo_headers) || echo 'cairo_ERROR ()' ) | \
> > _______________________________________________
> > cairo-commit mailing list
> > cairo-commit at lists.cairographics.org
> > http://lists.cairographics.org/mailman/listinfo/cairo-commit
"Those who would give up Essential Liberty to purchase a little
Temporary Safety, deserve neither Liberty nor Safety."
-- Benjamin Franklin, 1759
More information about the cairo