diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-04-12 01:27:21 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-04-12 01:27:21 +0000 |
| commit | a5a4cb9d89f4040a8679765861e3207ed633e9c0 (patch) | |
| tree | 6d85ecfa48b5b40965c6c78f405d5f27ab9ec14d | |
| parent | ccdec1a1a60344509b3b012920a075f0ef189ac2 (diff) | |
| download | pango-a5a4cb9d89f4040a8679765861e3207ed633e9c0.tar.gz | |
Rename LDADDS to libpango_ot_la_LIBADD to actually make libpango-ot.la
2005-04-12 Tor Lillqvist <tml@novell.com>
* pango/opentype/Makefile.am: Rename LDADDS to
libpango_ot_la_LIBADD to actually make libpango-ot.la link with
it.
* pango/pangowin32.def: Rename get_scale_factor to
get_metrics_factor here, too. (#300222, Ivan Wong)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | pango/opentype/Makefile.am | 12 | ||||
| -rw-r--r-- | pango/pangowin32.def | 2 |
4 files changed, 25 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2005-04-12 Tor Lillqvist <tml@novell.com> + + * pango/opentype/Makefile.am: Rename LDADDS to + libpango_ot_la_LIBADD to actually make libpango-ot.la link with + it. + + * pango/pangowin32.def: Rename get_scale_factor to + get_metrics_factor here, too. (#300222, Ivan Wong) + Fri Apr 8 15:30:55 2005 Manish Singh <yosh@gimp.org> * examples/cairoview.c: #include <pixman.h> since the cairo headers diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 70a87ca4..b03f3d3c 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2005-04-12 Tor Lillqvist <tml@novell.com> + + * pango/opentype/Makefile.am: Rename LDADDS to + libpango_ot_la_LIBADD to actually make libpango-ot.la link with + it. + + * pango/pangowin32.def: Rename get_scale_factor to + get_metrics_factor here, too. (#300222, Ivan Wong) + Fri Apr 8 15:30:55 2005 Manish Singh <yosh@gimp.org> * examples/cairoview.c: #include <pixman.h> since the cairo headers diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index c8767517..84c03bf5 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -12,12 +12,6 @@ INCLUDES = \ $(X_CFLAGS) \ -I$(top_srcdir) -LDADDS = \ - $(x_ldflags) \ - $(x_libs) \ - $(GLIB_LIBS) \ - -lm - noinst_LTLIBRARIES = libpango-ot.la libpango_ot_la_SOURCES = \ @@ -38,6 +32,12 @@ libpango_ot_la_SOURCES = \ pango-ot-private.h \ pango-ot-ruleset.c +libpango_ot_la_LIBADD = \ + $(x_ldflags) \ + $(x_libs) \ + $(GLIB_LIBS) \ + -lm + if BUILD_OT_TESTS noinst_PROGRAMS = ottest endif diff --git a/pango/pangowin32.def b/pango/pangowin32.def index 2f0e308e..5ca614ba 100644 --- a/pango/pangowin32.def +++ b/pango/pangowin32.def @@ -14,7 +14,7 @@ EXPORTS pango_win32_font_new pango_win32_font_logfont pango_win32_font_done_font - pango_win32_font_get_scale_factor + pango_win32_font_get_metrics_factor pango_win32_font_select_font pango_win32_fontmap_cache_add pango_win32_fontmap_cache_remove |