zeroconf/avahi: move generic sources to lib/avahi

src/zeroconf/avahi/Helper.cxx

@@ -18,10 +18,10 @@
  */
 
 #include "Helper.hxx"
-#include "Client.hxx"
-#include "ErrorHandler.hxx"
-#include "Publisher.hxx"
-#include "Service.hxx"
+#include "lib/avahi/Client.hxx"
+#include "lib/avahi/ErrorHandler.hxx"
+#include "lib/avahi/Publisher.hxx"
+#include "lib/avahi/Service.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
 

src/zeroconf/avahi/meson.build

@@ -7,10 +7,10 @@ endif
 avahi = static_library(
   'avahi',
   'Helper.cxx',
-  'Client.cxx',
-  'Error.cxx',
-  'Poll.cxx',
-  'Publisher.cxx',
+  '../../lib/avahi/Client.cxx',
+  '../../lib/avahi/Error.cxx',
+  '../../lib/avahi/Poll.cxx',
+  '../../lib/avahi/Publisher.cxx',
   include_directories: inc,
   dependencies: [
     log_dep,