[filescanner/library] Move filescanner to subfolder

src/Makefile.am

@@ -2,7 +2,7 @@
 sbin_PROGRAMS = forked-daapd
 
 if COND_ITUNES
-ITUNES_SRC=filescanner_itunes.c
+ITUNES_SRC=library/filescanner_itunes.c
 endif
 
 if COND_SPOTIFY
@@ -79,9 +79,9 @@ forked_daapd_SOURCES = main.c \
 	logger.c logger.h \
 	conffile.c conffile.h \
 	cache.c cache.h \
-	filescanner.c filescanner.h \
+	library/filescanner.c library/filescanner.h \
-	filescanner_ffmpeg.c filescanner_playlist.c \
+	library/filescanner_ffmpeg.c library/filescanner_playlist.c \
-	filescanner_smartpl.c $(ITUNES_SRC) \
+	library/filescanner_smartpl.c $(ITUNES_SRC) \
 	library.c library.h \
 	mdns_avahi.c mdns.h \
 	remote_pairing.c remote_pairing.h \

src/library.c

@@ -41,7 +41,7 @@
 #include "commands.h"
 #include "conffile.h"
 #include "db.h"
-#include "filescanner.h"
+#include "library/filescanner.h"
 #include "logger.h"
 #include "misc.h"
 #include "player.h"

src/library/filescanner.c

@@ -54,7 +54,7 @@
 
 #include "logger.h"
 #include "db.h"
-#include "filescanner.h"
+#include "library/filescanner.h"
 #include "conffile.h"
 #include "misc.h"
 #include "remote_pairing.h"

src/library/filescanner_ffmpeg.c

@@ -31,8 +31,8 @@
 #include <libavformat/avformat.h>
 #include <libavutil/opt.h>
 
+#include "db.h"
 #include "logger.h"
-#include "filescanner.h"
 #include "misc.h"
 #include "http.h"
 

src/library/filescanner_itunes.c

@@ -41,7 +41,6 @@
 
 #include "logger.h"
 #include "db.h"
-#include "filescanner.h"
 #include "conffile.h"
 #include "misc.h"
 

src/library/filescanner_playlist.c

@@ -36,7 +36,7 @@
 
 #include "logger.h"
 #include "db.h"
-#include "filescanner.h"
+#include "library/filescanner.h"
 #include "misc.h"
 #include "library.h"
 

src/library/filescanner_smartpl.c

@@ -33,7 +33,6 @@
 
 #include "logger.h"
 #include "db.h"
-#include "filescanner.h"
 #include "misc.h"
 
 #include "SMARTPLLexer.h"