Move plugin ABI version (MODULE_SYMBOL) out of build system.

diff --git a/configure.ac b/configure.ac
index 228342764164c646acfe2937d5e1c7c00f9fa413..c1f36265eba2a283f0b1e2a8fd5146653bb2c91b 100644 (file)
--- 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 0870740188814e54763fa0c9ece4b31212b3476c..de8f8e26d390e3fece4811234fad1242cbcdc0c8 100644 (file)
--- 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 9d79c132591b03f0a20a196eb7f253ec87845e5f..94e24c0c5eb33d8fb241f98786bafc01f5302cf6 100755 (executable)
--- 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