[vlc-devel] commit: Move RTP to access/rtp ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Nov  9 14:41:07 2008 +0200| [40f2e51765f4b1d65283fc5184a33ad28096c613] | committer: Rémi Denis-Courmont 

Move RTP to access/rtp

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40f2e51765f4b1d65283fc5184a33ad28096c613
---

 configure.ac                                       |    1 +
 modules/access/Modules.am                          |    2 +-
 modules/access/rtp/Modules.am                      |   12 ++++++++++++
 modules/{demux => access/rtp}/rtp.c                |    0 
 modules/{demux => access/rtp}/rtp.h                |    0 
 .../{demux/rtpsession.c => access/rtp/session.c}   |    0 
 modules/{demux/rtpxiph.c => access/rtp/xiph.c}     |    0 
 modules/demux/Modules.am                           |   13 -------------
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7445925..36ad414 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5759,6 +5759,7 @@ AC_CONFIG_FILES([
   modules/access/dvb/Makefile
   modules/access/mms/Makefile
   modules/access/cdda/Makefile
+  modules/access/rtp/Makefile
   modules/access/rtsp/Makefile
   modules/access/rtmp/Makefile
   modules/access/v4l2/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index c91bfd0..c52e499 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
+BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp v4l2 vcd vcdx screen
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
diff --git a/modules/access/rtp/Modules.am b/modules/access/rtp/Modules.am
new file mode 100644
index 0000000..e8150b7
--- /dev/null
+++ b/modules/access/rtp/Modules.am
@@ -0,0 +1,12 @@
+if HAVE_LIBGCRYPT
+# RTP plugin
+libvlc_LTLIBRARIES += \
+	librtp_plugin.la
+librtp_plugin_la_SOURCES = \
+	rtp.c rtp.h session.c
+librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
+librtp_plugin_la_LIBADD = $(AM_LIBADD) \
+	$(top_builddir)/libs/srtp/libvlc_srtp.la
+librtp_plugin_la_DEPENDENCIES = \
+	$(top_builddir)/libs/srtp/libvlc_srtp.la
+endif
diff --git a/modules/demux/rtp.c b/modules/access/rtp/rtp.c
similarity index 100%
rename from modules/demux/rtp.c
rename to modules/access/rtp/rtp.c
diff --git a/modules/demux/rtp.h b/modules/access/rtp/rtp.h
similarity index 100%
rename from modules/demux/rtp.h
rename to modules/access/rtp/rtp.h
diff --git a/modules/demux/rtpsession.c b/modules/access/rtp/session.c
similarity index 100%
rename from modules/demux/rtpsession.c
rename to modules/access/rtp/session.c
diff --git a/modules/demux/rtpxiph.c b/modules/access/rtp/xiph.c
similarity index 100%
rename from modules/demux/rtpxiph.c
rename to modules/access/rtp/xiph.c
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 72f51fb..6a81ab1 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -56,16 +56,3 @@ libvlc_LTLIBRARIES += \
 	libwav_plugin.la \
 	libxa_plugin.la \
 	$(NULL)
-
-if HAVE_LIBGCRYPT
-# RTP plugin
-libvlc_LTLIBRARIES += \
-	librtp_plugin.la
-librtp_plugin_la_SOURCES = \
-	rtp.c rtp.h rtpsession.c
-librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-librtp_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(top_builddir)/libs/srtp/libvlc_srtp.la
-librtp_plugin_la_DEPENDENCIES = \
-	$(top_builddir)/libs/srtp/libvlc_srtp.la
-endif