Use -export-symbols-regex to control symbol exports, including not

2005-07-22  Owen Taylor  <otaylor@redhat.com>

        * pango/Makefile.a configure.in: Use -export-symbols-regex
        to control symbol exports, including not exporting the symbols
        from opentype/.

        * modules/*/Makefile.am: Control symbol exports here as well,
        simplify using AC_SUBST() of MODULE_LIBTOOL_OPTIONS from configure.in.

        * pango/pangox-fontmap.c (engine_shape_covers): Cut-and-paste
        engine_shape_covers to avoid using a symbol from libpango.

        * pango/pango-utils.c: Make accidentally exported pango_aliases_ht
        static.

3 files changed, 24 insertions, 12 deletions

diff --git a/pango/Makefile.am b/pango/Makefile.am
index 1d20d1b9..b4c59c2f 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -32,10 +32,6 @@ BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
 
 pangoincludedir=$(includedir)/pango-1.0/pango
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 if OS_WIN32
 else
 libm = -lm
@@ -45,7 +41,7 @@ endif
 
 lib_LTLIBRARIES = libpango-1.0.la
 
-libpango_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la $(libm)
 libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la
 
@@ -151,7 +147,7 @@ pangoinclude_HEADERS += pangox.h
 lib_LTLIBRARIES += libpangox-1.0.la
 endif
 
-libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) $(GLIB_LIBS)
 libpangox_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES)
 
@@ -171,7 +167,7 @@ pangoinclude_HEADERS += pangoft2.h pango-ot.h pangofc-decoder.h
 lib_LTLIBRARIES += libpangoft2-1.0.la
 endif
 
-libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) $(libm)
 libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES)
 
@@ -202,7 +198,7 @@ pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h
 lib_LTLIBRARIES += libpangoxft-1.0.la
 endif
 
-libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS)
 libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la
 
@@ -220,7 +216,7 @@ pangoinclude_HEADERS += pangocairo.h
 lib_LTLIBRARIES += libpangocairo-1.0.la
 endif
 
-libpangocairo_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(CAIRO_LIBS) $(GLIB_LIBS)
 libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la
 
@@ -254,7 +250,7 @@ pangoinclude_HEADERS += pangowin32.h
 lib_LTLIBRARIES += libpangowin32-1.0.la
 endif
 
-libpangowin32_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)	$(no_undefined)
+libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangowin32_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) $(GLIB_LIBS)
 libpangowin32_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES)
 
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 85bc0d7d..b8a367e8 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -58,7 +58,7 @@ struct PangoAlias
   gboolean visible; /* Do we want/need this? */
 };
 
-GHashTable *pango_aliases_ht = NULL;
+static GHashTable *pango_aliases_ht = NULL;
 
 /**
  * pango_trim_string:
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index 0227da28..aaa28aad 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -1512,6 +1512,22 @@ pango_x_face_get_type (void)
   return object_type;
 }
 
+/* Cut and paste here to avoid an inter-module dependency */
+static PangoCoverageLevel
+engine_shape_covers (PangoEngineShape *engine,
+		     PangoFont        *font,
+		     PangoLanguage    *language,
+		     gunichar          wc)
+{
+  g_return_val_if_fail (PANGO_IS_ENGINE_SHAPE (engine), PANGO_COVERAGE_NONE);
+  g_return_val_if_fail (PANGO_IS_FONT (font), PANGO_COVERAGE_NONE);
+
+  return PANGO_ENGINE_SHAPE_GET_CLASS (engine)->covers (engine,
+							font,
+							language,
+							wc);
+}
+
 PangoCoverage *
 pango_x_face_get_coverage (PangoXFace      *xface,
 			   PangoFont       *font,
@@ -1558,7 +1574,7 @@ pango_x_face_get_coverage (PangoXFace      *xface,
 	{
 	  PangoCoverageLevel level;
 
-	  level = _pango_engine_shape_covers (engine, font, language, wc);
+	  level = engine_shape_covers (engine, font, language, wc);
 	  if (level != PANGO_COVERAGE_NONE)
 	    pango_coverage_set (result, wc, level);
 	}