modules: simplify CPPFLAGS & CFLAGS

modules/access/Makefile.am

@@ -9,11 +9,9 @@ accessdir = $(pluginsdir)/access
 ### Files ###
 
 libattachment_plugin_la_SOURCES = attachment.c
-libattachment_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 access_LTLIBRARIES += libattachment_plugin.la
 
 libfilesystem_plugin_la_SOURCES = fs.h file.c directory.c fs.c
-libfilesystem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libfilesystem_plugin_la_LIBADD += -lshlwapi
@@ -21,29 +19,23 @@ endif
 access_LTLIBRARIES += libfilesystem_plugin.la
 
 libidummy_plugin_la_SOURCES = idummy.c
-libidummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 access_LTLIBRARIES += libidummy_plugin.la
 
 libimem_plugin_la_SOURCES = imem.c
-libimem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libimem_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 access_LTLIBRARIES += libimem_plugin.la
 
 librar_plugin_la_SOURCES = rar/rar.c rar/rar.h \
 	rar/access.c rar/stream.c rar/module.c
-librar_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 access_LTLIBRARIES += librar_plugin.la
 
 libsdp_plugin_la_SOURCES = sdp.c
-libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
 access_LTLIBRARIES += libsdp_plugin.la
 
 libtimecode_plugin_la_SOURCES = timecode.c
-libtimecode_plugin_la_CFLAGS = $(AM_CFLAGS)
 access_LTLIBRARIES += libtimecode_plugin.la
 
 libvdr_plugin_la_SOURCES = vdr.c
-libvdr_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 access_LTLIBRARIES += libvdr_plugin.la
 
 libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c
@@ -73,7 +65,6 @@ access_LTLIBRARIES += libaccess_alsa_plugin.la
 endif
 
 libaccess_oss_plugin_la_SOURCES = oss.c
-libaccess_oss_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS)
 if HAVE_OSS
 access_LTLIBRARIES += libaccess_oss_plugin.la
@@ -127,7 +118,6 @@ liblinsys_hdsdi_plugin_la_SOURCES = \
 	linsys/linsys_sdiaudio.h \
 	linsys/linsys_sdivideo.h \
 	linsys/linsys_hdsdi.c
-liblinsys_hdsdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 liblinsys_sdi_plugin_la_SOURCES = linsys/linsys_sdi.c linsys/linsys_sdi.h
 liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
@@ -144,7 +134,6 @@ access_LTLIBRARIES += libdecklink_plugin.la
 endif
 
 libshm_plugin_la_SOURCES = shm.c
-libshm_plugin_la_CFLAGS = $(AM_CFLAGS)
 libshm_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 if HAVE_WIN32
 libshm_plugin_la_DEPENDENCIES = libshm_plugin.rc.o
@@ -180,7 +169,6 @@ endif
 
 libdshow_plugin_la_SOURCES = dshow/vlc_dshow.h dshow/dshow.cpp dshow/access.h \
 	dshow/filter.cpp dshow/filter.h dshow/crossbar.cpp
-libdshow_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
 libdshow_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -loleaut32 -luuid -lstrmiids -lksuser
 if HAVE_WIN32
 access_LTLIBRARIES += libdshow_plugin.la
@@ -200,7 +188,6 @@ access_LTLIBRARIES += libxcb_screen_plugin.la
 endif
 
 libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h
-libscreen_plugin_la_CFLAGS = $(AM_CFLAGS)
 libscreen_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libscreen_plugin_la_SOURCES += screen/win32.c
@@ -233,14 +220,8 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
 
 ### Optical media ###
 
-libvlc_cdrom_la_SOURCES = vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
-libvlc_cdrom_la_CPPFLAGS = -DMODULE_STRING=\"cdrom\"
-libvlc_cdrom_la_LDFLAGS = -static
-EXTRA_LTLIBRARIES += libvlc_cdrom.la
-
-libcdda_plugin_la_SOURCES = cdda.c
-libcdda_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libcdda_plugin_la_LIBADD = libvlc_cdrom.la $(AM_LIBADD)
+libcdda_plugin_la_SOURCES = cdda.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
+libcdda_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_DARWIN
 libcdda_plugin_la_LIBADD += -liconv
 endif
