From 44ff46a364fb7981804eb45329c4999b415711f9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 12 Apr 2005 01:27:21 +0000 Subject: [PATCH] Rename LDADDS to libpango_ot_la_LIBADD to actually make libpango-ot.la 2005-04-12 Tor Lillqvist * 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) --- src/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c876751..84c03bf 100644 --- a/src/Makefile.am +++ b/src/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 -- 2.7.4