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/basic/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/basic/Makefile.am')
| -rw-r--r-- | modules/basic/Makefile.am | 42 |
1 files changed, 34 insertions, 8 deletions
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 + |