Tag*: move libtag.a sources to src/tag/

23 files changed, 22 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 2ad19c3c8..cfdc42c6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,8 +63,6 @@ mpd_headers = \
 	src/open.h \
 	src/Playlist.hxx \
 	src/poison.h \
-	src/riff.h \
-	src/aiff.h \
 	src/replay_gain_config.h \
 	src/replay_gain_info.h \
 	src/TimePrint.cxx src/TimePrint.hxx \
@@ -432,15 +430,16 @@ TAG_LIBS = \
 	$(ID3TAG_LIBS)
 
 libtag_a_SOURCES =\
-	src/ApeLoader.cxx src/ApeLoader.hxx \
-	src/ApeReplayGain.cxx src/ApeReplayGain.hxx \
-	src/ApeTag.cxx src/ApeTag.hxx
+	src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx \
+	src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx \
+	src/tag/ApeTag.cxx src/tag/ApeTag.hxx
 
 if HAVE_ID3TAG
 libtag_a_SOURCES += \
-	src/TagId3.cxx src/TagId3.hxx \
-	src/TagRva2.cxx src/TagRva2.hxx \
-	src/riff.c src/aiff.c
+	src/tag/TagId3.cxx src/tag/TagId3.hxx \
+	src/tag/TagRva2.cxx src/tag/TagRva2.hxx \
+	src/tag/riff.c src/tag/riff.h \
+	src/tag/aiff.c src/tag/aiff.h
 endif
 
 # decoder plugins
@@ -1218,14 +1217,11 @@ test_read_tags_SOURCES = test/read_tags.cxx \
 
 if HAVE_ID3TAG
 test_dump_rva2_LDADD = \
-	$(ID3TAG_LIBS) \
+	$(TAG_LIBS) \
 	libutil.a \
 	$(GLIB_LIBS)
 test_dump_rva2_SOURCES = test/dump_rva2.cxx \
-	src/riff.c src/aiff.c \
-	src/TagHandler.cxx \
-	src/TagId3.cxx \
-	src/TagRva2.cxx
+	src/TagHandler.cxx
 endif
 
 test_run_filter_LDADD = \
diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx
index 5a44f0453..eb463973e 100644
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -33,7 +33,7 @@
 #include "DecoderList.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
-#include "ApeReplayGain.hxx"
+#include "tag/ApeReplayGain.hxx"
 
 #include <glib.h>
 
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index d6f60c5cb..7e374e759 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -30,8 +30,8 @@
 #include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 #include "TagHandler.hxx"
-#include "TagId3.hxx"
-#include "ApeTag.hxx"
+#include "tag/TagId3.hxx"
+#include "tag/ApeTag.hxx"
 
 #include <glib.h>
 
diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx
index a9cfc9147..eb3d537b9 100644
--- a/src/decoder/DsdLib.cxx
+++ b/src/decoder/DsdLib.cxx
@@ -28,7 +28,7 @@
 #include "DecoderAPI.hxx"
 #include "util/bit_reverse.h"
 #include "TagHandler.hxx"
-#include "TagId3.hxx"
+#include "tag/TagId3.hxx"
 #include "util/Error.hxx"
 
 #include <unistd.h>
diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx
index f77563fb2..381a5703f 100644
--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -21,8 +21,8 @@
 #include "MadDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "conf.h"
-#include "TagId3.hxx"
-#include "TagRva2.hxx"
+#include "tag/TagId3.hxx"
+#include "tag/TagRva2.hxx"
 #include "TagHandler.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"
diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx
index 528ecdc3c..88394f2c1 100644
--- a/src/decoder/WavpackDecoderPlugin.cxx
+++ b/src/decoder/WavpackDecoderPlugin.cxx
@@ -23,7 +23,7 @@
 #include "InputStream.hxx"
 #include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
-#include "ApeTag.hxx"
+#include "tag/ApeTag.hxx"
 #include "util/Error.hxx"
 
 #include <wavpack/wavpack.h>
diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
index 978c05026..237bccdd5 100644
--- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
@@ -28,8 +28,8 @@
 #include "PlaylistPlugin.hxx"
 #include "Tag.hxx"
 #include "TagHandler.hxx"
