diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-10-31 18:05:21 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-10-31 18:05:21 +0000 |
commit | 0d4fc337ced4c1884f34c2723f36c0efe9f61c42 (patch) | |
tree | a71d708a497996855de8e4e5b2660cd09e2295c8 /pango/Makefile.am | |
parent | 2abe0fc819264649a9cd503180ec6b558cf80b20 (diff) | |
download | pango-0d4fc337ced4c1884f34c2723f36c0efe9f61c42.tar.gz |
Fix some leftover references to INCLUDE_XFT_MODULES, INCLUDED_FC_MODULES.
Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some
leftover references to INCLUDE_XFT_MODULES,
INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar)
* pango/pangox-fontmap.c (pango_x_face_get_coverage):
Fix some code that was never quite finished.
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 895553cb..b0dbcb21 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -160,8 +160,8 @@ lib_LTLIBRARIES += libpangoxft-1.0.la endif libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) -libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) +libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) +libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la libpangoxft_1_0_la_SOURCES = \ pangoxft-font.c \ @@ -177,8 +177,8 @@ lib_LTLIBRARIES += libpangoft2-1.0.la endif libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) -libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) +libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_SOURCES = \ pangofc-font.c \ @@ -322,7 +322,7 @@ if HAVE_INCLUDED_MODULES included-modules: @cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules -$(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES) $(INCLUDED_WIN32_MODULES): included-modules +$(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES): included-modules @true .PHONY: included-modules |