From e684b424fbd7cea2f9780a518624b64368f372ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 16 Dec 2007 20:59:21 +0000 Subject: [PATCH] Move plugin ABI version (MODULE_SYMBOL) out of build system. --- configure.ac | 7 ------- include/vlc_modules_macros.h | 5 +++++ modules/genmf | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 2283427641..c1f36265eb 100644 --- a/configure.ac +++ b/configure.ac @@ -6082,13 +6082,6 @@ AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) -dnl New definitions with value matching 0.9.0 release -module_symbol="0_9_0d" -AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions]) -AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions]) -VLC_ENTRY="vlc_entry__${module_symbol}" -AC_SUBST(VLC_ENTRY) - dnl dnl Handle substvars that use $(top_srcdir) dnl diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h index 0870740188..de8f8e26d3 100644 --- a/include/vlc_modules_macros.h +++ b/include/vlc_modules_macros.h @@ -32,6 +32,11 @@ # define MODULE_NAME main #endif +/** + * Current plugin ABI version + */ +# define MODULE_SUFFIX __0_9_0e + /***************************************************************************** * Add a few defines. You do not want to read this section. Really. *****************************************************************************/ diff --git a/modules/genmf b/modules/genmf index 9d79c13259..94e24c0c5e 100755 --- a/modules/genmf +++ b/modules/genmf @@ -53,7 +53,7 @@ AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\ if HAVE_COMPILER_EXPORT AM_LDFLAGS += -export-dynamic else -AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$ +AM_LDFLAGS += -export-symbol-regex ^vlc_entry endif AM_LIBADD = \$(LTLIBVLC) endif -- 2.39.5