From 96f479ec390681b428e63e900cbfa4274004ef4e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 7 Sep 2010 23:46:05 +0200
Subject: [PATCH] Build: move subtitles codecs to m/codec/ instead of
 m/codec/subtitles

Most subtitles codecs are still in m/codec/, like dvbsub, svcdsub, cvdsub, libass, spudec.
This makes it consistent.

This also removes an extra folder to compile...
---
 configure.ac                            |  1 -
 modules/codec/Modules.am                |  8 +++++++-
 modules/codec/{subtitles => }/subsass.c |  0
 modules/codec/{subtitles => }/subsdec.c |  0
 modules/codec/{subtitles => }/subsdec.h |  0
 modules/codec/{subtitles => }/subsusf.c |  0
 modules/codec/subtitles/Modules.am      |  9 ---------
 modules/codec/{subtitles => }/t140.c    |  0
 po/POTFILES.in                          | 10 +++++-----
 9 files changed, 12 insertions(+), 16 deletions(-)
 rename modules/codec/{subtitles => }/subsass.c (100%)
 rename modules/codec/{subtitles => }/subsdec.c (100%)
 rename modules/codec/{subtitles => }/subsdec.h (100%)
 rename modules/codec/{subtitles => }/subsusf.c (100%)
 delete mode 100644 modules/codec/subtitles/Modules.am
 rename modules/codec/{subtitles => }/t140.c (100%)

diff --git a/configure.ac b/configure.ac
index e9b6feffee..9f405071da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4567,7 +4567,6 @@ AC_CONFIG_FILES([
   modules/codec/dmo/Makefile
   modules/codec/omxil/Makefile
   modules/codec/shine/Makefile
-  modules/codec/subtitles/Makefile
   modules/codec/spudec/Makefile
   modules/codec/wmafixed/Makefile
   modules/control/Makefile
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 1a12b9130d..8867b8cebc 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = dmo avcodec shine subtitles spudec wmafixed omxil
+SUBDIRS = dmo avcodec shine spudec wmafixed omxil
 SOURCES_a52 = a52.c a52.h
 SOURCES_dts = dts.c
 SOURCES_flac = flac.c
@@ -34,6 +34,9 @@ SOURCES_kate = kate.c
 SOURCES_schroedinger = schroedinger.c
 SOURCES_libass = libass.c
 SOURCES_aes3 = aes3.c
+SOURCES_subsdec = subsass.c subsdec.c subsdec.h
+SOURCES_subsusf = subsusf.c subsdec.h
+SOURCES_t140 = t140.c
 
 libvlc_LTLIBRARIES += \
 	liba52_plugin.la \
@@ -50,4 +53,7 @@ libvlc_LTLIBRARIES += \
 	librawvideo_plugin.la \
 	libsvcdsub_plugin.la \
 	libinvmem_plugin.la \
+	libsubsdec_plugin.la \
+	libsubsusf_plugin.la \
+	libt140_plugin.la \
 	$(NULL)
diff --git a/modules/codec/subtitles/subsass.c b/modules/codec/subsass.c
similarity index 100%
rename from modules/codec/subtitles/subsass.c
rename to modules/codec/subsass.c
diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subsdec.c
similarity index 100%
rename from modules/codec/subtitles/subsdec.c
rename to modules/codec/subsdec.c
diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subsdec.h
similarity index 100%
rename from modules/codec/subtitles/subsdec.h
rename to modules/codec/subsdec.h
diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subsusf.c
similarity index 100%
rename from modules/codec/subtitles/subsusf.c
rename to modules/codec/subsusf.c
diff --git a/modules/codec/subtitles/Modules.am b/modules/codec/subtitles/Modules.am
deleted file mode 100644
index 9fa1f5f705..0000000000
--- a/modules/codec/subtitles/Modules.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES_subsdec = subsass.c subsdec.c subsdec.h
-SOURCES_subsusf = subsusf.c subsdec.h
-SOURCES_t140 = t140.c
-
-libvlc_LTLIBRARIES += \
-	libsubsdec_plugin.la \
-	libsubsusf_plugin.la \
-	libt140_plugin.la \
-	$(NULL)
diff --git a/modules/codec/subtitles/t140.c b/modules/codec/t140.c
similarity index 100%
rename from modules/codec/subtitles/t140.c
rename to modules/codec/t140.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f42cd7123..5c72fad155 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -394,11 +394,11 @@ modules/codec/speex.c
 modules/codec/spudec/parse.c
 modules/codec/spudec/spudec.c
 modules/codec/spudec/spudec.h
-modules/codec/subtitles/subsass.c
-modules/codec/subtitles/subsdec.c
-modules/codec/subtitles/subsdec.h
-modules/codec/subtitles/subsusf.c
-modules/codec/subtitles/t140.c
+modules/codec/subsass.c
+modules/codec/subsdec.c
+modules/codec/subsdec.h
+modules/codec/subsusf.c
+modules/codec/t140.c
 modules/codec/svcdsub.c
 modules/codec/telx.c
 modules/codec/theora.c
-- 
2.39.2