From 788fe1df185ea726d2ae37436fdaec0d813395fe Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 26 Jan 2006 18:47:53 +0000 Subject: Fix more ATSUI stuff in build infrastructure. Sigh... (bug #328632) 2006-01-26 Behdad Esfahbod * pango/modules.h, pango/Makefile.am: Fix more ATSUI stuff in build infrastructure. Sigh... (bug #328632) --- ChangeLog | 5 +++++ pango/Makefile.am | 16 ++++++++++------ pango/modules.h | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9c4d5e4..ea98b106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-26 Behdad Esfahbod + + * pango/modules.h, pango/Makefile.am: Fix more ATSUI stuff in build + infrastructure. Sigh... (bug #328632) + 2006-01-25 Behdad Esfahbod * configure.in: If major.minor of required and available glib versions diff --git a/pango/Makefile.am b/pango/Makefile.am index 1547403b..c97d986a 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -192,6 +192,8 @@ libpangoft2_1_0_la_DEPENDENCIES = \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_SOURCES = \ + modules.h \ + module-defs-fc.c \ pangofc-font.c \ pangofc-fontmap.c \ pangofc-decoder.c \ @@ -200,8 +202,7 @@ libpangoft2_1_0_la_SOURCES = \ pangoft2.c \ pangoft2-private.h \ pangoft2-fontmap.c \ - pangoft2-render.c \ - module-defs-fc.c + pangoft2-render.c if OS_WIN32 libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o @@ -280,13 +281,15 @@ endif if HAVE_CAIRO_ATSUI libpangocairo_1_0_la_SOURCES += \ + modules.h \ + module-defs-atsui.c \ pangoatsui.h \ pangoatsui.c \ pangoatsui-fontmap.c \ pangocairo-atsui.h \ pangocairo-atsuifont.c \ pangocairo-atsuifont.h \ - pangocairo-atsuifontmap.c + pangocairo-atsuifontmap.c libpangocairo_1_0_la_CFLAGS = -xobjective-c endif @@ -308,12 +311,13 @@ libpangowin32_1_0_la_DEPENDENCIES = \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_WIN32_MODULES) libpangowin32_1_0_la_SOURCES = \ + modules.h \ + module-defs-win32.c \ pangowin32.h \ pangowin32.c \ pangowin32-private.h \ pangowin32-fontcache.c \ - pangowin32-fontmap.c \ - module-defs-win32.c + pangowin32-fontmap.c if OS_WIN32 libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o @@ -407,9 +411,9 @@ pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) EXTRA_DIST = \ pango-enum-types.h \ + module-defs.h \ module-defs-fc.c.win32 \ module-defs-win32.c.win32 \ - module-defs.h \ pango.def \ pangocairo.def \ pangowin32.def \ diff --git a/pango/modules.h b/pango/modules.h index c8f306df..eb04d5b4 100644 --- a/pango/modules.h +++ b/pango/modules.h @@ -28,5 +28,6 @@ extern PangoIncludedModule _pango_included_x_modules[]; extern PangoIncludedModule _pango_included_fc_modules[]; extern PangoIncludedModule _pango_included_win32_modules[]; +extern PangoIncludedModule _pango_included_atsui_modules[]; #endif /* __MODULES_H__ */ -- cgit v1.2.1