diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-30 13:39:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-30 13:39:12 +0100 |
| commit | 39d56d6b65dd8441afb39eb60553e25e768bbe7f (patch) | |
| tree | 54a7a4e9cad1550aedaad66b59518f6c91b65764 | |
| parent | a291415326f87afe5b42a89e9a90029b876895f2 (diff) | |
| download | mpd-39d56d6b65dd8441afb39eb60553e25e768bbe7f.tar.gz mpd-39d56d6b65dd8441afb39eb60553e25e768bbe7f.tar.xz mpd-39d56d6b65dd8441afb39eb60553e25e768bbe7f.zip | |
ServerSocket: move to libevent.a
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/Listen.cxx | 2 | ||||
| -rw-r--r-- | src/event/ServerSocket.cxx (renamed from src/ServerSocket.cxx) | 0 | ||||
| -rw-r--r-- | src/event/ServerSocket.hxx (renamed from src/ServerSocket.hxx) | 0 | ||||
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 97b8f7efd..5c599f4a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,6 @@ src_mpd_SOURCES = \ src/ClientMessage.cxx src/ClientMessage.hxx \ src/ClientSubscribe.cxx src/ClientSubscribe.hxx \ src/ClientFile.cxx src/ClientFile.hxx \ - src/ServerSocket.cxx src/ServerSocket.hxx \ src/Listen.cxx src/Listen.hxx \ src/Log.cxx src/Log.hxx \ src/ls.cxx \ @@ -328,6 +327,7 @@ libevent_a_SOURCES = \ src/event/BufferedSocket.cxx src/event/BufferedSocket.hxx \ src/event/FullyBufferedSocket.cxx src/event/FullyBufferedSocket.hxx \ src/event/MultiSocketMonitor.cxx src/event/MultiSocketMonitor.hxx \ + src/event/ServerSocket.cxx src/event/ServerSocket.hxx \ src/event/Loop.hxx # PCM library @@ -1337,8 +1337,7 @@ test_run_output_SOURCES = test/run_output.cxx \ src/filter_config.c \ src/AudioCompress/compress.c \ src/ReplayGainInfo.cxx \ - src/fd_util.c \ - src/ServerSocket.cxx + src/fd_util.c test_read_mixer_LDADD = \ libpcm.a \ diff --git a/src/Listen.cxx b/src/Listen.cxx index 7bc10dc18..f1d6e4fec 100644 --- a/src/Listen.cxx +++ b/src/Listen.cxx @@ -22,7 +22,7 @@ #include "Main.hxx" #include "Client.hxx" #include "conf.h" -#include "ServerSocket.hxx" +#include "event/ServerSocket.hxx" #include <string.h> #include <assert.h> diff --git a/src/ServerSocket.cxx b/src/event/ServerSocket.cxx index a1e2ee01e..a1e2ee01e 100644 --- a/src/ServerSocket.cxx +++ b/src/event/ServerSocket.cxx diff --git a/src/ServerSocket.hxx b/src/event/ServerSocket.hxx index eea4b0851..eea4b0851 100644 --- a/src/ServerSocket.hxx +++ b/src/event/ServerSocket.hxx diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index a9b27c483..871047a5f 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -28,7 +28,7 @@ #include "Page.hxx" #include "IcyMetaDataServer.hxx" #include "fd_util.h" -#include "ServerSocket.hxx" +#include "event/ServerSocket.hxx" #include "Main.hxx" #include <assert.h> |