From d2e363ab68dfbfcd0df11e8dad03cc860f7f2296 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 21 Sep 2010 15:53:52 -0400 Subject: Fix docs build on Ubuntu I'm guessing that Ubuntu has broken libtool by not automatically adding dependent libraries from the .la file... --- docs/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9e5b6062..28f76263 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -57,13 +57,15 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) -# libpangoxft.la and/or libpangocairo.la pull in libpango.la -# and libpangoft2.la; # We're assuming here that we'll only regenerate the # HTML docs on Unix. We don't get introspection on Win32 # specific types, but that isn't a big deal. -GTKDOC_LIBS = +GTKDOC_LIBS = $(top_builddir)/pango/libpango-1.0.la + +if HAVE_FREETYPE +GTKDOC_LIBS += $(top_builddir)/pango/libpangoft2-1.0.la +endif if HAVE_XFT GTKDOC_LIBS += $(top_builddir)/pango/libpangoxft-1.0.la -- cgit v1.2.1