Makefile.am: move sources to libsystem.a

2013-08-07 10:31:31 +02:00
parent a27d105dcd
commit b70d38dc10
43 changed files with 69 additions and 67 deletions
--- a/src/ClientNew.cxx
+++ b/src/ClientNew.cxx
@@ -22,9 +22,9 @@
 #include "ClientList.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 extern "C" {
-#include "resolver.h"
+#include "system/resolver.h"
 }
 #include "Permission.hxx"

--- a/src/Daemon.cxx
+++ b/src/Daemon.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "Daemon.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"

 #include <glib.h>

--- a/src/Daemon.hxx
+++ b/src/Daemon.hxx
@@ -46,7 +46,7 @@ daemonize_finish(void)
 void
 daemonize_kill(void);
 #else
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"
 static inline void
 daemonize_kill(void)
 {
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -24,7 +24,7 @@
 #include "DecoderError.hxx"
 #include "DecoderPlugin.hxx"
 #include "Song.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 #include "DecoderAPI.hxx"
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "InotifySource.hxx"
 #include "util/fifo_buffer.h"
-#include "fd_util.h"
-#include "FatalError.hxx"
+#include "system/fd_util.h"
+#include "system/FatalError.hxx"

 #include <glib.h>

--- a/src/Log.cxx
+++ b/src/Log.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "Log.hxx"
 #include "conf.h"
-#include "fd_util.h"
-#include "FatalError.hxx"
+#include "system/fd_util.h"
+#include "system/FatalError.hxx"
 #include "mpd_error.h"

 #include <assert.h>
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -55,7 +55,7 @@
 #include "AudioConfig.hxx"
 #include "pcm/PcmResample.hxx"
 #include "Daemon.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"

 extern "C" {
 #include "stats.h"
--- a/src/MusicBuffer.cxx
+++ b/src/MusicBuffer.cxx
@@ -22,7 +22,7 @@
 #include "MusicChunk.hxx"
 #include "thread/Mutex.hxx"
 #include "util/SliceBuffer.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"

 #include <assert.h>

--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -26,7 +26,7 @@
 #include "MusicBuffer.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"
 #include "conf.h"
 #include "notify.hxx"

--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -29,7 +29,7 @@
 #include "PlayerControl.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"
 #include "gcc.h"

 #include <glib.h>
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -26,7 +26,7 @@
 #include "MusicChunk.hxx"
 #include "Song.hxx"
 #include "Main.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"
 #include "OutputAll.hxx"
--- a/src/SignalHandlers.cxx
+++ b/src/SignalHandlers.cxx
@@ -26,7 +26,7 @@
 #include "Main.hxx"
 #include "event/Loop.hxx"
 #include "GlobalEvents.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"

 #include <glib.h>

--- a/src/Timer.cxx
+++ b/src/Timer.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Timer.hxx"
 #include "AudioFormat.hxx"
-#include "clock.h"
+#include "system/clock.h"

 #include <glib.h>

--- a/src/UpdateGlue.cxx
+++ b/src/UpdateGlue.cxx
@@ -33,7 +33,7 @@ extern "C" {

 #include "Main.hxx"
 #include "Instance.hxx"
-#include "FatalError.hxx"
+#include "system/FatalError.hxx"

 #include <glib.h>

--- a/src/event/BufferedSocket.cxx
+++ b/src/event/BufferedSocket.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "BufferedSocket.hxx"
-#include "SocketError.hxx"
+#include "system/SocketError.hxx"
 #include "util/fifo_buffer.h"

 #include <assert.h>
--- a/src/event/EventFD.cxx
+++ b/src/event/EventFD.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #ifdef USE_EVENTFD
 #include "EventFD.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "gcc.h"

 #include <unistd.h>
--- a/src/event/EventPipe.cxx
+++ b/src/event/EventPipe.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "EventPipe.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "gcc.h"

 #include <unistd.h>
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "FullyBufferedSocket.hxx"
-#include "SocketError.hxx"
+#include "system/SocketError.hxx"
 #include "util/fifo_buffer.h"

 #include <assert.h>
--- a/src/event/MultiSocketMonitor.cxx
+++ b/src/event/MultiSocketMonitor.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MultiSocketMonitor.hxx"
 #include "Loop.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "gcc.h"

 #include <assert.h>
--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -24,11 +24,11 @@
 #endif

 #include "ServerSocket.hxx"
-#include "SocketUtil.hxx"
-#include "SocketError.hxx"
+#include "system/SocketUtil.hxx"
+#include "system/SocketError.hxx"
 #include "event/SocketMonitor.hxx"
-#include "resolver.h"
-#include "fd_util.h"
+#include "system/resolver.h"
+#include "system/fd_util.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "gcc.h"

 #include <assert.h>
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -21,7 +21,7 @@
 #define MPD_FS_FILESYSTEM_HXX

 #include "check.h"
-#include "fd_util.h"
+#include "system/fd_util.h"

 #include "Path.hxx"

--- a/src/input/FileInputPlugin.cxx
+++ b/src/input/FileInputPlugin.cxx
@@ -22,7 +22,7 @@
 #include "InputInternal.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "open.h"
 #include "io_error.h"

--- a/src/mixer/OssMixerPlugin.cxx
+++ b/src/mixer/OssMixerPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MixerInternal.hxx"
 #include "OutputAPI.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"

 #include <glib.h>

--- a/src/output/FifoOutputPlugin.cxx
+++ b/src/output/FifoOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "FifoOutputPlugin.hxx"
 #include "OutputAPI.hxx"
 #include "Timer.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "open.h"

 #include <glib.h>
--- a/src/output/HttpdClient.cxx
+++ b/src/output/HttpdClient.cxx
@@ -23,7 +23,7 @@
 #include "util/fifo_buffer.h"
 #include "Page.hxx"
 #include "IcyMetaDataServer.hxx"
-#include "SocketError.hxx"
+#include "system/SocketError.hxx"

 #include <assert.h>
 #include <string.h>
--- a/src/output/HttpdOutputPlugin.cxx
+++ b/src/output/HttpdOutputPlugin.cxx
@@ -24,10 +24,10 @@
 #include "OutputAPI.hxx"
 #include "EncoderPlugin.hxx"
 #include "EncoderList.hxx"
-#include "resolver.h"
+#include "system/resolver.h"
 #include "Page.hxx"
 #include "IcyMetaDataServer.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "Main.hxx"

 #include <assert.h>
--- a/src/output/OssOutputPlugin.cxx
+++ b/src/output/OssOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "OssOutputPlugin.hxx"
 #include "OutputAPI.hxx"
 #include "MixerList.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"

 #include <glib.h>

--- a/src/output/RecorderOutputPlugin.cxx
+++ b/src/output/RecorderOutputPlugin.cxx
@@ -22,7 +22,7 @@
 #include "OutputAPI.hxx"
 #include "EncoderPlugin.hxx"
 #include "EncoderList.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"
 #include "open.h"

 #include <assert.h>
--- a/src/output/SolarisOutputPlugin.cxx
+++ b/src/output/SolarisOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SolarisOutputPlugin.hxx"
 #include "OutputAPI.hxx"
-#include "fd_util.h"
+#include "system/fd_util.h"

 #include <glib.h>

--- a/src/system/FatalError.cxx
+++ b/src/system/FatalError.cxx
--- a/src/system/FatalError.hxx
+++ b/src/system/FatalError.hxx
--- a/src/system/SocketError.hxx
+++ b/src/system/SocketError.hxx
--- a/src/system/SocketUtil.cxx
+++ b/src/system/SocketUtil.cxx
--- a/src/system/SocketUtil.hxx
+++ b/src/system/SocketUtil.hxx
--- a/src/system/clock.c
+++ b/src/system/clock.c
--- a/src/system/clock.h
+++ b/src/system/clock.h
--- a/src/system/fd_util.c
+++ b/src/system/fd_util.c
--- a/src/system/fd_util.h
+++ b/src/system/fd_util.h
--- a/src/system/resolver.c
+++ b/src/system/resolver.c
--- a/src/system/resolver.h
+++ b/src/system/resolver.h