modules: set MODULE_NAME_IS_... where needed only

modules/common.am

@@ -18,7 +18,6 @@ LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}")
 
 AM_CPPFLAGS = \
-	-DMODULE_NAME_IS_$(MODULE_NAME) \
 	-DMODULE_STRING=\"$(MODULE_NAME)\"
 if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -D__PLUGIN__

modules/genmf

@@ -44,7 +44,8 @@ EOF
     cat >> "${makf}" << EOF
 
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
-lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod})
+lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod}) \
+	-DMODULE_NAME_IS_${mod}
 lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS) \$(CFLAGS_${mod})
 lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS) \$(CXXFLAGS_${mod})
 lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS) \$(OBJCFLAGS_${mod})

modules/video_chroma/Makefile.am

@@ -22,13 +22,15 @@ libi420_rgb_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libi420_rgb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 
 libi420_yuy2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
-libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i420_yuy2
 
 libi422_i420_plugin_la_SOURCES = i422_i420.c
 libi422_i420_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libi422_yuy2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
-libi422_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi422_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i422_yuy2
 
 librv32_plugin_la_SOURCES = rv32.c
 librv32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -55,6 +57,8 @@ EXTRA_LTLIBRARIES = libswscale_plugin.la libchroma_omx_plugin.la
 
 # AltiVec
 libi420_yuy2_altivec_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
+libi420_yuy2_altivec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i420_yuy2_altivec
 libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALTIVEC_CFLAGS)
 
 if HAVE_ALTIVEC
@@ -68,10 +72,12 @@ libi420_rgb_mmx_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
 libi420_rgb_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMMX
 
 libi420_yuy2_mmx_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
-libi420_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi420_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i420_yuy2_mmx
 
 libi422_yuy2_mmx_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
-libi422_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi422_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i422_yuy2_mmx
 
 if HAVE_MMX
 chroma_LTLIBRARIES += \
@@ -86,10 +92,12 @@ libi420_rgb_sse2_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
 libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2
 
 libi420_yuy2_sse2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
-libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i420_yuy2_sse2
 
 libi422_yuy2_sse2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
-libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_i422_yuy2_sse2
 
 if HAVE_SSE2
 chroma_LTLIBRARIES += \

modules/video_output/Modules.am

@@ -98,7 +98,8 @@ vout_LTLIBRARIES += $(LTLIBxcb_xv) $(LTLIBxcb_glx)
 ### Win32 ###
 libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h
-libdirect2d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_direct2d
 libdirect2d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
 libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect2d)
@@ -106,7 +107,8 @@ EXTRA_LTLIBRARIES += libdirect2d_plugin.la
 
 libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h
-libdirect3d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_direct3d
 libdirect3d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
 libdirect3d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d)
@@ -114,7 +116,8 @@ EXTRA_LTLIBRARIES += libdirect3d_plugin.la
 
 libdirectdraw_plugin_la_SOURCES = msw/directx.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h
-libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_directdraw
 libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
 if HAVE_DIRECTX
 vout_LTLIBRARIES += libdirectdraw_plugin.la
@@ -122,7 +125,8 @@ endif
 
 libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
 	msw/common.c msw/common.h msw/events.c msw/events.h
-libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS)
+libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_glwin32
 libglwin32_plugin_la_LIBADD = $(AM_LIBADD) -lopengl32 -lgdi32 -lole32 -luuid
 libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBglwin32)
@@ -130,7 +134,8 @@ EXTRA_LTLIBRARIES += libglwin32_plugin.la
 
 libwingdi_plugin_la_SOURCES = msw/wingdi.c \
 	msw/common.c msw/common.h msw/events.c msw/events.h
-libwingdi_plugin_la_CFLAGS = $(AM_CFLAGS)
+libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_wingdi
 libwingdi_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
 if HAVE_WIN32
 vout_LTLIBRARIES += libwingdi_plugin.la