From 299ff2b23ffbd3c4511768f7bfbf427315b0650d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:12:10 +0100 Subject: [PATCH] move daemonization code to unix/ --- Makefile.am | 6 +++--- src/Main.cxx | 4 ++-- src/{ => unix}/Daemon.cxx | 0 src/{ => unix}/Daemon.hxx | 0 src/{ => unix}/PidFile.hxx | 0 src/{ => unix}/SignalHandlers.cxx | 0 src/{ => unix}/SignalHandlers.hxx | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename src/{ => unix}/Daemon.cxx (100%) rename src/{ => unix}/Daemon.hxx (100%) rename src/{ => unix}/PidFile.hxx (100%) rename src/{ => unix}/SignalHandlers.cxx (100%) rename src/{ => unix}/SignalHandlers.hxx (100%) diff --git a/Makefile.am b/Makefile.am index cd2c4c555..debdbab40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,8 +157,9 @@ src_mpd_SOURCES = \ src/Instance.cxx src/Instance.hxx \ src/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ - src/Daemon.cxx src/Daemon.hxx \ - src/PidFile.hxx \ + src/unix/SignalHandlers.cxx src/unix/SignalHandlers.hxx \ + src/unix/Daemon.cxx src/unix/Daemon.hxx \ + src/unix/PidFile.hxx \ src/AudioCompress/compress.c \ src/MixRampInfo.hxx \ src/MusicBuffer.cxx src/MusicBuffer.hxx \ @@ -194,7 +195,6 @@ src_mpd_SOURCES = \ src/queue/QueueSave.cxx src/queue/QueueSave.hxx \ src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \ src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \ - src/SignalHandlers.cxx src/SignalHandlers.hxx \ src/DetachedSong.cxx src/DetachedSong.hxx \ src/LightSong.cxx src/LightSong.hxx \ src/LightDirectory.hxx \ diff --git a/src/Main.cxx b/src/Main.cxx index 94b510de3..912e28a62 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -41,7 +41,6 @@ #include "tag/TagConfig.hxx" #include "ReplayGainConfig.hxx" #include "Idle.hxx" -#include "SignalHandlers.hxx" #include "Log.hxx" #include "LogInit.hxx" #include "GlobalEvents.hxx" @@ -56,7 +55,8 @@ #include "decoder/DecoderList.hxx" #include "AudioConfig.hxx" #include "pcm/PcmConvert.hxx" -#include "Daemon.hxx" +#include "unix/SignalHandlers.hxx" +#include "unix/Daemon.hxx" #include "system/FatalError.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/Daemon.cxx b/src/unix/Daemon.cxx similarity index 100% rename from src/Daemon.cxx rename to src/unix/Daemon.cxx diff --git a/src/Daemon.hxx b/src/unix/Daemon.hxx similarity index 100% rename from src/Daemon.hxx rename to src/unix/Daemon.hxx diff --git a/src/PidFile.hxx b/src/unix/PidFile.hxx similarity index 100% rename from src/PidFile.hxx rename to src/unix/PidFile.hxx diff --git a/src/SignalHandlers.cxx b/src/unix/SignalHandlers.cxx similarity index 100% rename from src/SignalHandlers.cxx rename to src/unix/SignalHandlers.cxx diff --git a/src/SignalHandlers.hxx b/src/unix/SignalHandlers.hxx similarity index 100% rename from src/SignalHandlers.hxx rename to src/unix/SignalHandlers.hxx