diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2002-02-02 23:32:14 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-02 23:32:14 +0000 |
| commit | dadac18a2d959343059b527b3aa7716892bb84ff (patch) | |
| tree | 44dbcbacd1af4889b2dacf02194fbcb164f361b7 | |
| parent | f2af57b9c9cc257243383f15733fc9fb82e1cc0d (diff) | |
| download | pango-dadac18a2d959343059b527b3aa7716892bb84ff.tar.gz | |
at Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Try removing
libpango.la from the link line since it will be pulled
in from the other libraries to avoid duplicate inclusion.
(#70400.)
* pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/Makefile.am | 6 |
8 files changed, 66 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4819802a..53a5ae88 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Sat Feb 2 18:27:38 2002 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (pango_querymodules_LDADD): Try removing + libpango.la from the link line since it will be pulled + in from the other libraries to avoid duplicate inclusion. + (#70400.) + + * pangox.pc.in (Libs): Add @X_XTRA_LIBS@ (#70400) + 2002-02-01 Havoc Pennington <hp@redhat.com> * pangoxft.pc.in (Description, Name): fix cut-and-paste mess diff --git a/pango/Makefile.am b/pango/Makefile.am index 87f58c57..753f3bbc 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -260,11 +260,11 @@ pango_querymodules_SOURCES = \ querymodules.c 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_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.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 +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) +pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango.la endif EXTRA_DIST = \ |