From 304950a7ac9866dca990dcabb02ec5297c735ce8 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Sun, 13 Jan 2013 23:12:23 -0500 Subject: [PATCH] Remove regexp-based export control --- configure.ac | 10 ---------- gio/Makefile.am | 4 +--- glib/Makefile.am | 4 +--- gmodule/Makefile.am | 2 +- gobject/Makefile.am | 5 +---- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 4f618687f..aea8ba562 100644 --- a/configure.ac +++ b/configure.ac @@ -210,16 +210,6 @@ AS_IF([test "$glib_native_win32" = "yes"], [ ]) AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes]) -if test "$glib_native_win32" != yes; then - # libtool option to control which symbols are exported - # right now, symbols starting with _ are not exported - LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^g.*"' -else - # We currently use .def files on Windows - LIBTOOL_EXPORT_OPTIONS= -fi -AC_SUBST(LIBTOOL_EXPORT_OPTIONS) - AS_IF([test "x$glib_have_carbon" = "xyes"], [ AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" diff --git a/gio/Makefile.am b/gio/Makefile.am index 7d6f91591..3b7b0eadd 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -492,8 +492,6 @@ endif if OS_WIN32_AND_DLL_COMPILATION gio_win32_res = gio-win32-res.o gio_win32_res_ldflag = -Wl,$(gio_win32_res) -else -export_symbols = $(LIBTOOL_EXPORT_OPTIONS) endif install-data-local: install-ms-lib @@ -505,7 +503,7 @@ libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(gio_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) $(export_symbols) + -export-dynamic $(no_undefined) if OS_COCOA # This is dumb. The ObjC source file should be properly named .m diff --git a/glib/Makefile.am b/glib/Makefile.am index 98c597801..c092d7c93 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -348,8 +348,6 @@ endif if OS_WIN32_AND_DLL_COMPILATION glib_win32_res = glib-win32-res.o glib_win32_res_ldflag = -Wl,$(glib_win32_res) -else -export_symbols = $(LIBTOOL_EXPORT_OPTIONS) endif if USE_SYSTEM_PCRE @@ -367,7 +365,7 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(glib_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) $(export_symbols) + -export-dynamic $(no_undefined) INSTALL_PROGS= diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 92b844a41..562a81f2f 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -68,7 +68,7 @@ libgmodule_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(gmodule_win32_res_ldflag) \ $(G_MODULE_LDFLAGS) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) $(export_symbols) + -export-dynamic $(no_undefined) libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 615a78030..ef978a5ac 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -51,16 +51,13 @@ endif if OS_WIN32_AND_DLL_COMPILATION gobject_win32_res = gobject-win32-res.o gobject_win32_res_ldflag = -Wl,$(gobject_win32_res) -else -export_symbols = $(LIBTOOL_EXPORT_OPTIONS) endif -# libtool stuff: set version and export symbols for resolving libgobjectincludedir = $(includedir)/glib-2.0/gobject libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ $(gobject_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) $(export_symbols) + -export-dynamic $(no_undefined) libgobject_2_0_la_CFLAGS = $(AM_CFLAGS) $(LIBFFI_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)