summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-02-27 16:13:16 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-02-27 16:13:16 +0000
commit914049e58cfb3d4b3a6cf696e3a8e8056433d128 (patch)
tree6070f9dc13d81d390be3941f390236c57f201cf8
parent6025d054faf871f777f14bccc56b49494af0cf8d (diff)
downloadpango-914049e58cfb3d4b3a6cf696e3a8e8056433d128.tar.gz
Move .la files to beginning of link line ... may prevent some problems
Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la files to beginning of link line ... may prevent some problems with linking to installed libraries. (#61359, Abel Cheung)
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-07
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-27
-rw-r--r--ChangeLog.pre-1-47
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--pango/Makefile.am2
8 files changed, 50 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8c9d45a7..d2360f4b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Wed Feb 27 11:10:07 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (libpangoft2_la_LIBADD): Move .la
+ files to beginning of link line ... may prevent some
+ problems with linking to installed libraries.
+ (#61359, Abel Cheung)
+
Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pango_querymodules_LDADD): Add
diff --git a/pango/Makefile.am b/pango/Makefile.am
index bc395b34..f246c2d9 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -191,7 +191,7 @@ libpangoft2_la_SOURCES = \
pangoft2-fontmap.c \
module-defs-ft2.c
-libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) mini-xft/libmini-xft.la libpango.la
+libpangoft2_la_LIBADD = mini-xft/libmini-xft.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS)
libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la