Move MODULE_* predefined constants from vlc-config to Makefile

diff --git a/modules/common.am b/modules/common.am
index 5cecb189cddd5ff3dd73a96fc7ee974178ecee00..ad64737e8c86f127b82f336f4faa02ab81cc1e97 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -13,7 +13,14 @@ CLEANFILES = $(BUILT_SOURCES)
 
 LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
-AM_CPPFLAGS = -D__PLUGIN__
+# Module name from object or executable file name.
+MODULE_NAME = `p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}"`
+
+AM_CPPFLAGS = \
+       -DMODULE_NAME=$(MODULE_NAME) \
+       -DMODULE_NAME_IS_$(MODULE_NAME) \
+       -DMODULE_STRING=\"$(MODULE_NAME)\"
+       -D__PLUGIN__
 AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
 AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
 AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`

diff --git a/src/Makefile.am b/src/Makefile.am
index 394d76638253e948072c6eddbfa3c3bd970c48c3..ba23fd50967b13285c6d1fa81206db598405e14e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -223,6 +223,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
        libvlccore.la ../compat/libcompat.la
+libvlc_la_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
        -version-info 6:0:1 \

diff --git a/vlc-config.in.in b/vlc-config.in.in
index be89ce4b7e22054ab403746c4eb26d52e41e2966..32876560474f31eb1e762776e0b20d9ac55d07e5 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -128,13 +128,6 @@ while test $# -gt 0; do
   shift
 done
 
-#
-#  If a module was requested, use its name
-#
-if test -n "${module}"; then
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
-fi
-
 #
 #  Output what we were asked
 #