@@ -248,9 +229,8 @@ libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 EXTRA_LTLIBRARIES += libcdda_plugin.la
 access_LTLIBRARIES += $(LTLIBcdda)
 
-libvcd_plugin_la_SOURCES = vcd/vcd.c
-libvcd_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libvcd_plugin_la_LIBADD = libvlc_cdrom.la $(AM_LIBADD)
+libvcd_plugin_la_SOURCES = vcd/vcd.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
+libvcd_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_DARWIN
 libvcd_plugin_la_LIBADD += -liconv
 endif
@@ -294,7 +274,6 @@ access_LTLIBRARIES += $(LTLIBlibbluray)
 EXTRA_LTLIBRARIES += liblibbluray_plugin.la
 
 libaccess_bd_plugin_la_SOURCES = bd/bd.c bd/mpls.c bd/mpls.h bd/clpi.c bd/clpi.h
-libaccess_bd_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_bd_plugin_la_LIBADD = $(AM_LIBADD)
 access_LTLIBRARIES += libaccess_bd_plugin.la
 if HAVE_WIN32
@@ -325,7 +304,6 @@ if HAVE_WIN32
 # Work-around automake bug:
 # Use an import library for C++ to retain C linker on other platforms.
 libbda_la_SOURCES = dtv/bdadefs.h dtv/bdagraph.cpp dtv/bdagraph.hpp
-libbda_la_CXXFLAGS = $(AM_CXXFLAGS)
 libbda_la_LDFLAGS = -static
 libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
 noinst_LTLIBRARIES += libbda.la
@@ -353,7 +331,6 @@ endif
 endif
 
 libaccess_eyetv_plugin_la_SOURCES = eyetv.m
-libaccess_eyetv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libaccess_eyetv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \
 	-Wl,-framework,Foundation
 access_LTLIBRARIES += $(LTLIBaccess_eyetv)
@@ -363,12 +340,10 @@ EXTRA_LTLIBRARIES += libaccess_eyetv_plugin.la
 ### Network streams ###
 
 libftp_plugin_la_SOURCES = ftp.c
-libftp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libftp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 access_LTLIBRARIES += libftp_plugin.la
 
 libhttp_plugin_la_SOURCES = http.c
-libhttp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libhttp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 if HAVE_ZLIB
 libhttp_plugin_la_LIBADD += -lz
@@ -376,7 +351,6 @@ endif
 access_LTLIBRARIES += libhttp_plugin.la
 
 liblive555_plugin_la_SOURCES = live555.cpp mms/asf.c mms/buffer.c
-liblive555_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555)
 liblive555_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_live555)
 liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \
@@ -406,12 +380,10 @@ access_LTLIBRARIES += $(LTLIBsmb)
 EXTRA_LTLIBRARIES += libsmb_plugin.la
 
 libtcp_plugin_la_SOURCES = tcp.c
-libtcp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libtcp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 access_LTLIBRARIES += libtcp_plugin.la
 
 libudp_plugin_la_SOURCES = udp.c
-libudp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libudp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 access_LTLIBRARIES += libudp_plugin.la
 
@@ -429,7 +401,6 @@ libaccess_realrtsp_plugin_la_SOURCES = \
 	rtsp/real_rmff.c rtsp/real_rmff.h \
 	rtsp/real_sdpplin.c rtsp/real_sdpplin.h \
 	rtsp/real_asmrp.c
-libaccess_realrtsp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_realrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 access_LTLIBRARIES += $(LTLIBaccess_realrtsp)

modules/audio_filter/Modules.am

@@ -52,11 +52,7 @@ SOURCES_dtstospdif = converter/dtstospdif.c
 SOURCES_dtstofloat32 = converter/dtstofloat32.c
 SOURCES_mpgatofixed32 = converter/mpgatofixed32.c
 libaudio_format_plugin_la_SOURCES = converter/format.c
