demux: mp4: use new lang tables

[vlc] / modules / demux / Makefile.am

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index e751d80c38895a5b4e095e01dc36519a4fe12cd6..8dfd2bce616c78bb81e0def73a5660a7e038595d 100644 (file)
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -2,13 +2,14 @@ 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 \
-       demux/xiph_metadata.h demux/xiph.h demux/xiph_metadata.c
-libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg)
+       demux/xiph_metadata.h demux/xiph.h demux/xiph_metadata.c demux/opus.h
+libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg) $(LIBVORBIS_CFLAGS)
 libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
-libogg_plugin_la_LIBADD = $(LIBS_ogg)
+libogg_plugin_la_LIBADD = $(LIBS_ogg) $(LIBVORBIS_LIBS)
 EXTRA_LTLIBRARIES += libogg_plugin.la
 demux_LTLIBRARIES += $(LTLIBogg)
 
@@ -27,7 +28,7 @@ demux_LTLIBRARIES += libau_plugin.la
 librawaud_plugin_la_SOURCES = demux/rawaud.c
 demux_LTLIBRARIES += librawaud_plugin.la
 
-libwav_plugin_la_SOURCES = demux/wav.c
+libwav_plugin_la_SOURCES = demux/wav.c demux/windows_audio_commons.h
 demux_LTLIBRARIES += libwav_plugin.la
 
 libnsv_plugin_la_SOURCES = demux/nsv.c
@@ -40,7 +41,7 @@ libps_plugin_la_SOURCES = demux/ps.c demux/ps.h
 demux_LTLIBRARIES += libps_plugin.la
 
 libmod_plugin_la_SOURCES = demux/mod.c
-libmod_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_mod)
+libmod_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mod)
 libmod_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
 libmod_plugin_la_LIBADD = $(LIBS_mod)
 EXTRA_LTLIBRARIES += libmod_plugin.la
@@ -56,6 +57,7 @@ libmjpeg_plugin_la_SOURCES = demux/mjpeg.c demux/mxpeg_helper.h
 demux_LTLIBRARIES += libmjpeg_plugin.la
 
 libsubtitle_plugin_la_SOURCES = demux/subtitle.c
+libsubtitle_plugin_la_LIBADD = $(LIBM)
 demux_LTLIBRARIES += libsubtitle_plugin.la
 
 libty_plugin_la_SOURCES = demux/ty.c codec/cc.h
@@ -89,6 +91,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 +111,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
@@ -122,10 +127,13 @@ demux_LTLIBRARIES += libasf_plugin.la
 libavi_plugin_la_SOURCES = demux/avi/avi.c demux/avi/libavi.c demux/avi/libavi.h
 demux_LTLIBRARIES += libavi_plugin.la
 
+libcaf_plugin_la_SOURCES = demux/caf.c
+libcaf_plugin_la_LIBADD = $(LIBM)
+demux_LTLIBRARIES += libcaf_plugin.la
+
 libavformat_plugin_la_SOURCES = demux/avformat/demux.c \
        codec/avcodec/fourcc.c \
        codec/avcodec/chroma.c \
-       codec/avcodec/cpu.c \
        codec/avcodec/avcommon.h \
        codec/avcodec/avcommon_compat.h \
        demux/vobsub.h \
@@ -143,8 +151,10 @@ if HAVE_DARWIN
 libavformat_plugin_la_LDFLAGS += -Wl,-read_only_relocs,suppress
 endif
 if HAVE_AVFORMAT
+if !MERGE_FFMPEG
 demux_LTLIBRARIES += libavformat_plugin.la
 endif
+endif
 
 libes_plugin_la_SOURCES  = demux/mpeg/es.c codec/dts_header.c codec/dts_header.h
 demux_LTLIBRARIES += libes_plugin.la
@@ -152,6 +162,9 @@ demux_LTLIBRARIES += libes_plugin.la
 libh264_plugin_la_SOURCES = demux/mpeg/h264.c
 demux_LTLIBRARIES += libh264_plugin.la
 
+libhevc_plugin_la_SOURCES = demux/mpeg/hevc.c demux/mpeg/mpeg_parser_helpers.h
+demux_LTLIBRARIES += libhevc_plugin.la
+
 libmkv_plugin_la_SOURCES = \
        demux/mkv/util.hpp demux/mkv/util.cpp \
        demux/mkv/virtual_segment.hpp demux/mkv/virtual_segment.cpp \
@@ -163,7 +176,8 @@ libmkv_plugin_la_SOURCES = \
        demux/mkv/chapter_command.hpp demux/mkv/chapter_command.cpp \
        demux/mkv/stream_io_callback.hpp demux/mkv/stream_io_callback.cpp \
        demux/mp4/libmp4.c demux/vobsub.h \
-       demux/mkv/mkv.hpp demux/mkv/mkv.cpp
+       demux/mkv/mkv.hpp demux/mkv/mkv.cpp \
+       demux/windows_audio_commons.h
 libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
 libmkv_plugin_la_LIBADD = $(LIBS_mkv)
@@ -173,7 +187,9 @@ endif
 demux_LTLIBRARIES += $(LTLIBmkv)
 EXTRA_LTLIBRARIES += libmkv_plugin.la
 
-libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/libmp4.c demux/mp4/libmp4.h demux/mp4/id3genres.h
+libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \
+                           demux/mp4/libmp4.c demux/mp4/libmp4.h \
+                           demux/mp4/id3genres.h demux/mp4/languages.h
 libmp4_plugin_la_LIBADD = $(LIBM)
 libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_ZLIB
@@ -202,12 +218,17 @@ libplaylist_plugin_la_SOURCES = \
        demux/playlist/wpl.c \
        demux/playlist/xspf.c \
        demux/playlist/zpl.c \
+       demux/playlist/directory.c \
        demux/playlist/playlist.c demux/playlist/playlist.h
 demux_LTLIBRARIES += libplaylist_plugin.la
 
-libts_plugin_la_SOURCES = demux/ts.c mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h demux/dvb-text.h
+libts_plugin_la_SOURCES = demux/ts.c mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h demux/dvb-text.h codec/opus_header.c demux/opus.h
 libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
 libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
+if HAVE_ARIBB24
+libts_plugin_la_CFLAGS += $(ARIBB24_CFLAGS)
+libts_plugin_la_LIBADD += $(ARIBB24_LIBS)
+endif
 if HAVE_DVBPSI
 demux_LTLIBRARIES += libts_plugin.la
 endif