[pango] Fix docs build on Ubuntu
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Fix docs build on Ubuntu
- Date: Tue, 28 Sep 2010 18:18:21 +0000 (UTC)
commit 837f1bae095f90c662fdc51fd39a0eeb2bb8f850
Author: Behdad Esfahbod <behdad behdad org>
Date: Tue Sep 21 15:53:52 2010 -0400
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 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9e5b606..28f7626 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]