-#include "TagId3.hxx"
-#include "ApeTag.hxx"
+#include "tag/TagId3.hxx"
+#include "tag/ApeTag.hxx"
 #include "Song.hxx"
 #include "TagFile.hxx"
 #include "cue/CueParser.hxx"
diff --git a/src/ApeLoader.cxx b/src/tag/ApeLoader.cxx
index dfbdb4ef3..dfbdb4ef3 100644
--- a/src/ApeLoader.cxx
+++ b/src/tag/ApeLoader.cxx
diff --git a/src/ApeLoader.hxx b/src/tag/ApeLoader.hxx
index a32ab840c..a32ab840c 100644
--- a/src/ApeLoader.hxx
+++ b/src/tag/ApeLoader.hxx
diff --git a/src/ApeReplayGain.cxx b/src/tag/ApeReplayGain.cxx
index 0135d1b61..0135d1b61 100644
--- a/src/ApeReplayGain.cxx
+++ b/src/tag/ApeReplayGain.cxx
diff --git a/src/ApeReplayGain.hxx b/src/tag/ApeReplayGain.hxx
index 4bc34a9d2..4bc34a9d2 100644
--- a/src/ApeReplayGain.hxx
+++ b/src/tag/ApeReplayGain.hxx
diff --git a/src/ApeTag.cxx b/src/tag/ApeTag.cxx
index 34c2b703b..34c2b703b 100644
--- a/src/ApeTag.cxx
+++ b/src/tag/ApeTag.cxx
diff --git a/src/ApeTag.hxx b/src/tag/ApeTag.hxx
index 1a7143314..1a7143314 100644
--- a/src/ApeTag.hxx
+++ b/src/tag/ApeTag.hxx
diff --git a/src/TagId3.cxx b/src/tag/TagId3.cxx
index 3f7605f5e..3f7605f5e 100644
--- a/src/TagId3.cxx
+++ b/src/tag/TagId3.cxx
diff --git a/src/TagId3.hxx b/src/tag/TagId3.hxx
index ca288754b..ca288754b 100644
--- a/src/TagId3.hxx
+++ b/src/tag/TagId3.hxx
diff --git a/src/TagRva2.cxx b/src/tag/TagRva2.cxx
index f41119c35..f41119c35 100644
--- a/src/TagRva2.cxx
+++ b/src/tag/TagRva2.cxx
diff --git a/src/TagRva2.hxx b/src/tag/TagRva2.hxx
index 016a3585d..016a3585d 100644
--- a/src/TagRva2.hxx
+++ b/src/tag/TagRva2.hxx
diff --git a/src/aiff.c b/src/tag/aiff.c
index f66f29e2d..f66f29e2d 100644
--- a/src/aiff.c
+++ b/src/tag/aiff.c
diff --git a/src/aiff.h b/src/tag/aiff.h
index a0ae2d41a..a0ae2d41a 100644
--- a/src/aiff.h
+++ b/src/tag/aiff.h
diff --git a/src/riff.c b/src/tag/riff.c
index 9ee916971..9ee916971 100644
--- a/src/riff.c
+++ b/src/tag/riff.c
diff --git a/src/riff.h b/src/tag/riff.h
index 7b35e092a..7b35e092a 100644
--- a/src/riff.h
+++ b/src/tag/riff.h
diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx
index 95a55eb43..2bc8e0a85 100644
--- a/test/dump_rva2.cxx
+++ b/test/dump_rva2.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "TagId3.hxx"
-#include "TagRva2.hxx"
+#include "tag/TagId3.hxx"
+#include "tag/TagRva2.hxx"
 #include "replay_gain_info.h"
 #include "conf.h"
 #include "Tag.hxx"
diff --git a/test/read_tags.cxx b/test/read_tags.cxx
index 8e45be930..7a3cd15d7 100644
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
@@ -25,8 +25,8 @@
 #include "InputStream.hxx"
 #include "AudioFormat.hxx"
 #include "TagHandler.hxx"
-#include "TagId3.hxx"
-#include "ApeTag.hxx"
+#include "tag/TagId3.hxx"
+#include "tag/ApeTag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>