diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/Makefile.am | 34 |
5 files changed, 41 insertions, 17 deletions
@@ -1,3 +1,9 @@ +Tue Jul 13 10:07:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am: Reverse order of pangoft2/pangoxft + in Makefile; apparently automake doesn't figure out + the correct installation order. (#146472) + Tue Jul 13 10:02:53 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-utils.c (pango_language_get_sample_string): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ed669b8a..9d3c302c 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Tue Jul 13 10:07:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am: Reverse order of pangoft2/pangoxft + in Makefile; apparently automake doesn't figure out + the correct installation order. (#146472) + Tue Jul 13 10:02:53 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-utils.c (pango_language_get_sample_string): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ed669b8a..9d3c302c 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Tue Jul 13 10:07:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am: Reverse order of pangoft2/pangoxft + in Makefile; apparently automake doesn't figure out + the correct installation order. (#146472) + Tue Jul 13 10:02:53 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-utils.c (pango_language_get_sample_string): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ed669b8a..9d3c302c 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Tue Jul 13 10:07:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am: Reverse order of pangoft2/pangoxft + in Makefile; apparently automake doesn't figure out + the correct installation order. (#146472) + Tue Jul 13 10:02:53 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-utils.c (pango_language_get_sample_string): diff --git a/pango/Makefile.am b/pango/Makefile.am index 9f0c13aa..66081e8a 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -153,23 +153,6 @@ libpangox_1_0_la_SOURCES = \ pangox-fontmap.c -# ------------------- libpangoxft ------------------- - -if HAVE_XFT -pangoinclude_HEADERS += pangoxft.h pango-ot.h -lib_LTLIBRARIES += libpangoxft-1.0.la -endif - -libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS) -libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la - -libpangoxft_1_0_la_SOURCES = \ - pangoxft-font.c \ - pangoxft-fontmap.c \ - pangoxft-private.h - - # ------------------- libpangoft2 ------------------- if HAVE_FREETYPE @@ -205,6 +188,23 @@ pangoft2-win32res.lo: pangoft2.rc $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ +# ------------------- libpangoxft ------------------- + +if HAVE_XFT +pangoinclude_HEADERS += pangoxft.h pango-ot.h +lib_LTLIBRARIES += libpangoxft-1.0.la +endif + +libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS) +libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la + +libpangoxft_1_0_la_SOURCES = \ + pangoxft-font.c \ + pangoxft-fontmap.c \ + pangoxft-private.h + + # ------------------- libpangowin32 ------------------- if HAVE_WIN32 |