Commit 2b4266d1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Add HAVE_DVBPSI, and use it, DVBPSI_CFLAGS and DVBPSI_LIBS

parent 1a5b4bf2
......@@ -2203,14 +2203,9 @@ fi
dnl
dnl libdvbpsi check for ts mux/demux
dnl
PKG_WITH_MODULES([DVBPSI], [libdvbpsi],
VLC_ADD_PLUGIN([ts])
VLC_ADD_LIBS([ts],[-ldvbpsi])
if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGIN([mux_ts])
VLC_ADD_LIBS([mux_ts],[-ldvbpsi])
fi
)
have_dvbpsi="no"
PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"])
AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"])
dnl
dnl Screen capture module
......
......@@ -11,7 +11,6 @@ SOURCES_wav = wav.c
SOURCES_live555 = live555.cpp ../access/mms/asf.c ../access/mms/buffer.c
SOURCES_nsv = nsv.c
SOURCES_real = real.c
SOURCES_ts = ts.c ../mux/mpeg/csa.c dvb-text.h
SOURCES_ps = ps.c ps.h
SOURCES_mod = mod.c dummy.cpp
SOURCES_pva = pva.c
......@@ -63,6 +62,14 @@ libvlc_LTLIBRARIES += \
libimage_plugin.la \
$(NULL)
libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c dvb-text.h
libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
libts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS)
libts_plugin_la_DEPENDENCIES =
if HAVE_DVBPSI
libvlc_LTLIBRARIES += libts_plugin.la
endif
BUILT_SOURCES += dummy.cpp
dummy.cpp:
......
......@@ -15,3 +15,14 @@ libvlc_LTLIBRARIES += \
libmux_wav_plugin.la \
libmux_mpjpeg_plugin.la \
$(NULL)
libmux_ts_plugin_la_SOURCES = \
mpeg/pes.c mpeg/pes.h \
mpeg/csa.c mpeg/csa.h \
mpeg/ts.c bits.h
libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
libmux_ts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS)
libmux_ts_plugin_la_DEPENDENCIES =
if HAVE_DVBPSI
libvlc_LTLIBRARIES += libmux_ts_plugin.la
endif
......@@ -3,12 +3,4 @@ SOURCES_mux_ps = ps.c \
pes.h \
bits.h \
$(NULL)
SOURCES_mux_ts = ts.c \
pes.c \
pes.h \
csa.c \
csa.h \
bits.h \
$(NULL)
libvlc_LTLIBRARIES += libmux_ps_plugin.la
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