vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Feb 11 18:28:45 2015 +0200| [a3f0e1656c8927d671f6af1c65448756533475a0] | committer: Rémi Denis-Courmont
access_output: remove Makefile recursion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a3f0e1656c8927d671f6af1c65448756533475a0 --- configure.ac | 3 +-- modules/Makefile.am | 4 ++-- modules/access_output/.gitignore | 1 - modules/access_output/Makefile.am | 28 ++++++++++++++++++++++++++++ modules/access_output/Modules.am | 20 -------------------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 0b03e9f..d203ffb 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/modules/Makefile.am b/modules/Makefile.am index aaa357e..d5aadf6 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -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 diff --git a/modules/access_output/.gitignore b/modules/access_output/.gitignore deleted file mode 100644 index 08a6d72..0000000 --- a/modules/access_output/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/access_output/Makefile.am b/modules/access_output/Makefile.am new file mode 100644 index 0000000..27e1897 --- /dev/null +++ b/modules/access_output/Makefile.am @@ -0,0 +1,28 @@ +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 diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am deleted file mode 100644 index 9bf25fc..0000000 --- a/modules/access_output/Modules.am +++ /dev/null @@ -1,20 +0,0 @@ -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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
