From d5b358fe3e5123842533ea445460d8a337eced5d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 3 Jan 2001 10:45:12 +0000 Subject: Update the default list of included modules for 2001-01-03 Alexander Larsson * configure.in: Update the default list of included modules for --with-included-modules=yes to include all new modules. Split INCLUDED_MODULES and module-defs.c into per shaper engine type lists. * modules/arabic/Makefile.am: Build libpango-arabic-xft.la if INCLUDE_ARABIC_XFT. * modules/arabic/arabic-xft.c: Change module prefix to _pango_arabic_xft_ * modules/basic/Makefile.am: Build static libs for all included modules. * modules/basic/basic-ft2.c: Change module prefix to _pango_basic_ft2_ * modules/basic/basic-xft.c: Change module prefix to _pango_basic_xft_ * pango/Makefile.am: Include correct module-defs-XXX in libs. * pango/modules.h: Split _pango_included_modules[] into separate lists. * pango/pangox.c: * pango/pangoft2.c: * pango/pangoxft-fontmap.c: Register built in modules. --- modules/arabic/Makefile.am | 36 +++++++++++++++++++++++++++++------- modules/arabic/arabic-fc.c | 4 ++-- modules/arabic/arabic-xft.c | 4 ++-- modules/basic/Makefile.am | 42 ++++++++++++++++++++++++++++++++++-------- modules/basic/basic-fc.c | 6 +++--- modules/basic/basic-ft2.c | 4 ++-- modules/basic/basic-xft.c | 6 +++--- 7 files changed, 75 insertions(+), 27 deletions(-) (limited to 'modules') diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index b276f02f..e12664c5 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -2,8 +2,17 @@ if HAVE_XFT XFT_MODULES=pango-arabic-xft.la +if INCLUDE_ARABIC_XFT +XFT_INCLUDED=libpango-arabic-xft.la +XFT_PREFIX=-DXFT_MODULE_PREFIX +else +XFT_INCLUDED= +XFT_PREFIX= +endif else XFT_MODULES= +XFT_INCLUDED= +XFT_PREFIX= endif sources = \ @@ -17,15 +26,28 @@ sources = \ naqshfont.h \ arconv.h +xft_sources = \ + arabic-xft.c \ + arabic-ot.c \ + arabic-ot.h + if INCLUDE_ARABIC -noinst_LTLIBRARIES = libpango-arabic.la -moddefine = -DMODULE_PREFIX +X_MODULES= +X_INCLUDED=libpango-arabic.la +X_PREFIX=-DMODULE_PREFIX else -moduledir = $(libdir)/pango/modules -module_LTLIBRARIES = $(XFT_MODULES) pango-arabic.la -moduleflags = -rpath $(libdir) +X_MODULES=pango-arabic.la +X_INCLUDED= +X_PREFIX= endif + +noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) +module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) +moddefine = $(X_PREFIX) $(XFT_PREFIX) +moduledir = $(libdir)/pango/modules +moduleflags=-rpath $(libdir) + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS) pango_arabic_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module @@ -33,8 +55,8 @@ pango_arabic_la_SOURCES = $(sources) libpango_arabic_la_SOURCES = $(sources) - pango_arabic_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module pango_arabic_xft_la_LIBADD = -pango_arabic_xft_la_SOURCES = arabic-xft.c arabic-ot.c arabic-ot.h +pango_arabic_xft_la_SOURCES = $(xft_sources) +libpango_arabic_xft_la_SOURCES = $(xft_sources) diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c index 6ca37eee..b1dde7af 100644 --- a/modules/arabic/arabic-fc.c +++ b/modules/arabic/arabic-fc.c @@ -327,8 +327,8 @@ arabic_engine_xft_new () * to have distinct names for this module, so we prepend * _pango_arabic_ */ -#ifdef MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_arabic_##func +#ifdef XFT_MODULE_PREFIX +#define MODULE_ENTRY(func) _pango_arabic_xft_##func #else #define MODULE_ENTRY(func) func #endif diff --git a/modules/arabic/arabic-xft.c b/modules/arabic/arabic-xft.c index 6ca37eee..b1dde7af 100644 --- a/modules/arabic/arabic-xft.c +++ b/modules/arabic/arabic-xft.c @@ -327,8 +327,8 @@ arabic_engine_xft_new () * to have distinct names for this module, so we prepend * _pango_arabic_ */ -#ifdef MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_arabic_##func +#ifdef XFT_MODULE_PREFIX +#define MODULE_ENTRY(func) _pango_arabic_xft_##func #else #define MODULE_ENTRY(func) func #endif diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index af7cd382..f3d0b191 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -3,27 +3,52 @@ basic_sources = basic.c if HAVE_XFT +if INCLUDE_BASIC_XFT +XFT_INCLUDED=libpango-basic-xft.la +XFT_MODULES= +XFT_PREFIX=-DXFT_MODULE_PREFIX +else +XFT_INCLUDED= XFT_MODULES=pango-basic-xft.la +XFT_PREFIX= +endif else XFT_MODULES= +XFT_INCLUDED= +XFT_PREFIX= endif if HAVE_FREETYPE +if INCLUDE_BASIC_FT2 +FT2_INCLUDED=libpango-basic-ft2.la +FT2_MODULES= +FT2_PREFIX=-DFT2_MODULE_PREFIX +else +FT2_INCLUDED= FT2_MODULES=pango-basic-ft2.la +FT2_PREFIX= +endif else FT2_MODULES= +FT2_INCLUDED= +FT2_PREFIX= endif - if INCLUDE_BASIC -noinst_LTLIBRARIES = libpango-basic.la -moddefine = -DMODULE_PREFIX - +X_INCLUDED=libpango-basic.la +X_MODULES= +X_PREFIX=-DMODULE_PREFIX else +X_INCLUDED= +X_MODULES=pango-basic.la +X_PREFIX= +endif + +noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) +module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) +moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) moduledir = $(libdir)/pango/modules -module_LTLIBRARIES = $(FT2_MODULES) $(XFT_MODULES) pango-basic.la moduleflags=-rpath $(libdir) -endif INCLUDES = \ -I$(top_srcdir) \ @@ -35,21 +60,22 @@ INCLUDES = \ pango_basic_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module pango_basic_la_LIBADD = pango_basic_la_SOURCES = $(basic_sources) - libpango_basic_la_SOURCES = $(basic_sources) pango_basic_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module pango_basic_xft_la_LIBADD = pango_basic_xft_la_SOURCES = basic-xft.c +libpango_basic_xft_la_SOURCES = basic-xft.c pango_basic_ft2_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module pango_basic_ft2_la_LIBADD = $(FREETYPE_LIBS) pango_basic_ft2_la_SOURCES = basic-ft2.c +libpango_basic_ft2_la_SOURCES = basic-ft2.c EXTRA_DIST = \ tables-big.i \ tables-small.i \ basic-win32.c \ - basic-ft2.c \ makefile.mingw \ makefile.mingw.in + diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c index c9be386c..6f6e869a 100644 --- a/modules/basic/basic-fc.c +++ b/modules/basic/basic-fc.c @@ -252,10 +252,10 @@ basic_engine_xft_new () * entry points script_engine_list, etc. But if we are compiling * it for inclusion directly in Pango, then we need them to * to have distinct names for this module, so we prepend - * _pango_basic_ + * _pango_basic_xft_ */ -#ifdef MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_basic_##func +#ifdef XFT_MODULE_PREFIX +#define MODULE_ENTRY(func) _pango_basic_xft_##func #else #define MODULE_ENTRY(func) func #endif diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c index ed0f3e98..38d03800 100644 --- a/modules/basic/basic-ft2.c +++ b/modules/basic/basic-ft2.c @@ -314,8 +314,8 @@ basic_engine_ft2_new (void) /* The following three functions provide the public module API for * Pango */ -#ifdef MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_basic_##func +#ifdef FT2_MODULE_PREFIX +#define MODULE_ENTRY(func) _pango_basic_ft2_##func #else #define MODULE_ENTRY(func) func #endif diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c index c9be386c..6f6e869a 100644 --- a/modules/basic/basic-xft.c +++ b/modules/basic/basic-xft.c @@ -252,10 +252,10 @@ basic_engine_xft_new () * entry points script_engine_list, etc. But if we are compiling * it for inclusion directly in Pango, then we need them to * to have distinct names for this module, so we prepend - * _pango_basic_ + * _pango_basic_xft_ */ -#ifdef MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_basic_##func +#ifdef XFT_MODULE_PREFIX +#define MODULE_ENTRY(func) _pango_basic_xft_##func #else #define MODULE_ENTRY(func) func #endif -- cgit v1.2.1