vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 11:55:56 2012 +0300| [b6c921dbc1c04bef8e235457a3aac0f58cbd263f] | committer: Rémi Denis-Courmont
Remove recursion into modules/access/mms/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6c921dbc1c04bef8e235457a3aac0f58cbd263f --- configure.ac | 3 +-- modules/access/Modules.am | 13 ++++++++++++- modules/access/mms/Modules.am | 15 --------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 3463e95..470b567 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 rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_http 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) @@ -4128,7 +4128,6 @@ AC_CONFIG_FILES([ bin/Makefile test/Makefile modules/access/Makefile - modules/access/mms/Makefile modules/access/rtp/Makefile modules/access/zip/unzip/Makefile modules/access_output/Makefile diff --git a/modules/access/Modules.am b/modules/access/Modules.am index b112ced..a17b127 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = mms rtp +SUBDIRS = rtp DIST_SUBDIRS = $(SUBDIRS) libfilesystem_plugin_la_SOURCES = \ @@ -251,6 +251,17 @@ SOURCES_htcpcp = htcpcp.c SOURCES_access_ftp = ftp.c SOURCES_access_sftp = sftp.c +libmms_plugin_la_SOURCES = \ + mms/mms.c mms/mms.h \ + mms/mmsh.c mms/mmsh.h \ + mms/mmstu.c mms/mmstu.h \ + mms/buffer.c mms/buffer.h \ + mms/asf.h mms/asf.c \ + ../demux/asf/libasf_guid.h +libmms_plugin_la_CFLAGS = $(AM_CFLAGS) +libmms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS) +libvlc_LTLIBRARIES += libmms_plugin.la + librealrtsp_plugin_la_SOURCES = \ rtsp/access.c \ rtsp/rtsp.c rtsp/rtsp.h \ diff --git a/modules/access/mms/Modules.am b/modules/access/mms/Modules.am deleted file mode 100644 index 5f03d9c..0000000 --- a/modules/access/mms/Modules.am +++ /dev/null @@ -1,15 +0,0 @@ -SOURCES_access_mms = \ - mms.c \ - mms.h \ - mmsh.c \ - mmsh.h \ - mmstu.c \ - mmstu.h \ - buffer.c \ - buffer.h \ - asf.h \ - asf.c \ - ../../demux/asf/libasf_guid.h \ - $(NULL) - -libvlc_LTLIBRARIES += libaccess_mms_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
