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

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 = \

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>
 

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>
 

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>

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"

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>

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"

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"

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>