-libaudio_format_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaudio_format_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
-if HAVE_WIN32
-libaudio_format_plugin_la_DEPENDENCIES = libaudio_format_plugin.rc.o
-endif
 
 audio_filter_LTLIBRARIES += \
 	liba52tospdif_plugin.la \

modules/audio_mixer/Makefile.am

@@ -2,14 +2,12 @@ include $(top_srcdir)/modules/common.am
 audio_mixerdir = $(pluginsdir)/audio_mixer
 
 libfloat_mixer_plugin_la_SOURCES = float.c
-libfloat_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
 libfloat_mixer_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 if HAVE_WIN32
 libfloat_mixer_plugin_la_DEPENDENCIES = libfloat_mixer_plugin.rc.o
 endif
 
 libinteger_mixer_plugin_la_SOURCES = integer.c
-libinteger_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
 libinteger_mixer_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libinteger_mixer_plugin_la_DEPENDENCIES = libinteger_mixer_plugin.rc.o

modules/audio_output/Modules.am

@@ -7,11 +7,9 @@ SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
 SOURCES_audioqueue = audioqueue.c
 
 libopensles_android_plugin_la_SOURCES = opensles_android.c
-libopensles_android_plugin_la_CFLAGS = $(AM_CFLAGS)
 libopensles_android_plugin_la_LIBADD = $(AM_LIBADD) -ldl -lm
 
 libandroid_audiotrack_plugin_la_SOURCES = audiotrack.c
-libandroid_audiotrack_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_audiotrack_plugin_la_LIBADD = $(AM_LIBADD) -ldl
 
 if HAVE_ANDROID
@@ -19,21 +17,18 @@ aout_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.l
 endif
 
 libadummy_plugin_la_SOURCES = adummy.c
-libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 libadummy_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libadummy_plugin_la_DEPENDENCIES = libadummy_plugin.rc.o
 endif
 
 libafile_plugin_la_SOURCES = file.c
-libafile_plugin_la_CFLAGS = $(AM_CFLAGS)
 libafile_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libafile_plugin_la_DEPENDENCIES = libafile_plugin.rc.o
 endif
 
 libamem_plugin_la_SOURCES = amem.c
-libamem_plugin_la_CFLAGS = $(AM_CFLAGS)
 libamem_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libamem_plugin_la_DEPENDENCIES = libamem_plugin.rc.o
@@ -45,7 +40,6 @@ aout_LTLIBRARIES += \
 	libamem_plugin.la
 
 liboss_plugin_la_SOURCES = oss.c volume.h
-liboss_plugin_la_CFLAGS = $(AM_CFLAGS)
 liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM)
 if HAVE_OSS
 aout_LTLIBRARIES += liboss_plugin.la
@@ -74,7 +68,6 @@ aout_LTLIBRARIES += libjack_plugin.la
 endif
 
 libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
-libmmdevice_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmmdevice_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser
 if HAVE_WIN32
 libmmdevice_plugin_la_DEPENDENCIES = libmmdevice_plugin.rc.o
@@ -84,7 +77,6 @@ aout_LTLIBRARIES += libmmdevice_plugin.la
 endif
 
 libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
-libdirectsound_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdirectsound_plugin_la_LIBADD = $(AM_LIBADD) -lole32
 if HAVE_WIN32
 libdirectsound_plugin_la_DEPENDENCIES = libdirectsound_plugin.rc.o
@@ -94,14 +86,12 @@ aout_LTLIBRARIES += libdirectsound_plugin.la
 endif
 
 libkai_plugin_la_SOURCES = kai.c
-libkai_plugin_la_CFLAGS = $(AM_CFLAGS)
 libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS)
 if HAVE_KAI
 aout_LTLIBRARIES += libkai_plugin.la
 endif
 
 libsndio_plugin_la_SOURCES = sndio.c
-libsndio_plugin_la_CFLAGS = $(AM_CFLAGS)
 libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio
 if HAVE_SNDIO
 aout_LTLIBRARIES += libsndio_plugin.la

modules/codec/Modules.am

