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 /pango/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 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 66287f9f..56e03616 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -69,7 +69,7 @@ libpango_la_SOURCES = \ libpangox_la_SOURCES = \ modules.h \ - module-defs.c \ + module-defs-x.c \ pangox.c \ pangox-private.h \ pangox-fontcache.c \ @@ -87,13 +87,13 @@ libpango_la_LIBADD = mini-fribidi/libmini-fribidi.la endif libpangox_la_LDFLAGS = -release $(VERSION) -libpangox_la_LIBADD = $(INCLUDED_MODULES) $(X_LIBS) - +libpangox_la_LIBADD = $(X_LIBS) $(INCLUDED_X_MODULES) libpangoxft_la_SOURCES = \ pangoxft-font.c \ - pangoxft-fontmap.c + pangoxft-fontmap.c \ + module-defs-xft.c -libpangoxft_la_LIBADD = $(INCLUDED_MODULES) $(XFT_LIBS) opentype/libpango-ot.la +libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la libpangoxft_la_LDFLAGS = -release $(VERSION) libpangoft2_la_SOURCES = \ @@ -101,10 +101,11 @@ libpangoft2_la_SOURCES = \ pangoft2.c \ pangoft2-private.h \ pangoft2-fontcache.c \ - pangoft2-fontmap.c + pangoft2-fontmap.c \ + module-defs-ft2.c -libpangoxft_la_LIBADD = $(INCLUDED_MODULES) $(FREETYPE_LIBS) -libpangoxft_la_LDFLAGS = -release $(VERSION) +libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) +libpangoft2_la_LDFLAGS = -release $(VERSION) pangoincludedir=$(includedir)/pango-1.0/pango @@ -155,6 +156,7 @@ EXTRA_DIST = \ $(pango_built_headers) \ makeenums.pl \ module-defs.c.win32 \ + module-defs.h \ pango.def \ pangowin32.def \ pangowin32.h \ |