vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 11:37:47 2012 +0300| [db065ee5d41da3f168740d01e65f46001a9e88ce] | committer: Rémi Denis-Courmont
Remove recursion into modules/access/rtsp/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db065ee5d41da3f168740d01e65f46001a9e88ce --- configure.ac | 5 ++-- modules/access/Modules.am | 50 ++++++++++++++++++++++++---------------- modules/access/rtsp/Modules.am | 12 ---------- 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/configure.ac b/configure.ac index 1f15dd6..8bfbdda 100644 --- a/configure.ac +++ b/configure.ac @@ -570,7 +570,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex]) VLC_RESTORE_FLAGS AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -1923,7 +1923,7 @@ dnl AC_ARG_ENABLE(realrtsp, [ --enable-realrtsp Real RTSP module (default disabled)]) if test "${enable_realrtsp}" = "yes"; then - VLC_ADD_PLUGIN([access_realrtsp]) + VLC_ADD_PLUGIN([realrtsp]) fi dnl @@ -4133,7 +4133,6 @@ AC_CONFIG_FILES([ modules/access/Makefile modules/access/mms/Makefile modules/access/rtp/Makefile - modules/access/rtsp/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile modules/access/screen/Makefile diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 1a8b8b1..4420c2c 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = mms rtsp rtp screen vcd vcdx zip +SUBDIRS = mms rtp screen vcd vcdx zip libfilesystem_plugin_la_SOURCES = \ fs.h \ @@ -19,19 +19,7 @@ libsdp_plugin_la_SOURCES = sdp.c libsdp_plugin_la_CFLAGS = $(AM_CFLAGS) libsdp_plugin_la_LIBADD = $(AM_LIBADD) -libaccess_smb_plugin_la_SOURCES = smb.c -libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) -libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) -if HAVE_WIN32 -libaccess_smb_plugin_la_LIBADD += -lmpr -endif -libvlc_LTLIBRARIES += $(LTLIBaccess_smb) - SOURCES_access_directory = directory.c -SOURCES_access_udp = udp.c -SOURCES_access_tcp = tcp.c -SOURCES_access_http = http.c -SOURCES_access_ftp = ftp.c SOURCES_access_gnomevfs = gnomevfs.c SOURCES_access_eyetv = eyetv.m SOURCES_dc1394 = dc1394.c @@ -45,15 +33,12 @@ SOURCES_linsys_hdsdi = \ $(NULL) SOURCES_access_jack = jack.c SOURCES_access_mtp = mtp.c -SOURCES_access_sftp = sftp.c SOURCES_access_imem = imem.c SOURCES_access_avio = avio.c avio.h SOURCES_access_attachment = attachment.c SOURCES_access_vdr = vdr.c SOURCES_libbluray = bluray.c SOURCES_decklink = decklink.cpp -SOURCES_htcpcp = htcpcp.c - SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c @@ -213,7 +198,32 @@ libvlc_LTLIBRARIES += libdtv_plugin.la endif -EXTRA_LTLIBRARIES += \ - libaccess_shm_plugin.la \ - libaccess_smb_plugin.la \ - $(NULL) +### Network streams ### + +libaccess_smb_plugin_la_SOURCES = smb.c +libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) +libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) +if HAVE_WIN32 +libaccess_smb_plugin_la_LIBADD += -lmpr +endif +libvlc_LTLIBRARIES += $(LTLIBaccess_smb) +EXTRA_LTLIBRARIES += libaccess_smb_plugin.la + +SOURCES_access_udp = udp.c +SOURCES_access_tcp = tcp.c +SOURCES_access_http = http.c +SOURCES_htcpcp = htcpcp.c +SOURCES_access_ftp = ftp.c +SOURCES_access_sftp = sftp.c + +librealrtsp_plugin_la_SOURCES = \ + rtsp/access.c \ + rtsp/rtsp.c rtsp/rtsp.h \ + rtsp/real.c rtsp/real.h \ + rtsp/real_rmff.c rtsp/real_rmff.h \ + rtsp/real_sdpplin.c rtsp/real_sdpplin.h \ + rtsp/real_asmrp.c +librealrtsp_plugin_la_CFLAGS = $(AM_CFLAGS) +librealrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS) +libvlc_LTLIBRARIES += $(LTLIBrealrtsp) +EXTRA_LTLIBRARIES += librealrtsp_plugin.la diff --git a/modules/access/rtsp/Modules.am b/modules/access/rtsp/Modules.am deleted file mode 100644 index f491827..0000000 --- a/modules/access/rtsp/Modules.am +++ /dev/null @@ -1,12 +0,0 @@ -SOURCES_access_realrtsp = \ - access.c \ - rtsp.c \ - rtsp.h \ - real.c \ - real.h \ - real_rmff.c \ - real_rmff.h \ - real_sdpplin.c \ - real_sdpplin.h \ - real_asmrp.c \ - $(NULL) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
