[vlc-devel] commit: -export-dynamic is no sense for libs, use -export-symbol ( or nothing) ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat May 24 09:37:35 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 24 10:39:07 2008 +0300| [67ad2d4678941860cb4bf8abbcb0b77a4c0a1616]
-export-dynamic is no sense for libs, use -export-symbol (or nothing)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67ad2d4678941860cb4bf8abbcb0b77a4c0a1616
---
configure.ac | 2 --
modules/common.am | 9 +--------
src/Makefile.am | 15 ++++-----------
3 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5d55244..6251a85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1080,8 +1080,6 @@ if test "${ac_cv_c_visibility_hidden}" != "no"; then
fi
fi
-AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"])
-
dnl Check for -fvisibility-inlines-hidden (breaks x86_64 linkers)
dnl AC_LANG_PUSH(C++)
dnl AC_CACHE_CHECK([if \$CXX accepts -fvisibility-inlines-hidden],
diff --git a/modules/common.am b/modules/common.am
index 1e08696..3762a2b 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -12,7 +12,6 @@ EXTRA_DIST = Modules.am
BUILT_SOURCES =
CLEANFILES = $(BUILT_SOURCES)
-if HAVE_PLUGINS
LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
@@ -20,17 +19,11 @@ AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
AM_LDFLAGS = -rpath '$(libvlcdir)' \
-avoid-version -module -no-undefined \
+ -export-symbol-regex ^vlc_entry \
-shrext $(LIBEXT) \
`$(VLC_CONFIG) --ldflags plugin $@`
AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLCCORE)
-if HAVE_COMPILER_EXPORT
-AM_LDFLAGS += -export-dynamic
-else
-AM_LDFLAGS += -export-symbol-regex ^vlc_entry
-endif
-endif
-
include $(srcdir)/Modules.am
if MAINTAINER_MODE
diff --git a/src/Makefile.am b/src/Makefile.am
index 7baf8ea..020a9b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,12 +178,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+ -export-symbols $(srcdir)/libvlccore.sym \
-version-info 0:0:0
-if HAVE_COMPILER_EXPORT
-libvlccore_la_LDFLAGS += -export-dynamic
-else
-libvlccore_la_LDFLAGS += -export-symbols $(srcdir)/libvlccore.sym
-endif
libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -191,12 +187,9 @@ libvlc_la_SOURCES = $(SOURCES_libvlc_control)
libvlc_la_LIBADD = libvlccore.la
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-DMODULE_STRING=\"control\"
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_la_LDFLAGS += -export-dynamic
-else
-libvlc_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
-endif
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+ -version-info 2:0:0 \
+ -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_beos) \
More information about the vlc-devel
mailing list