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.

9 files changed, 11 insertions, 48 deletions

diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 9f5ca3ec..d3e459e8 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -16,10 +16,6 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
@@ -35,7 +31,7 @@ fc_sources = \
 	arabic-ot.c \
 	arabic-ot.h
 
-pango_arabic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_arabic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_arabic_fc_la_LIBADD = $(pangoft2libs)
 pango_arabic_fc_la_SOURCES = $(fc_sources)
 libpango_arabic_fc_la_SOURCES = $(fc_sources)
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 4b9a30a1..570750b0 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -16,10 +16,6 @@ INCLUDES = 				\
 	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -33,7 +29,7 @@ module_LTLIBRARIES += pango-basic-x.la
 endif
 endif
 
-pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_basic_x_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_basic_x_la_LIBADD = $(pangoxlibs)
 pango_basic_x_la_SOURCES = basic-x.c
 libpango_basic_x_la_SOURCES = basic-x.c
@@ -49,7 +45,7 @@ module_LTLIBRARIES += pango-basic-fc.la
 endif
 endif
 
-pango_basic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_basic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_basic_fc_la_LIBADD = $(pangoft2libs)
 pango_basic_fc_la_SOURCES = basic-fc.c
 libpango_basic_fc_la_SOURCES = basic-fc.c
@@ -64,7 +60,7 @@ module_LTLIBRARIES += pango-basic-win32.la
 endif
 endif
 
-pango_basic_win32_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_basic_win32_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32
 pango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_SOURCES = basic-win32.c
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index f4b07ff9..451e8367 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -12,10 +12,6 @@ INCLUDES = 				\
 	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -32,7 +28,7 @@ endif
 
 fc_sources = hangul-fc.c hangul-defs.h
 
-pango_hangul_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_hangul_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_hangul_fc_la_LIBADD = $(pangoft2libs)
 pango_hangul_fc_la_SOURCES = $(fc_sources)
 libpango_hangul_fc_la_SOURCES = $(fc_sources)
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index 1ff56ab1..b084924a 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -28,13 +28,9 @@ module_LTLIBRARIES += pango-hebrew-fc.la
 endif
 endif
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 hebrew_fc_sources = $(common_sources) hebrew-fc.c 
 
-pango_hebrew_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_hebrew_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_hebrew_fc_la_LIBADD = $(pangoft2libs)
 pango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
 libpango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 24722f57..06ee65de 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -12,10 +12,6 @@ INCLUDES =					\
 	-I$(top_srcdir)/pango			\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -38,7 +34,7 @@ fc_sources =		 	\
 	mprefixups.c		\
 	mprefixups.h
 
-pango_indic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_indic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_indic_fc_la_LIBADD = $(pangoft2libs)
 pango_indic_fc_la_SOURCES = $(fc_sources)
 libpango_indic_fc_la_SOURCES = $(fc_sources)
diff --git a/modules/khmer/Makefile.am b/modules/khmer/Makefile.am
index 51cc997d..47a12f7b 100644
--- a/modules/khmer/Makefile.am
+++ b/modules/khmer/Makefile.am
@@ -12,10 +12,6 @@ INCLUDES =					\
 	-I$(top_srcdir)/pango			\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -33,7 +29,7 @@ endif
 fc_sources =		 	\
 	khmer-fc.c
 
-pango_khmer_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_khmer_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_khmer_fc_la_LIBADD = $(pangoft2libs)
 pango_khmer_fc_la_SOURCES = $(fc_sources)
 libpango_khmer_fc_la_SOURCES = $(fc_sources)
diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am
index 0f8e3a3a..4b8a3853 100644
--- a/modules/syriac/Makefile.am
+++ b/modules/syriac/Makefile.am
@@ -16,11 +16,6 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
 if INCLUDE_SYRIAC_FC
@@ -35,7 +30,7 @@ fc_sources = \
 	syriac-ot.c \
 	syriac-ot.h
 
-pango_syriac_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_syriac_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_syriac_fc_la_LIBADD = $(pangoft2libs)
 pango_syriac_fc_la_SOURCES = $(fc_sources)
 libpango_syriac_fc_la_SOURCES = $(fc_sources)
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 63446ed4..dbaf3d30 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -12,10 +12,6 @@ INCLUDES =				\
 	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -34,7 +30,7 @@ endif
 
 thai_fc_sources = $(common_sources) thai-fc.c thai-ot.c thai-ot.h
 
-pango_thai_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_thai_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_thai_fc_la_LIBADD = $(pangoft2libs)
 pango_thai_fc_la_SOURCES = $(thai_fc_sources)
 libpango_thai_fc_la_SOURCES = $(thai_fc_sources)
diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am
index 2fe7f3bd..d8c822e0 100644
--- a/modules/tibetan/Makefile.am
+++ b/modules/tibetan/Makefile.am
@@ -11,10 +11,6 @@ INCLUDES =			\
 	-I$(top_srcdir)/pango	\
 	$(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -30,7 +26,7 @@ endif
 
 tibetan_fc_sources = $(common_sources) tibetan-fc.c
 
-pango_tibetan_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_tibetan_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
 pango_tibetan_fc_la_LIBADD = $(pangoft2libs)
 pango_tibetan_fc_la_SOURCES = $(tibetan_fc_sources)
 libpango_tibetan_fc_la_SOURCES = $(tibetan_fc_sources)