Commit 71e95197 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

mux: remove Makefile recursion

parent e85bf025
......@@ -2034,13 +2034,12 @@ AS_IF([test "${enable_sid}" != "no"], [
dnl
dnl ogg demux plugin
dnl
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
PKG_ENABLE_MODULES_VLC([OGG], [mux_ogg], [ogg >= 1.0], [Ogg demux support], [auto])
PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis])
],[true])
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}])
if test "${enable_sout}" != "no"; then
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto])
dnl Check for libshout
PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
fi
......@@ -4139,7 +4138,6 @@ AC_CONFIG_FILES([
modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/mux/Makefile
modules/stream_out/Makefile
modules/visualization/Makefile
modules/hw/mmal/Makefile
......
......@@ -8,14 +8,13 @@ BASE_SUBDIRS = \
visualization
EXTRA_SUBDIRS = \
access_output \
mux \
stream_out \
hw/mmal
SUBDIRS = . $(BASE_SUBDIRS)
DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += access_output mux stream_out
SUBDIRS += access_output stream_out
endif
if HAVE_MMAL
SUBDIRS += hw/mmal
......@@ -51,6 +50,9 @@ include video_chroma/Makefile.am
include video_filter/Makefile.am
include video_splitter/Makefile.am
include video_output/Makefile.am
if ENABLE_SOUT
include mux/Makefile.am
endif
BUILT_SOURCES += dummy.cpp
......
......@@ -7,9 +7,9 @@ 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 demux/opus.h
libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg) $(LIBVORBIS_CFLAGS)
libogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBVORBIS_CFLAGS) $(OGG_CFLAGS)
libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
libogg_plugin_la_LIBADD = $(LIBS_ogg) $(LIBVORBIS_LIBS)
libogg_plugin_la_LIBADD = $(LIBVORBIS_LIBS) $(OGG_LIBS)
EXTRA_LTLIBRARIES += libogg_plugin.la
demux_LTLIBRARIES += $(LTLIBogg)
......
muxdir = $(pluginsdir)/mux
libmux_dummy_plugin_la_SOURCES = mux/dummy.c
libmux_asf_plugin_la_SOURCES = mux/asf.c demux/asf/libasf_guid.h
libmux_avi_plugin_la_SOURCES = mux/avi.c
libmux_mp4_plugin_la_SOURCES = mux/mp4.c \
demux/mpeg/mpeg_parser_helpers.h demux/mp4/libmp4.h
libmux_mpjpeg_plugin_la_SOURCES = mux/mpjpeg.c
libmux_ps_plugin_la_SOURCES = \
mux/mpeg/pes.c mux/mpeg/pes.h \
mux/mpeg/ps.c mux/mpeg/bits.h
libmux_wav_plugin_la_SOURCES = mux/wav.c
mux_LTLIBRARIES = \
libmux_dummy_plugin.la \
libmux_asf_plugin.la \
libmux_avi_plugin.la \
libmux_mp4_plugin.la \
libmux_mpjpeg_plugin.la \
libmux_ps_plugin.la \
libmux_wav_plugin.la
libmux_ogg_plugin_la_SOURCES = mux/ogg.c
libmux_ogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OGG_CFLAGS)
libmux_ogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(muxdir)'
libmux_ogg_plugin_la_LIBADD = $(OGG_LIBS)
EXTRA_LTLIBRARIES += libmux_ogg_plugin.la
mux_LTLIBRARIES += $(LTLIBmux_ogg)
libmux_ts_plugin_la_SOURCES = \
mux/mpeg/pes.c mux/mpeg/pes.h \
mux/mpeg/csa.c mux/mpeg/csa.h \
mux/mpeg/streams.h \
mux/mpeg/tables.c mux/mpeg/tables.h \
mux/mpeg/tsutil.c mux/mpeg/tsutil.h \
mux/mpeg/ts.c mux/mpeg/bits.h mux/mpeg/dvbpsi_compat.h
libmux_ts_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DVBPSI_CFLAGS)
libmux_ts_plugin_la_LIBADD = $(DVBPSI_LIBS)
if HAVE_DVBPSI
mux_LTLIBRARIES += libmux_ts_plugin.la
endif
SOURCES_mux_dummy = dummy.c
SOURCES_mux_avi = avi.c
SOURCES_mux_ogg = ogg.c
SOURCES_mux_mp4 = mp4.c ../demux/mpeg/mpeg_parser_helpers.h ../demux/mp4/libmp4.h
SOURCES_mux_asf = asf.c ../demux/asf/libasf_guid.h
SOURCES_mux_wav = wav.c
SOURCES_mux_mpjpeg = mpjpeg.c
mux_LTLIBRARIES += \
libmux_dummy_plugin.la \
libmux_avi_plugin.la \
libmux_mp4_plugin.la \
libmux_asf_plugin.la \
libmux_wav_plugin.la \
libmux_mpjpeg_plugin.la \
$(NULL)
libmux_ps_plugin_la_SOURCES = \
mpeg/pes.c mpeg/pes.h \
mpeg/ps.c mpeg/bits.h
libmux_ps_plugin_la_CFLAGS = $(AM_CLFAGS)
mux_LTLIBRARIES += libmux_ps_plugin.la
libmux_ts_plugin_la_SOURCES = \
mpeg/pes.c mpeg/pes.h \
mpeg/csa.c mpeg/csa.h \
mpeg/streams.h \
mpeg/tables.c mpeg/tables.h \
mpeg/tsutil.c mpeg/tsutil.h \
mpeg/ts.c mpeg/bits.h mpeg/dvbpsi_compat.h
libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
libmux_ts_plugin_la_LIBADD = $(DVBPSI_LIBS)
if HAVE_DVBPSI
mux_LTLIBRARIES += libmux_ts_plugin.la
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment