From 1cf950aae2902ca4f56a7e0f75ed46d719e8a4e8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Jul 2001 18:27:17 +0000 Subject: Fix dependencies to work without XFT. Fri Jul 13 14:24:59 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies to work without XFT. --- ChangeLog | 5 +++++ ChangeLog.pre-1-0 | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/Makefile.am | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 145e6e6d..b4cd4a1a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Fri Jul 13 14:24:59 2001 Owen Taylor + + * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Fix dependencies + to work without XFT. + Thu Jul 12 16:32:42 2001 Owen Taylor * pango/Makefile.am (pango_querymodules_DEPENDENCIES): Add diff --git a/pango/Makefile.am b/pango/Makefile.am index 8cdcdcd3..9615fc25 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -182,12 +182,12 @@ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile pango_querymodules_SOURCES = \ querymodules.c -pango_querymodules_DEPENDENCIES = libpangoxft.la - if HAVE_XFT pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) +pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la else pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) +pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpango.la endif EXTRA_DIST = \ -- cgit v1.2.1