[glib/wip/visibility2: 1/2] Remove regexp-based export control
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/visibility2: 1/2] Remove regexp-based export control
- Date: Mon, 14 Jan 2013 04:49:11 +0000 (UTC)
commit ac7985bdda22019e698e0eb0214fbe867b5b34a6
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Jan 13 23:12:23 2013 -0500
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 9e48f90..bb9847b 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 b4edecf..f0568d1 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
@@ -504,7 +502,7 @@ uninstall-local: uninstall-ms-lib
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 951d102..73d98df 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
@@ -366,7 +364,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 19737fa..1829d14 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -67,7 +67,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 d9f3a09..e93f6b8 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 = $(LIBFFI_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]