[vlc-commits] Move text_renderer/ out of misc/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  4 15:10:13 2011 +0300| [0d648eeea4101aa92f7b02d6ad114c6d086c9f82] | committer: Rémi Denis-Courmont

Move text_renderer/ out of misc/

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

 configure.ac                                  |    1 +
 modules/Makefile.am                           |    1 +
 modules/misc/Modules.am                       |   10 ----------
 modules/text_renderer/.gitignore              |    1 +
 modules/text_renderer/Modules.am              |   10 ++++++++++
 modules/{misc => }/text_renderer/freetype.c   |    0
 modules/{misc => }/text_renderer/quartztext.c |    0
 modules/{misc => }/text_renderer/svg.c        |    0
 modules/{misc => }/text_renderer/tdummy.c     |    0
 modules/{misc => }/text_renderer/win32text.c  |    0
 po/POTFILES.in                                |   10 +++++-----
 11 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4980d2e..f2b777f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4411,6 +4411,7 @@ AC_CONFIG_FILES([
   modules/stream_filter/Makefile
   modules/stream_out/Makefile
   modules/stream_out/transcode/Makefile
+  modules/text_renderer/Makefile
   modules/video_chroma/Makefile
   modules/video_filter/Makefile
   modules/video_filter/dynamicoverlay/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 4473820..3e8549b 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -14,6 +14,7 @@ BASE_SUBDIRS = \
 	packetizer \
 	services_discovery \
 	stream_filter \
+	text_renderer \
 	video_chroma \
 	video_filter \
 	video_output \
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 9d96c07..a1c28a5 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -3,13 +3,6 @@ BASE_SUBDIRS = notify playlist stats osd
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS)
 
-SOURCES_freetype = text_renderer/freetype.c
-SOURCES_tdummy = text_renderer/tdummy.c
-SOURCES_win32text = text_renderer/win32text.c
-SOURCES_quartztext = text_renderer/quartztext.c
-libvlc_LTLIBRARIES += libtdummy_plugin.la
-
-SOURCES_svg = text_renderer/svg.c
 SOURCES_logger = logger.c
 SOURCES_vod_rtsp = rtsp.c
 SOURCES_gnutls = gnutls.c dhparams.h
@@ -41,9 +34,6 @@ libvlc_LTLIBRARIES += \
 	libaudioscrobbler_plugin.la \
 	liblogger_plugin.la
 
-if HAVE_WINCE
-libvlc_LTLIBRARIES += libwin32text_plugin.la
-endif
 if ENABLE_SOUT
 libvlc_LTLIBRARIES += \
 	libvod_rtsp_plugin.la \
diff --git a/modules/text_renderer/.gitignore b/modules/text_renderer/.gitignore
new file mode 100644
index 0000000..08a6d72
--- /dev/null
+++ b/modules/text_renderer/.gitignore
@@ -0,0 +1 @@
+Makefile.am
diff --git a/modules/text_renderer/Modules.am b/modules/text_renderer/Modules.am
new file mode 100644
index 0000000..cac7a27
--- /dev/null
+++ b/modules/text_renderer/Modules.am
@@ -0,0 +1,10 @@
+SOURCES_freetype = freetype.c
+SOURCES_quartztext = quartztext.c
+SOURCES_svg = svg.c
+SOURCES_tdummy = tdummy.c
+SOURCES_win32text = win32text.c
+
+libvlc_LTLIBRARIES += libtdummy_plugin.la
+if HAVE_WINCE
+libvlc_LTLIBRARIES += libwin32text_plugin.la
+endif
diff --git a/modules/misc/text_renderer/freetype.c b/modules/text_renderer/freetype.c
similarity index 100%
rename from modules/misc/text_renderer/freetype.c
rename to modules/text_renderer/freetype.c
diff --git a/modules/misc/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
similarity index 100%
rename from modules/misc/text_renderer/quartztext.c
rename to modules/text_renderer/quartztext.c
diff --git a/modules/misc/text_renderer/svg.c b/modules/text_renderer/svg.c
similarity index 100%
rename from modules/misc/text_renderer/svg.c
rename to modules/text_renderer/svg.c
diff --git a/modules/misc/text_renderer/tdummy.c b/modules/text_renderer/tdummy.c
similarity index 100%
rename from modules/misc/text_renderer/tdummy.c
rename to modules/text_renderer/tdummy.c
diff --git a/modules/misc/text_renderer/win32text.c b/modules/text_renderer/win32text.c
similarity index 100%
rename from modules/misc/text_renderer/win32text.c
rename to modules/text_renderer/win32text.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3c3561a..97f6c0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -940,11 +940,6 @@ modules/misc/stats/demux.c
 modules/misc/stats/encoder.c
 modules/misc/stats/stats.c
 modules/misc/stats/stats.h
-modules/misc/text_renderer/freetype.c
-modules/misc/text_renderer/quartztext.c
-modules/misc/text_renderer/svg.c
-modules/misc/text_renderer/tdummy.c
-modules/misc/text_renderer/win32text.c
 modules/misc/xml/libxml.c
 modules/mmx/memcpy.c
 modules/mmxext/memcpy.c
@@ -1006,6 +1001,11 @@ modules/stream_out/smem.c
 modules/stream_out/standard.c
 modules/stream_out/switcher.c
 modules/stream_out/transcode/transcode.c
+modules/text_renderer/freetype.c
+modules/text_renderer/quartztext.c
+modules/text_renderer/svg.c
+modules/text_renderer/tdummy.c
+modules/text_renderer/win32text.c
 modules/video_chroma/grey_yuv.c
 modules/video_chroma/i420_rgb.c
 modules/video_chroma/i420_rgb.h