@@ -76,19 +76,14 @@ endif
 ### Audio codecs ###
 
 liba52_plugin_la_SOURCES = a52.c a52.h
-liba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libadpcm_plugin_la_SOURCES = adpcm.c
-libadpcm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libaes3_plugin_la_SOURCES = aes3.c
-libaes3_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libaraw_plugin_la_SOURCES = araw.c
-libaraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libdts_plugin_la_SOURCES = dts.c
-libdts_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libdts_plugin_la_LIBADD = libvlc_dts_header.la $(AM_LIBADD)
 
 libvlc_dts_header_la_SOURCES = dts_header.c dts_header.h
@@ -96,16 +91,12 @@ libvlc_dts_header_la_LDFLAGS = -static
 noinst_LTLIBRARIES += libvlc_dts_header.la
 
 libg711_plugin_la_SOURCES = g711.c
-libg711_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 liblpcm_plugin_la_SOURCES = lpcm.c
-liblpcm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libmpeg_audio_plugin_la_SOURCES = mpeg_audio.c
-libmpeg_audio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c
-libuleaddvaudio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 codec_LTLIBRARIES += \
 	liba52_plugin.la \

modules/common.am

@@ -15,10 +15,9 @@ 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}"; echo "$${p%_plugin*}")
+MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p="$${p%.lo}"; echo "$$p")
 
-AM_CPPFLAGS = \
-	-DMODULE_STRING=\"$(MODULE_NAME)\"
+AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
 if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -D__PLUGIN__
 else

modules/control/Modules.am

@@ -51,7 +51,6 @@ EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
 control_LTLIBRARIES += $(LTLIBxcb_hotkeys)
 
 libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
-libwin_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
 libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 control_LTLIBRARIES += libwin_hotkeys_plugin.la

modules/demux/Modules.am

@@ -32,14 +32,12 @@ SOURCES_image = image.c mxpeg_helper.h
 SOURCES_demux_stl = stl.c
 
 libasf_plugin_la_SOURCES = asf/asf.c asf/libasf.c asf/libasf.h asf/libasf_guid.h
-libasf_plugin_la_CFLAGS = $(AM_CFLAGS)
 libasf_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libasf_plugin_la_DEPENDENCIES = libasf_plugin.rc.o
 endif
 
 libavi_plugin_la_SOURCES = avi/avi.c avi/libavi.c avi/libavi.h
-libavi_plugin_la_CFLAGS = $(AM_CFLAGS)
 libavi_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libavi_plugin_la_DEPENDENCIES = libavi_plugin.rc.o
@@ -74,14 +72,12 @@ demux_LTLIBRARIES += libavformat_plugin.la
 endif
 
 libes_plugin_la_SOURCES  = mpeg/es.c
-libes_plugin_la_CFLAGS = $(AM_CFLAGS)
 libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la $(AM_LIBADD)
 if HAVE_WIN32
 libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o
 endif
 
 libh264_plugin_la_SOURCES = mpeg/h264.c
-libh264_plugin_la_CFLAGS = $(AM_CFLAGS)
 libh264_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libh264_plugin_la_DEPENDENCIES = libh264_plugin.rc.o
@@ -109,7 +105,6 @@ demux_LTLIBRARIES += $(LTLIBmkv)
 EXTRA_LTLIBRARIES += libmkv_plugin.la
 
 libmp4_plugin_la_SOURCES = mp4/mp4.c mp4/libmp4.c mp4/libmp4.h mp4/id3genres.h
-libmp4_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmp4_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_ZLIB
@@ -120,7 +115,6 @@ libmp4_plugin_la_DEPENDENCIES = libmp4_plugin.rc.o
 endif
 
 libmpgv_plugin_la_SOURCES = mpeg/mpgv.c
-libmpgv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmpgv_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libmpgv_plugin_la_DEPENDENCIES = libmpgv_plugin.rc.o
@@ -145,7 +139,6 @@ libplaylist_plugin_la_SOURCES = \
 	playlist/xspf.c \
 	playlist/zpl.c \
 	playlist/playlist.c playlist/playlist.h
