modules: allow '-' in module filenames
authorThomas Guillem <thomas@gllm.fr>
Tue, 31 Mar 2015 11:20:53 +0000 (11:20 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 1 Apr 2015 10:26:08 +0000 (12:26 +0200)
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@videolan.org>
modules/common.am

index c3b3f8e..9ac2929 100644 (file)
@@ -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