diff options
| author | Alexander Larsson <alexl@redhat.com> | 2001-01-03 10:45:12 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-01-03 10:45:12 +0000 |
| commit | d5b358fe3e5123842533ea445460d8a337eced5d (patch) | |
| tree | c51bb9232a7933ca280f68737a0c60b4c9b11250 /modules/arabic/Makefile.am | |
| parent | dc23b8bf572adc64cb57be39fdaf02732e50bb72 (diff) | |
| download | pango-d5b358fe3e5123842533ea445460d8a337eced5d.tar.gz | |
Update the default list of included modules for
2001-01-03 Alexander Larsson <alexl@redhat.com>
* 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.
Diffstat (limited to 'modules/arabic/Makefile.am')
| -rw-r--r-- | modules/arabic/Makefile.am | 36 |
1 files changed, 29 insertions, 7 deletions
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) |