vlc | branch: master | Rafaël Carré <[email protected]> | Sat Sep 21 18:23:21 2013 +0200| [8eabb7bec5971d1469b935e16f54f6e8d3a6f594] | committer: Rafaël Carré
Fix MODULE_NAME for android The modules concerned all had non unique names (e.g. flac for both the decoder and the demuxer). MODULE_NAME macro uses Makefile target to retrieve a unique name This was broken in 20cdb051acbe12ffee1f52e2e15e566762f04949, as explained by automake documentation: When using a per-target compilation flag, Automake will choose a different name for the intermediate object files. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8eabb7bec5971d1469b935e16f54f6e8d3a6f594 --- 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 insertions(+) diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am index 9bc48af..eef8e38 100644 --- a/modules/access/Makefile.am +++ b/modules/access/Makefile.am @@ -10,6 +10,7 @@ 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) if HAVE_WIN32 libfilesystem_plugin_la_LIBADD = -lshlwapi endif @@ -24,6 +25,7 @@ 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) access_LTLIBRARIES += librar_plugin.la libsdp_plugin_la_SOURCES = access/sdp.c @@ -388,6 +390,7 @@ 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) 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 21d2022..89f8783 100644 --- a/modules/audio_filter/Modules.am +++ b/modules/audio_filter/Modules.am @@ -52,6 +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_CPPFLAGS = $(AM_CPPFLAGS) libaudio_format_plugin_la_LIBADD = $(LIBM) audio_filter_LTLIBRARIES += \ diff --git a/modules/audio_mixer/Makefile.am b/modules/audio_mixer/Makefile.am index d0479dd..da69dc2 100644 --- a/modules/audio_mixer/Makefile.am +++ b/modules/audio_mixer/Makefile.am @@ -2,9 +2,11 @@ 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) libfloat_mixer_plugin_la_LIBADD = $(LIBM) libinteger_mixer_plugin_la_SOURCES = integer.c +libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) audio_mixer_LTLIBRARIES = \ libfloat_mixer_plugin.la \ diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am index 02c64b5..3894fe3 100644 --- a/modules/audio_output/Modules.am +++ b/modules/audio_output/Modules.am @@ -10,6 +10,7 @@ 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) libandroid_audiotrack_plugin_la_LIBADD = $(LIBDL) if HAVE_ANDROID @@ -19,6 +20,7 @@ endif libadummy_plugin_la_SOURCES = adummy.c libafile_plugin_la_SOURCES = file.c +libafile_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libamem_plugin_la_SOURCES = amem.c diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index e751d80..62a99c6 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -2,6 +2,7 @@ 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) demux_LTLIBRARIES += libflacsys_plugin.la libogg_plugin_la_SOURCES = demux/ogg.c demux/ogg.h demux/oggseek.c demux/oggseek.h \ @@ -89,6 +90,7 @@ 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) demux_LTLIBRARIES += libdemux_cdg_plugin.la libsmf_plugin_la_SOURCES = demux/smf.c @@ -108,12 +110,14 @@ EXTRA_LTLIBRARIES += libsid_plugin.la demux_LTLIBRARIES += $(LTLIBsid) libdiracsys_plugin_la_SOURCES = demux/dirac.c +libdiracsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 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) 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
