summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2010-09-21 15:53:52 -0400
committerBehdad Esfahbod <behdad@behdad.org>2010-09-21 15:53:52 -0400
commita6a4c6cacac8e8c1444bc6dae14cd70a384b6105 (patch)
tree5d8fa3085267efd62baba7f4dbb8b3ef972b04d4
parent64ada662476f5b5506a9a455f4c39242ab51ff38 (diff)
downloadpango-a6a4c6cacac8e8c1444bc6dae14cd70a384b6105.tar.gz
Fix docs build on Ubuntu
I'm guessing that Ubuntu has broken libtool by not automatically adding dependent libraries from the .la file...
-rw-r--r--docs/Makefile.am8
1 files 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