diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-03 02:35:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-03 02:35:20 +0000 |
| commit | 94f39b93e929db7881070f4b5e1f5dc3c106e3fb (patch) | |
| tree | 1fa92651d4e9d2c7c41d413468f37bdb8095cd52 /pango/modules.h | |
| parent | e2ea77ce2f99c122a0087c28fcd9316be4d6e205 (diff) | |
| download | pango-94f39b93e929db7881070f4b5e1f5dc3c106e3fb.tar.gz | |
Make pangoxft depend on pangoft2.
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
pangoxft depend on pangoft2.
* pango/pangofc-fontmap.[ch]: Make pangofc-fontmap.cI
into a real base class.
* pango/pangofc-font.[ch]: Move some of the pangoxft/
pangoft2 implementation here.
* pango/pangoft2.c pango/pangoft2-fontmap.c
pango/pangoft2-private.h pango/pangoxft-font.c
pango/pangoxft2-fontmap.c pango/pangoxft-private.h: Adapt
to the new scheme
* modules/*/Makefile.am Modules/*/*/*-fc.c: Don't build
separate FT2 and Xft shapers, just build one Fc shaper.
* docs/pango-sections.txt docs/pango-docs.sgml
docs/tmpl/pangofc-font{,map}.sgml: Basic docs for
the new stuff.
* configure.in: Up pango_module_version to 1.4.0.
Diffstat (limited to 'pango/modules.h')
| -rw-r--r-- | pango/modules.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pango/modules.h b/pango/modules.h index 56707b06..c8f306df 100644 --- a/pango/modules.h +++ b/pango/modules.h @@ -26,8 +26,7 @@ #define __MODULES_H__ extern PangoIncludedModule _pango_included_x_modules[]; -extern PangoIncludedModule _pango_included_xft_modules[]; -extern PangoIncludedModule _pango_included_ft2_modules[]; +extern PangoIncludedModule _pango_included_fc_modules[]; extern PangoIncludedModule _pango_included_win32_modules[]; #endif /* __MODULES_H__ */ |