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.

2 files changed, 12 insertions, 40 deletions

diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index f4480151..7f9297d1 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES =			\
@@ -20,31 +18,12 @@ noinst_LTLIBRARIES =
 common_sources = hebrew-shaper.c hebrew-shaper.h
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_HEBREW_XFT
-noinst_LTLIBRARIES += libpango-hebrew-xft.la
-else
-module_LTLIBRARIES += pango-hebrew-xft.la
-endif
-endif
-
-hebrew_xft_sources = $(common_sources) hebrew-fc.c 
-
-pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_hebrew_xft_la_LIBADD = $(pangoxftlibs)
-pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
-pango_hebrew_xft_la_CFLAGS = -DBUILD_XFT
-libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
-libpango_hebrew_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_hebrew_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_HEBREW_FT2
-noinst_LTLIBRARIES += libpango-hebrew-ft2.la
+if INCLUDE_HEBREW_FC
+noinst_LTLIBRARIES += libpango-hebrew-fc.la
 else
-module_LTLIBRARIES += pango-hebrew-ft2.la
+module_LTLIBRARIES += pango-hebrew-fc.la
 endif
 endif
 
@@ -52,14 +31,13 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-hebrew_ft2_sources = $(common_sources) hebrew-fc.c 
+hebrew_fc_sources = $(common_sources) hebrew-fc.c 
 
-pango_hebrew_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_hebrew_ft2_la_LIBADD = $(pangoft2libs)
-pango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources)
-pango_hebrew_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources)
-libpango_hebrew_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_hebrew_ft2
+pango_hebrew_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_hebrew_fc_la_LIBADD = $(pangoft2libs)
+pango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
+libpango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
+libpango_hebrew_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hebrew_fc
 
 
 included-modules: $(noinst_LTLIBRARIES)
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index a18e3d09..273755e4 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -34,15 +34,9 @@ static PangoEngineRange hebrew_ranges[] = {
   { 0xfb1d, 0xfb4f, "*" }  /* Hebrew presentation forms */
 };
 
-#ifdef BUILD_XFT2	  
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "HebrewScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "HebrewScriptEngineFt2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "HebrewScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 static PangoEngineInfo script_engines[] = {
   {