Switch over the way that module entry points work, taking advantage of the

Mon Apr 14 06:02:34 2003  Owen Taylor  <otaylor@redhat.com>

        * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}:

        * modules/*/*-{xft,x,win32.c} pango/pango-engine.h
        modules/*/Makefile.am: Switch over the way that
        module entry points work, taking advantage of the
        new automake capability for per-target CFLAGS for
        shared sources.

        * pango/pangofc-font.[ch] pango/pangoxft-font.c
        pango/pangoft2.c: Add a base class for
        PangoXft and PangoFT2 font classes so code can
        be shared between FT2 and Xft backends.

        * configure.in modules/*/Makefile.am
        modules/{arabic,basic,hangul,hebrew,indic,thai}: Move
        *-xft.c to *-fc.c and share between Xft and FT2 backends;
        adds FT2 backend capabilities for hangul/indic/thai.

        * pango/pangoxft.h pango/pangoft2.h: Deprecate
        APIs that moved into PangoFcFont

        * modules/basic/basic-fc.c (set_glyph): Add kerning
        handling from FT2 backend.

1 files changed, 31 insertions, 7 deletions

diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 4df9443f..42912836 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -22,35 +22,30 @@ if HAVE_X
 INCLUDES += $(X_CFLAGS)
 if INCLUDE_MYANMAR_X
 noinst_LTLIBRARIES += libpango-myanmar-x.la
-INCLUDES += -DMYANMAR_X_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-myanmar-x.la
 endif
 
 if INCLUDE_GURMUKHI_X
 noinst_LTLIBRARIES += libpango-gurmukhi-x.la
-INCLUDES += -DGURMUKHI_X_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-gurmukhi-x.la
 endif
 
 if INCLUDE_BENGALI_X
 noinst_LTLIBRARIES += libpango-bengali-x.la
-INCLUDES += -DBENGALI_X_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-bengali-x.la
 endif
 
 if INCLUDE_DEVANAGARI_X
 noinst_LTLIBRARIES += libpango-devanagari-x.la
-INCLUDES += -DDEVANAGARI_X_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-devanagari-x.la
 endif
 
 if INCLUDE_GUJARATI_X
 noinst_LTLIBRARIES += libpango-gujarati-x.la
-INCLUDES += -DGUJARATI_X_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-gujarati-x.la
 endif
@@ -60,40 +55,44 @@ pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_devanagari_x_la_LIBADD = $(pangoxlibs)
 pango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h
 libpango_devanagari_x_la_SOURCES = devanagari-x.c pango-indic-script.h
+libpango_devanagari_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_devanagari_x
 
 pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_myanmar_x_la_LIBADD = $(pangoxlibs)
 pango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h
 libpango_myanmar_x_la_SOURCES = myanmar-x.c pango-indic-script.h
+libpango_myanmar_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_myanmar_x
 
 pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_gurmukhi_x_la_LIBADD = $(pangoxlibs)
 pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h
 libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c pango-indic-script.h
+libpango_gurmukhi_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_gurmukhi_x
 
 pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_bengali_x_la_LIBADD = $(pangoxlibs)
 pango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h
 libpango_bengali_x_la_SOURCES = bengali-x.c pango-indic-script.h
+libpango_bengali_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_bengali_x
 
 pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_gujarati_x_la_LIBADD = $(pangoxlibs)
 pango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h
 libpango_gujarati_x_la_SOURCES = gujarati-x.c pango-indic-script.h
+libpango_gujarati_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_gujarati_x
 
 
 if HAVE_XFT
 INCLUDES += $(XFT_CFLAGS)
 if INCLUDE_INDIC_XFT
 noinst_LTLIBRARIES += libpango-indic-xft.la
-INCLUDES += -DXFT_MODULE_PREFIX
 else
 module_LTLIBRARIES += pango-indic-xft.la
 endif
 endif
 
 xft_sources =		 	\
-	indic-xft.c		\
+	indic-fc.c		\
 	indic-ot-class-tables.c	\
 	indic-ot.c		\
 	indic-ot.h
@@ -101,7 +100,32 @@ xft_sources =		 	\
 pango_indic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_indic_xft_la_LIBADD = $(pangoxftlibs)
 pango_indic_xft_la_SOURCES = $(xft_sources)
+pango_indic_xft_la_CFLAGS = -DBUILD_XFT
 libpango_indic_xft_la_SOURCES = $(xft_sources)
+libpango_indic_xft_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_indic_xft
+
+
+if HAVE_FREETYPE
+INCLUDES += $(FREETYPE_CFLAGS)
+if INCLUDE_INDIC_FT2
+noinst_LTLIBRARIES += libpango-indic-ft2.la
+else
+module_LTLIBRARIES += pango-indic-ft2.la
+endif
+endif
+
+ft2_sources =		 	\
+	indic-fc.c		\
+	indic-ot-class-tables.c	\
+	indic-ot.c		\
+	indic-ot.h
+
+pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_indic_ft2_la_LIBADD = $(pangoft2libs)
+pango_indic_ft2_la_SOURCES = $(ft2_sources)
+pango_indic_ft2_la_CFLAGS = -DBUILD_FT2
+libpango_indic_ft2_la_SOURCES = $(ft2_sources)
+libpango_indic_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_indic_ft2
 
 
 included-modules: $(noinst_LTLIBRARIES)