-libplaylist_plugin_la_CFLAGS = $(AM_CFLAGS)
 libplaylist_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libplaylist_plugin_la_DEPENDENCIES = libplaylist_plugin.rc.o

modules/misc/Modules.am

@@ -13,7 +13,6 @@ libexport_plugin_la_SOURCES = \
 	playlist/m3u.c \
 	playlist/xspf.c \
 	playlist/export.c
-libexport_plugin_la_CFLAGS = $(AM_CFLAGS)
 libexport_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libexport_plugin_la_DEPENDENCIES = libexport_plugin.rc.o
@@ -31,7 +30,6 @@ EXTRA_LTLIBRARIES += libgnutls_plugin.la
 misc_LTLIBRARIES += $(LTLIBgnutls)
 
 libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
-libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
 libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_XCB
 misc_LTLIBRARIES += \
@@ -46,7 +44,6 @@ misc_LTLIBRARIES += libdbus_screensaver_plugin.la
 endif
 
 liblogger_plugin_la_SOURCES = logger.c
-liblogger_plugin_la_CFLAGS = $(AM_CFLAGS)
 liblogger_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_ANDROID
 liblogger_plugin_la_LIBADD += -llog
@@ -56,7 +53,6 @@ liblogger_plugin_la_DEPENDENCIES = liblogger_plugin.rc.o
 endif
 
 libstats_plugin_la_SOURCES = stats.c
-libstats_plugin_la_CFLAGS = $(AM_CFLAGS)
 libstats_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libstats_plugin_la_DEPENDENCIES = libstats_plugin.rc.o

modules/services_discovery/Modules.am

@@ -35,16 +35,13 @@ EXTRA_LTLIBRARIES += libudev_plugin.la
 sd_LTLIBRARIES += $(LTLIBudev)
 
 libxcb_apps_plugin_la_SOURCES = xcb_apps.c
-libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS)
-libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS)
+libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_LIBS)
 if HAVE_XCB
 sd_LTLIBRARIES += libxcb_apps_plugin.la
 endif
 
 libwindrive_plugin_la_SOURCES = windrive.c
-libwindrive_plugin_la_CFLAGS = $(AM_CFLAGS)
 libwindrive_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 sd_LTLIBRARIES += libwindrive_plugin.la
@@ -52,7 +49,6 @@ libwindrive_plugin_la_DEPENDENCIES = libwindrive_plugin.rc.o
 endif
 
 libos2drive_plugin_la_SOURCES = os2drive.c
-libos2drive_plugin_la_CFLAGS = $(AM_CFLAGS)
 libos2drive_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_OS2
 sd_LTLIBRARIES += libos2drive_plugin.la

modules/stream_filter/Makefile.am

@@ -4,7 +4,6 @@ stream_filterdir = $(pluginsdir)/stream_filter
 stream_filter_LTLIBRARIES =
 
 libdecomp_plugin_la_SOURCES = decomp.c
-libdecomp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdecomp_plugin_la_LIBADD = $(AM_LIBADD)
 if !HAVE_WIN32
 stream_filter_LTLIBRARIES += libdecomp_plugin.la
@@ -123,9 +122,5 @@ stream_filter_LTLIBRARIES += libhttplive_plugin.la
 endif
 
 librecord_plugin_la_SOURCES = record.c
-librecord_plugin_la_CFLAGS = $(AM_CFLAGS)
 librecord_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-librecord_plugin_la_DEPENDENCIES = librecord_plugin.rc.o
-endif
 stream_filter_LTLIBRARIES += librecord_plugin.la

modules/video_chroma/Makefile.am

@@ -2,7 +2,6 @@ include $(top_srcdir)/modules/common.am
 chromadir = $(pluginsdir)/video_chroma
 
 libchain_plugin_la_SOURCES = chain.c
-libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libchroma_omx_plugin_la_SOURCES = omxdl.c
 libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS)
@@ -14,11 +13,9 @@ libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
 libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)'
 
 libgrey_yuv_plugin_la_SOURCES = grey_yuv.c
