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

access_output: remove Makefile recursion

parent 92185f0b
......@@ -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 access_output_shout 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 stream_out_standard stream_out_rtp stream_out_raop stream_out_chromecast ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
......@@ -4117,7 +4117,6 @@ AC_CONFIG_FILES([
lib/Makefile
bin/Makefile
test/Makefile
modules/access_output/Makefile
modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
modules/gui/minimal_macosx/Makefile
......
......@@ -4,14 +4,13 @@ check_PROGRAMS =
EXTRA_DIST =
EXTRA_SUBDIRS = \
access_output \
stream_out \
hw/mmal
SUBDIRS = .
DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += access_output stream_out
SUBDIRS += stream_out
endif
if HAVE_MMAL
SUBDIRS += hw/mmal
......@@ -50,6 +49,7 @@ include video_splitter/Makefile.am
include video_output/Makefile.am
include visualization/Makefile.am
if ENABLE_SOUT
include access_output/Makefile.am
include mux/Makefile.am
endif
......
access_outdir = $(pluginsdir)/access_output
libaccess_output_dummy_plugin_la_SOURCES = access_output/dummy.c
libaccess_output_file_plugin_la_SOURCES = access_output/file.c
libaccess_output_http_plugin_la_SOURCES = access_output/http.c \
access_output/bonjour.c access_output/bonjour.h
libaccess_output_udp_plugin_la_SOURCES = access_output/udp.c
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
access_out_LTLIBRARIES = \
libaccess_output_dummy_plugin.la \
libaccess_output_file_plugin.la \
libaccess_output_http_plugin.la \
libaccess_output_udp_plugin.la
libaccess_output_livehttp_plugin_la_SOURCES = access_output/livehttp.c
libaccess_output_livehttp_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
if HAVE_GCRYPT
access_out_LTLIBRARIES += libaccess_output_livehttp_plugin.la
endif
libaccess_output_shout_plugin_la_SOURCES = access_output/shout.c
libaccess_output_shout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHOUT_CFLAGS)
libaccess_output_shout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(access_outdir)'
libaccess_output_shout_plugin_la_LIBADD = $(SHOUT_LIBS) $(SOCKET_LIBS)
access_out_LTLIBRARIES += $(LTLIBaccess_output_shout)
EXTRA_LTLIBRARIES += libaccess_output_shout_plugin.la
SOURCES_access_output_dummy = dummy.c
SOURCES_access_output_file = file.c
SOURCES_access_output_http = http.c bonjour.c bonjour.h
SOURCES_access_output_shout = shout.c
access_output_LTLIBRARIES += \
libaccess_output_dummy_plugin.la \
libaccess_output_file_plugin.la \
libaccess_output_http_plugin.la
libaccess_output_udp_plugin_la_SOURCES = udp.c
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
access_output_LTLIBRARIES += libaccess_output_udp_plugin.la
libaccess_output_livehttp_plugin_la_SOURCES = livehttp.c
libaccess_output_livehttp_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
if HAVE_GCRYPT
access_output_LTLIBRARIES += libaccess_output_livehttp_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