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

stream_out: remove Makefile recursion

parent a3f0e165
......@@ -61,7 +61,7 @@ fi
###
echo "generating modules/**/Makefile.am"
for d in modules/*/Modules.am modules/*/*/Modules.am; do
for d in modules/*/*/Modules.am; do
d="${d#modules/}"
d="${d%/Modules.am}"
${CONFIG_SHELL-sh} modules/genmf "$d"
......
......@@ -650,7 +650,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
VLC_RESTORE_FLAGS
AS_IF([test -n "$SOCKET_LIBS"], [
VLC_ADD_LIBS([access_rtmp sap stream_out_standard stream_out_rtp stream_out_raop stream_out_chromecast ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
VLC_ADD_LIBS([access_rtmp sap ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
......@@ -3590,9 +3590,7 @@ dnl chromaprint audio track fingerprinter
dnl
m4_pushdef([libchromaprint_version], 0.6.0)
PKG_WITH_MODULES([CHROMAPRINT],[libchromaprint >= libchromaprint_version],
VLC_ADD_PLUGIN([stream_out_chromaprint])
VLC_ADD_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out])
VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]),
VLC_ADD_PLUGIN([stream_out_chromaprint]),
AS_IF([test "${enable_chromaprint}" = "yes"],
[AC_MSG_ERROR(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)],
[AC_MSG_WARN(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)]
......@@ -3608,9 +3606,6 @@ AC_ARG_VAR(PROTOC, [protobuf compiler])
AC_PATH_PROGS(PROTOC, protoc, no)
PKG_WITH_MODULES([CHROMECAST],[protobuf-lite >= protobuf_lite_version], [
AS_IF([test "x${PROTOC}" != "xno"], [
VLC_ADD_PLUGIN([stream_out_chromecast])
VLC_ADD_CXXFLAGS([stream_out_chromecast],[${CHROMECAST_CFLAGS}] [-I./chromecast])
VLC_ADD_LIBS([stream_out_chromecast],[${CHROMECAST_LIBS}])
build_chromecast="yes"
], [
AC_MSG_ERROR(protoc compiler needed for [chromecast] was not found)
......@@ -4123,7 +4118,6 @@ AC_CONFIG_FILES([
modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/stream_out/Makefile
modules/hw/mmal/Makefile
])
......
......@@ -4,14 +4,10 @@ check_PROGRAMS =
EXTRA_DIST =
EXTRA_SUBDIRS = \
stream_out \
hw/mmal
SUBDIRS = .
DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += stream_out
endif
if HAVE_MMAL
SUBDIRS += hw/mmal
endif
......@@ -51,6 +47,7 @@ include visualization/Makefile.am
if ENABLE_SOUT
include access_output/Makefile.am
include mux/Makefile.am
include stream_out/Makefile.am
endif
BUILT_SOURCES += dummy.cpp
......
SOURCES_stream_out_dummy = dummy.c
SOURCES_stream_out_delay = delay.c
SOURCES_stream_out_stats = stats.c
SOURCES_stream_out_description = description.c
SOURCES_stream_out_standard = standard.c
SOURCES_stream_out_duplicate = duplicate.c
SOURCES_stream_out_es = es.c
SOURCES_stream_out_display = display.c
SOURCES_stream_out_gather = gather.c
SOURCES_stream_out_bridge = bridge.c
SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
SOURCES_stream_out_autodel = autodel.c
SOURCES_stream_out_record = record.c
SOURCES_stream_out_smem = smem.c
SOURCES_stream_out_setid = setid.c
SOURCES_stream_out_langfromtelx = langfromtelx.c
SOURCES_stream_out_chromaprint = chromaprint.c chromaprint_data.h dummy.cpp
soutdir = $(pluginsdir)/stream_out
libstream_out_dummy_plugin_la_SOURCES = stream_out/dummy.c
libstream_out_delay_plugin_la_SOURCES = stream_out/delay.c
libstream_out_stats_plugin_la_SOURCES = stream_out/stats.c
libstream_out_description_plugin_la_SOURCES = stream_out/description.c
libstream_out_standard_plugin_la_SOURCES = stream_out/standard.c
libstream_out_standard_plugin_la_LIBADD = $(SOCKET_LIBS)
libstream_out_duplicate_plugin_la_SOURCES = stream_out/duplicate.c
libstream_out_es_plugin_la_SOURCES = stream_out/es.c
libstream_out_display_plugin_la_SOURCES = stream_out/display.c
libstream_out_gather_plugin_la_SOURCES = stream_out/gather.c
libstream_out_bridge_plugin_la_SOURCES = stream_out/bridge.c
libstream_out_mosaic_bridge_plugin_la_SOURCES = stream_out/mosaic_bridge.c
libstream_out_autodel_plugin_la_SOURCES = stream_out/autodel.c
libstream_out_record_plugin_la_SOURCES = stream_out/record.c
libstream_out_smem_plugin_la_SOURCES = stream_out/smem.c
libstream_out_setid_plugin_la_SOURCES = stream_out/setid.c
libstream_out_langfromtelx_plugin_la_SOURCES = stream_out/langfromtelx.c
libstream_out_transcode_plugin_la_SOURCES = \
transcode/transcode.c transcode/transcode.h \
transcode/osd.c transcode/spu.c transcode/audio.c transcode/video.c
stream_out/transcode/transcode.c stream_out/transcode/transcode.h \
stream_out/transcode/osd.c stream_out/transcode/spu.c \
stream_out/transcode/audio.c stream_out/transcode/video.c
libstream_out_transcode_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_transcode_plugin_la_LIBADD = $(LIBM)
stream_out_LTLIBRARIES += \
sout_LTLIBRARIES = \
libstream_out_dummy_plugin.la \
libstream_out_delay_plugin.la \
libstream_out_stats_plugin.la \
......@@ -43,32 +44,35 @@ stream_out_LTLIBRARIES += \
libstream_out_transcode_plugin.la
# RTP plugin
stream_out_LTLIBRARIES += \
libstream_out_rtp_plugin.la
sout_LTLIBRARIES += libstream_out_rtp_plugin.la
libstream_out_rtp_plugin_la_SOURCES = \
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
stream_out/rtp.c stream_out/rtp.h stream_out/rtpfmt.c \
stream_out/rtcp.c stream_out/rtsp.c stream_out/vod.c
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
if HAVE_GCRYPT
SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp
SRTP_LIBS = $(top_builddir)/modules/libvlc_srtp.la
SRTP_CFLAGS = -I$(srcdir)/access/rtp
SRTP_LIBS = libvlc_srtp.la
libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \
$(GCRYPT_CFLAGS)
libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS)
endif
# RAOP plugin
libstream_out_raop_plugin_la_SOURCES = raop.c
libstream_out_raop_plugin_la_SOURCES = stream_out/raop.c
libstream_out_raop_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libstream_out_raop_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error $(LIBS_stream_out_raop)
libstream_out_raop_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error $(SOCKET_LIBS) $(LIBS_stream_out_raop)
if HAVE_GCRYPT
stream_out_LTLIBRARIES += libstream_out_raop_plugin.la
sout_LTLIBRARIES += libstream_out_raop_plugin.la
endif
BUILT_SOURCES += dummy.cpp
dummy.cpp:
touch dummy.cpp
# Chromaprint plugin
libstream_out_chromaprint_plugin_la_SOURCES = stream_out/chromaprint.c stream_out/chromaprint_data.h dummy.cpp
libstream_out_chromaprint_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CHROMAPRINT_CFLAGS)
libstream_out_chromaprint_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(soutdir)'
libstream_out_chromaprint_plugin_la_LIBADD = $(CHROMAPRINT_LIBS)
EXTRA_LTLIBRARIES += libstream_out_chromaprint_plugin.la
sout_LTLIBRARIES += $(LTLIBstream_out_chromaprint)
# Chromecast plugin
SUFFIXES += .proto .pb.cc
......@@ -76,12 +80,14 @@ SUFFIXES += .proto .pb.cc
%.pb.h %.pb.cc: %.proto
$(PROTOC) --cpp_out=. -I$(srcdir) $<
SOURCES_stream_out_chromecast = chromecast/cast_channel.proto chromecast/cast.cpp \
../misc/webservices/json.h ../misc/webservices/json.c
nodist_libstream_out_chromecast_plugin_la_SOURCES = chromecast/cast_channel.pb.cc
libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/cast_channel.proto stream_out/chromecast/cast.cpp \
misc/webservices/json.h misc/webservices/json.c
nodist_libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/cast_channel.pb.cc
libstream_out_chromecast_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -Istream_out/chromecast $(CHROMECAST_CFLAGS)
libstream_out_chromecast_plugin_la_LIBADD = $(CHROMECAST_LIBS) $(SOCKET_LIBS)
CLEANFILES += $(nodist_libstream_out_chromecast_plugin_la_SOURCES)
if BUILD_CHROMECAST
BUILT_SOURCES += chromecast/cast_channel.pb.h
stream_out_LTLIBRARIES += libstream_out_chromecast_plugin.la
BUILT_SOURCES += stream_out/chromecast/cast_channel.pb.h
sout_LTLIBRARIES += libstream_out_chromecast_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