diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-29 22:12:35 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-29 22:12:35 +0000 |
| commit | 36270cf8e27b21c5581859eb99687ca81df2c57e (patch) | |
| tree | 1ae2232dc57dbde2264b4999ebc8614963aa27fd /pango | |
| parent | 8edb62e4ebf5b272c50961ffdf4e4c23ea70bc6e (diff) | |
| download | pango-36270cf8e27b21c5581859eb99687ca81df2c57e.tar.gz | |
Add the fonconfig cflags/libs to FREETYPE_CFLAGS/LIBS. (#111326, Noah
Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Add the fonconfig cflags/libs to
FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt)
* {pango,tests,examples}/Makefile.am: Remove now
unnecessary references to FONTCONFIG_CFLAGS/LIBS.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 6a4ca6a2..a03a7669 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -27,7 +27,6 @@ INCLUDES = \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ -I$(top_srcdir) @@ -210,7 +209,7 @@ libpangoft2_1_0_la_SOURCES = \ libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ $(GLIB_LIBS) \ $(no_undefined) $(pangoft2_export_symbols) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FONTCONFIG_LIBS) $(pangoft2_win32res) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) $(pangoft2_win32res) libpangoft2_1_0_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango-$(PANGO_API_VERSION).la pangoft2-win32res.lo : pangoft2.rc @@ -282,10 +281,10 @@ pango_querymodules_SOURCES = \ querymodules.c if HAVE_XFT -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la else -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FONTCONFIG_LIBS) $(X_EXTRA_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS) pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la endif |