[vlc-commits] Revert "missing MODULE_NAME_IS_ for android"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 21 18:13:53 2013 +0300| [30e0e1d4c2d68ac716497f52687dbce768403935] | committer: Rémi Denis-Courmont

Revert "missing MODULE_NAME_IS_ for android"

This reverts commit 892d21f1bd812d12fc5fd207c947219bb5274f60.
Thsi makes no sense.

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

 modules/access/Makefile.am      |    3 ---
 modules/audio_filter/Modules.am |    1 -
 modules/audio_mixer/Makefile.am |    2 --
 modules/audio_output/Modules.am |    2 --
 modules/demux/Makefile.am       |    4 ----
 5 files changed, 12 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index da1d68e..9bc48af 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -10,7 +10,6 @@ libattachment_plugin_la_SOURCES = access/attachment.c
 access_LTLIBRARIES += libattachment_plugin.la
 
 libfilesystem_plugin_la_SOURCES = access/fs.h access/file.c access/directory.c access/fs.c
-libfilesystem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_filesystem
 if HAVE_WIN32
 libfilesystem_plugin_la_LIBADD = -lshlwapi
 endif
@@ -25,7 +24,6 @@ access_LTLIBRARIES += libimem_plugin.la
 
 librar_plugin_la_SOURCES = access/rar/rar.c access/rar/rar.h \
 	access/rar/access.c access/rar/stream.c access/rar/module.c
-librar_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_rar
 access_LTLIBRARIES += librar_plugin.la
 
 libsdp_plugin_la_SOURCES = access/sdp.c
@@ -390,7 +388,6 @@ libaccess_realrtsp_plugin_la_SOURCES = \
 	access/rtsp/real_rmff.c access/rtsp/real_rmff.h \
 	access/rtsp/real_sdpplin.c access/rtsp/real_sdpplin.h \
 	access/rtsp/real_asmrp.c
-libaccess_realrtsp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_access_realrtsp
 libaccess_realrtsp_plugin_la_LIBADD = $(SOCKET_LIBS)
 libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 access_LTLIBRARIES += $(LTLIBaccess_realrtsp)
diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index 4ce352a..21d2022 100644
--- a/modules/audio_filter/Modules.am
+++ b/modules/audio_filter/Modules.am
@@ -52,7 +52,6 @@ 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_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_audio_format
 libaudio_format_plugin_la_LIBADD = $(LIBM)
 
 audio_filter_LTLIBRARIES += \
diff --git a/modules/audio_mixer/Makefile.am b/modules/audio_mixer/Makefile.am
index 5f292a0..d0479dd 100644
--- a/modules/audio_mixer/Makefile.am
+++ b/modules/audio_mixer/Makefile.am
@@ -2,11 +2,9 @@ include $(top_srcdir)/modules/common.am
 audio_mixerdir = $(pluginsdir)/audio_mixer
 
 libfloat_mixer_plugin_la_SOURCES = float.c
-libfloat_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_float_mixer
 libfloat_mixer_plugin_la_LIBADD = $(LIBM)
 
 libinteger_mixer_plugin_la_SOURCES = integer.c
-libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_integer_mixer
 
 audio_mixer_LTLIBRARIES = \
 	libfloat_mixer_plugin.la \
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 505f73d..02c64b5 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -10,7 +10,6 @@ libopensles_android_plugin_la_SOURCES = opensles_android.c
 libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM)
 
 libandroid_audiotrack_plugin_la_SOURCES = audiotrack.c
-libandroid_audiotrack_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_android_audiotrack
 libandroid_audiotrack_plugin_la_LIBADD = $(LIBDL)
 
 if HAVE_ANDROID
@@ -20,7 +19,6 @@ endif
 libadummy_plugin_la_SOURCES = adummy.c
 
 libafile_plugin_la_SOURCES = file.c
-libafile_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_afile
 
 libamem_plugin_la_SOURCES = amem.c
 
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 96e5401..e751d80 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -2,7 +2,6 @@ demuxdir = $(pluginsdir)/demux
 demux_LTLIBRARIES =
 
 libflacsys_plugin_la_SOURCES = demux/flac.c demux/xiph_metadata.h demux/xiph_metadata.c
-libflacsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_flacsys
 demux_LTLIBRARIES += libflacsys_plugin.la
 
 libogg_plugin_la_SOURCES = demux/ogg.c demux/ogg.h demux/oggseek.c demux/oggseek.h \
@@ -90,7 +89,6 @@ libvc1_plugin_la_SOURCES = demux/vc1.c
 demux_LTLIBRARIES += libvc1_plugin.la
 
 libdemux_cdg_plugin_la_SOURCES = demux/cdg.c
-libdemux_cdg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_demux_cdg
 demux_LTLIBRARIES += libdemux_cdg_plugin.la
 
 libsmf_plugin_la_SOURCES = demux/smf.c
@@ -110,14 +108,12 @@ EXTRA_LTLIBRARIES += libsid_plugin.la
 demux_LTLIBRARIES += $(LTLIBsid)
 
 libdiracsys_plugin_la_SOURCES = demux/dirac.c
-libdiracsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_diracsys
 demux_LTLIBRARIES += libdiracsys_plugin.la
 
 libimage_plugin_la_SOURCES = demux/image.c demux/mxpeg_helper.h
 demux_LTLIBRARIES += libimage_plugin.la
 
 libdemux_stl_plugin_la_SOURCES = demux/stl.c
-libdemux_stl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_demux_stl
 demux_LTLIBRARIES += libdemux_stl_plugin.la
 
 libasf_plugin_la_SOURCES = demux/asf/asf.c demux/asf/libasf.c demux/asf/libasf.h demux/asf/libasf_guid.h