diff options
author | Sven Neumann <sven@gimp.org> | 2002-02-28 20:32:17 +0000 |
---|---|---|
committer | Sven Neumann <neo@src.gnome.org> | 2002-02-28 20:32:17 +0000 |
commit | b826d3f5673d197458d1aaad7d9cc12bf893e8f7 (patch) | |
tree | 4c4125339c5fc1f899de9bbb78496aef5fbd5faa /pango/Makefile.am | |
parent | df30e560061c873fb8c9266d4368716d9746c25a (diff) | |
download | pango-b826d3f5673d197458d1aaad7d9cc12bf893e8f7.tar.gz |
don't link libpango-ot into the module. added libpango-ot.la to
2002-02-28 Sven Neumann <sven@gimp.org>
* modules/arabic/Makefile.am: don't link libpango-ot into the module.
* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
Should fix #72934, reported by Raymond Wan.
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index f246c2d9..32e80277 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -55,11 +55,11 @@ XFT_BUILD_LIBS= endif if HAVE_FREETYPE +FT2_HFILES=pangoft2.h pango-ot.h FT2_BUILD_LIBS=libpangoft2.la -FT2_HFILES=pangoft2.h else -FT2_BUILD_LIBS= FT2_HFILES= +FT2_BUILD_LIBS= endif if PLATFORM_WIN32 @@ -191,7 +191,7 @@ libpangoft2_la_SOURCES = \ pangoft2-fontmap.c \ module-defs-ft2.c -libpangoft2_la_LIBADD = mini-xft/libmini-xft.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) +libpangoft2_la_LIBADD = mini-xft/libmini-xft.la opentype/libpango-ot.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols) libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la |