archive/*: move to archive/plugins/

Makefile.am

@@ -446,12 +446,12 @@ src_mpd_SOURCES +=  \
 	src/UpdateArchive.cxx src/UpdateArchive.hxx
 
 libarchive_a_SOURCES = \
-	src/ArchiveDomain.cxx src/ArchiveDomain.hxx \
-	src/ArchiveLookup.cxx src/ArchiveLookup.hxx \
-	src/ArchiveList.cxx src/ArchiveList.hxx \
-	src/ArchivePlugin.cxx src/ArchivePlugin.hxx \
-	src/ArchiveVisitor.hxx \
-	src/ArchiveFile.hxx \
+	src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \
+	src/archive/ArchiveLookup.cxx src/archive/ArchiveLookup.hxx \
+	src/archive/ArchiveList.cxx src/archive/ArchiveList.hxx \
+	src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \
+	src/archive/ArchiveVisitor.hxx \
+	src/archive/ArchiveFile.hxx \
 	src/input/ArchiveInputPlugin.cxx src/input/ArchiveInputPlugin.hxx
 libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(BZ2_CFLAGS) \
@@ -466,20 +466,20 @@ ARCHIVE_LIBS = \
 
 if HAVE_BZ2
 libarchive_a_SOURCES += \
-	src/archive/Bzip2ArchivePlugin.cxx \
-	src/archive/Bzip2ArchivePlugin.hxx
+	src/archive/plugins/Bzip2ArchivePlugin.cxx \
+	src/archive/plugins/Bzip2ArchivePlugin.hxx
 endif
 
 if HAVE_ZZIP
 libarchive_a_SOURCES += \
-	src/archive/ZzipArchivePlugin.cxx \
-	src/archive/ZzipArchivePlugin.hxx
+	src/archive/plugins/ZzipArchivePlugin.cxx \
+	src/archive/plugins/ZzipArchivePlugin.hxx
 endif
 
 if HAVE_ISO9660
 libarchive_a_SOURCES += \
-	src/archive/Iso9660ArchivePlugin.cxx \
-	src/archive/Iso9660ArchivePlugin.hxx
+	src/archive/plugins/Iso9660ArchivePlugin.cxx \
+	src/archive/plugins/Iso9660ArchivePlugin.hxx
 endif
 
 else

src/CommandLine.cxx

@@ -48,8 +48,8 @@
 #endif
 
 #ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
 #endif
 
 #include <stdio.h>

src/Main.cxx

@@ -76,7 +76,7 @@
 #endif
 
 #ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
 #endif
 
 #ifdef HAVE_GLIB

src/UpdateArchive.cxx

@@ -26,10 +26,10 @@
 #include "Song.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
+#include "archive/ArchiveVisitor.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 

src/ArchiveList.cxx → src/archive/ArchiveList.cxx

@@ -21,9 +21,9 @@
 #include "ArchiveList.hxx"
 #include "ArchivePlugin.hxx"
 #include "util/StringUtil.hxx"
-#include "archive/Bzip2ArchivePlugin.hxx"
-#include "archive/Iso9660ArchivePlugin.hxx"
-#include "archive/ZzipArchivePlugin.hxx"
+#include "plugins/Bzip2ArchivePlugin.hxx"
+#include "plugins/Iso9660ArchivePlugin.hxx"
+#include "plugins/ZzipArchivePlugin.hxx"
 #include "util/Macros.hxx"
 
 #include <string.h>

src/archive/Bzip2ArchivePlugin.cxx → src/archive/plugins/Bzip2ArchivePlugin.cxx

@@ -23,9 +23,9 @@
 
 #include "config.h"
 #include "Bzip2ArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
 #include "util/RefCount.hxx"

src/archive/Iso9660ArchivePlugin.cxx → src/archive/plugins/Iso9660ArchivePlugin.cxx

@@ -23,9 +23,9 @@
 
 #include "config.h"
 #include "Iso9660ArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
 #include "util/RefCount.hxx"

src/archive/ZzipArchivePlugin.cxx → src/archive/plugins/ZzipArchivePlugin.cxx

@@ -23,9 +23,9 @@
 
 #include "config.h"
 #include "ZzipArchivePlugin.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "../ArchivePlugin.hxx"
+#include "../ArchiveFile.hxx"
+#include "../ArchiveVisitor.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
 #include "util/RefCount.hxx"

src/input/ArchiveInputPlugin.cxx

@@ -19,11 +19,11 @@
 
 #include "config.h"
 #include "ArchiveInputPlugin.hxx"
-#include "ArchiveDomain.hxx"
-#include "ArchiveLookup.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
+#include "archive/ArchiveDomain.hxx"
+#include "archive/ArchiveLookup.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
 #include "InputPlugin.hxx"
 #include "fs/Traits.hxx"
 #include "util/Alloc.hxx"

test/dump_text_file.cxx

@@ -29,7 +29,7 @@
 #include "Log.hxx"
 
 #ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
 #endif
 
 #include <glib.h>

test/run_input.cxx

@@ -30,7 +30,7 @@
 #include "Log.hxx"
 
 #ifdef ENABLE_ARCHIVE
-#include "ArchiveList.hxx"
+#include "archive/ArchiveList.hxx"
 #endif
 
 #ifdef HAVE_GLIB

test/test_archive.cxx

 #include "config.h"
-#include "ArchiveLookup.hxx"
+#include "archive/ArchiveLookup.hxx"
 #include "Compiler.h"
 
 #include <cppunit/TestFixture.h>

test/visit_archive.cxx

@@ -23,10 +23,10 @@
 #include "ConfigGlobal.hxx"
 #include "IOThread.hxx"
 #include "InputInit.hxx"
-#include "ArchiveList.hxx"
-#include "ArchivePlugin.hxx"
-#include "ArchiveFile.hxx"
-#include "ArchiveVisitor.hxx"
+#include "archive/ArchiveList.hxx"
+#include "archive/ArchivePlugin.hxx"
+#include "archive/ArchiveFile.hxx"
+#include "archive/ArchiveVisitor.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"