diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 20:11:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 20:11:55 +0000 |
| commit | 6f2ebcdb53f740082734e6147c737b83a26e9b0c (patch) | |
| tree | c587ccfb4444e854f29513712ea2ff9201996975 | |
| parent | 66c0f118a03335f52393abff3f3a3977ad52052a (diff) | |
| download | pango-6f2ebcdb53f740082734e6147c737b83a26e9b0c.tar.gz | |
#143556, Noah Misch
Mon Jun 21 16:02:04 2004 Owen Taylor <otaylor@redhat.com>
#143556, Noah Misch
* pango/Makefile.am: Add $(no_undefined) when building libpangox,
libpangoxft for cygwin builds.
* modules/basic/Makefile.am (pango_basic_x_la_LDFLAGS):
Add $(no_undefined) for basic-x module.
* pango/Makefile.am: Add $(GLIB_LIBS) for pangox, pangoxft,
for benefit of cygwin, AIX, etc.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 13 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 8 |
6 files changed, 57 insertions, 5 deletions
@@ -1,3 +1,16 @@ +Mon Jun 21 16:02:04 2004 Owen Taylor <otaylor@redhat.com> + + #143556, Noah Misch + + * pango/Makefile.am: Add $(no_undefined) when building libpangox, + libpangoxft for cygwin builds. + + * modules/basic/Makefile.am (pango_basic_x_la_LDFLAGS): + Add $(no_undefined) for basic-x module. + + * pango/Makefile.am: Add $(GLIB_LIBS) for pangox, pangoxft, + for benefit of cygwin, AIX, etc. + Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Initialize diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8e8ffe51..5db74826 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,16 @@ +Mon Jun 21 16:02:04 2004 Owen Taylor <otaylor@redhat.com> + + #143556, Noah Misch + + * pango/Makefile.am: Add $(no_undefined) when building libpangox, + libpangoxft for cygwin builds. + + * modules/basic/Makefile.am (pango_basic_x_la_LDFLAGS): + Add $(no_undefined) for basic-x module. + + * pango/Makefile.am: Add $(GLIB_LIBS) for pangox, pangoxft, + for benefit of cygwin, AIX, etc. + Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Initialize diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8e8ffe51..5db74826 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,16 @@ +Mon Jun 21 16:02:04 2004 Owen Taylor <otaylor@redhat.com> + + #143556, Noah Misch + + * pango/Makefile.am: Add $(no_undefined) when building libpangox, + libpangoxft for cygwin builds. + + * modules/basic/Makefile.am (pango_basic_x_la_LDFLAGS): + Add $(no_undefined) for basic-x module. + + * pango/Makefile.am: Add $(GLIB_LIBS) for pangox, pangoxft, + for benefit of cygwin, AIX, etc. + Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Initialize diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8e8ffe51..5db74826 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,16 @@ +Mon Jun 21 16:02:04 2004 Owen Taylor <otaylor@redhat.com> + + #143556, Noah Misch + + * pango/Makefile.am: Add $(no_undefined) when building libpangox, + libpangoxft for cygwin builds. + + * modules/basic/Makefile.am (pango_basic_x_la_LDFLAGS): + Add $(no_undefined) for basic-x module. + + * pango/Makefile.am: Add $(GLIB_LIBS) for pangox, pangoxft, + for benefit of cygwin, AIX, etc. + Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Initialize diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 765e8d42..b35e8e1a 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -32,7 +32,7 @@ module_LTLIBRARIES += pango-basic-x.la endif endif -pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) pango_basic_x_la_LIBADD = $(pangoxlibs) pango_basic_x_la_SOURCES = basic-x.c libpango_basic_x_la_SOURCES = basic-x.c diff --git a/pango/Makefile.am b/pango/Makefile.am index 5782a14b..42c85718 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -140,8 +140,8 @@ pangoinclude_HEADERS += pangox.h lib_LTLIBRARIES += libpangox-1.0.la endif -libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) +libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) $(GLIB_LIBS) libpangox_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) libpangox_1_0_la_SOURCES = \ @@ -160,8 +160,8 @@ pangoinclude_HEADERS += pangoxft.h pango-ot.h lib_LTLIBRARIES += libpangoxft-1.0.la endif -libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) +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 = \ |