[vlc-commits] modules: allow '-' in module filenames

Thomas Guillem git at videolan.org
Wed Apr 1 12:42:57 CEST 2015


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 31 11:20:53 2015 +0000| [c7e2d546755edb533bf5b5bf0ca7726d92b2b92a] | committer: Jean-Baptiste Kempf

modules: allow '-' in module filenames

In include/vlc_plugin.h, CONCATENATE was failing due to an unexpected '-'
character.

This fixes build with static modules.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7e2d546755edb533bf5b5bf0ca7726d92b2b92a
---

 modules/common.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/common.am b/modules/common.am
index c3b3f8e..9ac2929 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -15,7 +15,7 @@ CLEANFILES = $(BUILT_SOURCES)
 LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
 # Module name from object or executable file name.
-MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p="$${p%.lo}"; echo "$$p")
+MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p="$${p//-/\_}"; p="$${p%.lo}"; echo "$$p")
 
 AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
 if HAVE_DYNAMIC_PLUGINS



More information about the vlc-commits mailing list