-libgrey_yuv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libi420_rgb_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
 	i420_rgb8.c i420_rgb16.c i420_rgb_c.h
-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
@@ -26,20 +23,16 @@ 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) \
 	-DMODULE_NAME_IS_i422_yuy2
 
 librv32_plugin_la_SOURCES = rv32.c
-librv32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libyuy2_i420_plugin_la_SOURCES = yuy2_i420.c
-libyuy2_i420_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libyuy2_i422_plugin_la_SOURCES = yuy2_i422.c
-libyuy2_i422_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 chroma_LTLIBRARIES = \
 	libi420_rgb_plugin.la \

modules/video_filter/Modules.am

@@ -41,7 +41,6 @@ libdynamicoverlay_plugin_la_SOURCES = \
 	dynamicoverlay/dynamicoverlay_list.c \
 	dynamicoverlay/dynamicoverlay_commands.c \
 	dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
-libdynamicoverlay_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdynamicoverlay_plugin_la_LIBADD = $(AM_LIBADD)
 if !HAVE_WIN32
 video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
@@ -63,7 +62,6 @@ libpuzzle_plugin_la_SOURCES = \
 	puzzle_lib.c puzzle_lib.h \
 	puzzle_mgt.c puzzle_mgt.h \
 	puzzle_pce.c puzzle_pce.h
-libpuzzle_plugin_la_CFLAGS = $(AM_CFLAGS)
 libpuzzle_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libpuzzle_plugin_la_DEPENDENCIES = libpuzzle_plugin.rc.o

modules/video_output/Modules.am

@@ -143,7 +143,6 @@ libwingdi_plugin_la_DEPENDENCIES = libwingdi_plugin.rc.o
 endif
 
 libdrawable_plugin_la_SOURCES = drawable.c
-libdrawable_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdrawable_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 vout_LTLIBRARIES += libdrawable_plugin.la
@@ -156,7 +155,6 @@ vout_LTLIBRARIES += libdrawable_plugin.la
 endif
 
 libkva_plugin_la_SOURCES = kva.c
-libkva_plugin_la_CFLAGS = $(AM_CFLAGS)
 libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS)
 if HAVE_KVA
 vout_LTLIBRARIES += libkva_plugin.la
@@ -201,7 +199,6 @@ vout_LTLIBRARIES += $(LTLIBcaca)
 
 ### Common ###
 libvdummy_plugin_la_SOURCES = vdummy.c
-libvdummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 libvdummy_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libvdummy_plugin_la_DEPENDENCIES = libvdummy_plugin.rc.o

modules/video_splitter/Makefile.am

@@ -6,23 +6,14 @@ splitter_LTLIBRARIES = \
 	libwall_plugin.la
 
 libclone_plugin_la_SOURCES = clone.c
-libclone_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-if HAVE_WIN32
-libclone_plugin_la_DEPENDENCIES = libclone_plugin.rc.o
-endif
 
 libwall_plugin_la_SOURCES = wall.c
-libwall_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-if HAVE_WIN32
-libwall_plugin_la_DEPENDENCIES = libwall_plugin.rc.o
-endif
 
 libpanoramix_plugin_la_SOURCES = panoramix.c
 libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
 libpanoramix_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 if HAVE_WIN32
 splitter_LTLIBRARIES += libpanoramix_plugin.la
-libpanoramix_plugin_la_DEPENDENCIES = libpanoramix_plugin.rc.o
 else
 if HAVE_XCB_RANDR
 libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)

modules/visualization/Modules.am

@@ -5,11 +5,7 @@ libvisual_plugin_la_SOURCES = \
 	visual/visual.c visual/visual.h \
 	visual/effects.c \
 	visual/fft.c visual/fft.h
-libvisual_plugin_la_CFLAGS = $(AM_CFLAGS)
 libvisual_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
-if HAVE_WIN32
-libvisual_plugin_la_DEPENDENCIES = libvisual_plugin.rc.o
-endif
 visualization_LTLIBRARIES += libvisual_plugin.la
 
 SOURCES_vsxu = vsxu.cpp cyclic_buffer.h