From 6b70f5e49097c334c461994bb855709977bd8dae Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 00:14:54 +0100 Subject: [PATCH] Zeroconf*: move to zeroconf/ --- Makefile.am | 12 ++++++------ src/Main.cxx | 2 +- src/{ => zeroconf}/AvahiPoll.cxx | 0 src/{ => zeroconf}/AvahiPoll.hxx | 0 src/{ => zeroconf}/ZeroconfAvahi.cxx | 0 src/{ => zeroconf}/ZeroconfAvahi.hxx | 0 src/{ => zeroconf}/ZeroconfBonjour.cxx | 0 src/{ => zeroconf}/ZeroconfBonjour.hxx | 0 src/{ => zeroconf}/ZeroconfGlue.cxx | 0 src/{ => zeroconf}/ZeroconfGlue.hxx | 0 src/{ => zeroconf}/ZeroconfInternal.hxx | 0 test/run_avahi.cxx | 2 +- 12 files changed, 8 insertions(+), 8 deletions(-) rename src/{ => zeroconf}/AvahiPoll.cxx (100%) rename src/{ => zeroconf}/AvahiPoll.hxx (100%) rename src/{ => zeroconf}/ZeroconfAvahi.cxx (100%) rename src/{ => zeroconf}/ZeroconfAvahi.hxx (100%) rename src/{ => zeroconf}/ZeroconfBonjour.cxx (100%) rename src/{ => zeroconf}/ZeroconfBonjour.hxx (100%) rename src/{ => zeroconf}/ZeroconfGlue.cxx (100%) rename src/{ => zeroconf}/ZeroconfGlue.hxx (100%) rename src/{ => zeroconf}/ZeroconfInternal.hxx (100%) diff --git a/Makefile.am b/Makefile.am index dbc720a82..22486443d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -807,17 +807,17 @@ endif if HAVE_ZEROCONF src_mpd_SOURCES += \ - src/ZeroconfInternal.hxx \ - src/ZeroconfGlue.cxx src/ZeroconfGlue.hxx + src/zeroconf/ZeroconfInternal.hxx \ + src/zeroconf/ZeroconfGlue.cxx src/zeroconf/ZeroconfGlue.hxx if HAVE_AVAHI src_mpd_SOURCES += \ - src/AvahiPoll.cxx src/AvahiPoll.hxx \ - src/ZeroconfAvahi.cxx src/ZeroconfAvahi.hxx + src/zeroconf/AvahiPoll.cxx src/zeroconf/AvahiPoll.hxx \ + src/zeroconf/ZeroconfAvahi.cxx src/zeroconf/ZeroconfAvahi.hxx endif if HAVE_BONJOUR -src_mpd_SOURCES += src/ZeroconfBonjour.cxx src/ZeroconfBonjour.hxx +src_mpd_SOURCES += src/zeroconf/ZeroconfBonjour.cxx src/zeroconf/ZeroconfBonjour.hxx endif endif @@ -1486,7 +1486,7 @@ test_software_volume_LDADD = \ test_run_avahi_SOURCES = \ src/Log.cxx src/LogBackend.cxx \ - src/ZeroconfAvahi.cxx src/AvahiPoll.cxx \ + src/zeroconf/ZeroconfAvahi.cxx src/zeroconf/AvahiPoll.cxx \ test/ShutdownHandler.cxx test/ShutdownHandler.hxx \ test/run_avahi.cxx test_run_avahi_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/src/Main.cxx b/src/Main.cxx index 28afd12cf..8f6780661 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -52,7 +52,7 @@ #include "fs/Config.hxx" #include "fs/StandardDirectory.hxx" #include "playlist/PlaylistRegistry.hxx" -#include "ZeroconfGlue.hxx" +#include "zeroconf/ZeroconfGlue.hxx" #include "decoder/DecoderList.hxx" #include "AudioConfig.hxx" #include "pcm/PcmConvert.hxx" diff --git a/src/AvahiPoll.cxx b/src/zeroconf/AvahiPoll.cxx similarity index 100% rename from src/AvahiPoll.cxx rename to src/zeroconf/AvahiPoll.cxx diff --git a/src/AvahiPoll.hxx b/src/zeroconf/AvahiPoll.hxx similarity index 100% rename from src/AvahiPoll.hxx rename to src/zeroconf/AvahiPoll.hxx diff --git a/src/ZeroconfAvahi.cxx b/src/zeroconf/ZeroconfAvahi.cxx similarity index 100% rename from src/ZeroconfAvahi.cxx rename to src/zeroconf/ZeroconfAvahi.cxx diff --git a/src/ZeroconfAvahi.hxx b/src/zeroconf/ZeroconfAvahi.hxx similarity index 100% rename from src/ZeroconfAvahi.hxx rename to src/zeroconf/ZeroconfAvahi.hxx diff --git a/src/ZeroconfBonjour.cxx b/src/zeroconf/ZeroconfBonjour.cxx similarity index 100% rename from src/ZeroconfBonjour.cxx rename to src/zeroconf/ZeroconfBonjour.cxx diff --git a/src/ZeroconfBonjour.hxx b/src/zeroconf/ZeroconfBonjour.hxx similarity index 100% rename from src/ZeroconfBonjour.hxx rename to src/zeroconf/ZeroconfBonjour.hxx diff --git a/src/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx similarity index 100% rename from src/ZeroconfGlue.cxx rename to src/zeroconf/ZeroconfGlue.cxx diff --git a/src/ZeroconfGlue.hxx b/src/zeroconf/ZeroconfGlue.hxx similarity index 100% rename from src/ZeroconfGlue.hxx rename to src/zeroconf/ZeroconfGlue.hxx diff --git a/src/ZeroconfInternal.hxx b/src/zeroconf/ZeroconfInternal.hxx similarity index 100% rename from src/ZeroconfInternal.hxx rename to src/zeroconf/ZeroconfInternal.hxx diff --git a/test/run_avahi.cxx b/test/run_avahi.cxx index b44980bc6..d1c153cfd 100644 --- a/test/run_avahi.cxx +++ b/test/run_avahi.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "event/Loop.hxx" #include "ShutdownHandler.hxx" -#include "ZeroconfAvahi.hxx" +#include "zeroconf/ZeroconfAvahi.hxx" #include