Commit 67ad2d46 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

-export-dynamic is no sense for libs, use -export-symbol (or nothing)

parent 54dc1499
...@@ -1080,8 +1080,6 @@ if test "${ac_cv_c_visibility_hidden}" != "no"; then ...@@ -1080,8 +1080,6 @@ if test "${ac_cv_c_visibility_hidden}" != "no"; then
fi fi
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 Check for -fvisibility-inlines-hidden (breaks x86_64 linkers)
dnl AC_LANG_PUSH(C++) dnl AC_LANG_PUSH(C++)
dnl AC_CACHE_CHECK([if \$CXX accepts -fvisibility-inlines-hidden], dnl AC_CACHE_CHECK([if \$CXX accepts -fvisibility-inlines-hidden],
......
...@@ -12,7 +12,6 @@ EXTRA_DIST = Modules.am ...@@ -12,7 +12,6 @@ EXTRA_DIST = Modules.am
BUILT_SOURCES = BUILT_SOURCES =
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
if HAVE_PLUGINS
LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@` AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
...@@ -20,17 +19,11 @@ AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@` ...@@ -20,17 +19,11 @@ AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@` AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
AM_LDFLAGS = -rpath '$(libvlcdir)' \ AM_LDFLAGS = -rpath '$(libvlcdir)' \
-avoid-version -module -no-undefined \ -avoid-version -module -no-undefined \
-export-symbol-regex ^vlc_entry \
-shrext $(LIBEXT) \ -shrext $(LIBEXT) \
`$(VLC_CONFIG) --ldflags plugin $@` `$(VLC_CONFIG) --ldflags plugin $@`
AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLCCORE) 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 include $(srcdir)/Modules.am
if MAINTAINER_MODE if MAINTAINER_MODE
......
...@@ -178,12 +178,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ ...@@ -178,12 +178,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
-export-symbols $(srcdir)/libvlccore.sym \
-version-info 0:0:0 -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_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
libvlccore_la_DEPENDENCIES = libvlccore.sym libvlccore_la_DEPENDENCIES = libvlccore.sym
...@@ -191,12 +187,9 @@ libvlc_la_SOURCES = $(SOURCES_libvlc_control) ...@@ -191,12 +187,9 @@ libvlc_la_SOURCES = $(SOURCES_libvlc_control)
libvlc_la_LIBADD = libvlccore.la libvlc_la_LIBADD = libvlccore.la
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-DMODULE_STRING=\"control\" -DMODULE_STRING=\"control\"
libvlc_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:0 libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
if HAVE_COMPILER_EXPORT -version-info 2:0:0 \
libvlc_la_LDFLAGS += -export-dynamic -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
else
libvlc_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
endif
EXTRA_libvlccore_la_SOURCES = \ EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_beos) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment