From 9b0de3ea1895dd52e520d8d1b25e0371e7088d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 22 Sep 2013 16:38:22 +0300
Subject: [PATCH] sd: remove recursion

---
 configure.ac                           |  1 -
 modules/Makefile.am                    |  2 +-
 modules/services_discovery/Makefile.am | 27 ++++++++++++--------------
 modules/services_discovery/upnp.cpp    |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 386aa0582aec..b3e365dd3904 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4209,7 +4209,6 @@ AC_CONFIG_FILES([
   modules/mux/Makefile
   modules/notify/Makefile
   modules/packetizer/Makefile
-  modules/services_discovery/Makefile
   modules/stream_filter/Makefile
   modules/stream_out/Makefile
   modules/text_renderer/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index c7fee3c4e88b..385942eb8f84 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,7 +10,6 @@ BASE_SUBDIRS = \
 	misc \
 	notify \
 	packetizer \
-	services_discovery \
 	stream_filter \
 	text_renderer \
 	video_chroma \
@@ -59,6 +58,7 @@ include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
 include meta_engine/Makefile.am
+include services_discovery/Makefile.am
 
 BUILT_SOURCES += dummy.cpp
 
diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am
index b1b306189080..71358431d9be 100644
--- a/modules/services_discovery/Makefile.am
+++ b/modules/services_discovery/Makefile.am
@@ -1,49 +1,46 @@
 sddir = $(pluginsdir)/services_discovery
 sd_LTLIBRARIES =
-EXTRA_LTLIBRARIES =
 
-include ../common.am
-
-libmediadirs_plugin_la_SOURCES = mediadirs.c
+libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c
 sd_LTLIBRARIES += libmediadirs_plugin.la
 
-libpodcast_plugin_la_SOURCES = podcast.c
+libpodcast_plugin_la_SOURCES = services_discovery/podcast.c
 sd_LTLIBRARIES += libpodcast_plugin.la
 
-libsap_plugin_la_SOURCES = sap.c
+libsap_plugin_la_SOURCES = services_discovery/sap.c
 libsap_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_sap)
 libsap_plugin_la_LIBADD = $(LIBS_sap) $(SOCKET_LIBS)
 sd_LTLIBRARIES += libsap_plugin.la
 
-libbonjour_plugin_la_SOURCES = bonjour.c
+libbonjour_plugin_la_SOURCES = services_discovery/bonjour.c
 libbonjour_plugin_la_CFLAGS = $(AM_CFLAGS) $(BONJOUR_CFLAGS)
 libbonjour_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
 libbonjour_plugin_la_LIBADD = $(BONJOUR_LIBS)
 EXTRA_LTLIBRARIES += libbonjour_plugin.la
 sd_LTLIBRARIES += $(LTLIBbonjour)
 
-libmtp_plugin_la_SOURCES = mtp.c
+libmtp_plugin_la_SOURCES = services_discovery/mtp.c
 libmtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
 libmtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
 libmtp_plugin_la_LIBADD = $(MTP_LIBS)
 EXTRA_LTLIBRARIES += libmtp_plugin.la
 sd_LTLIBRARIES += $(LTLIBmtp)
 
-libupnp_plugin_la_SOURCES = upnp.cpp upnp.hpp
+libupnp_plugin_la_SOURCES = services_discovery/upnp.cpp services_discovery/upnp.hpp
 libupnp_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(UPNP_CFLAGS)
 libupnp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
 libupnp_plugin_la_LIBADD = $(UPNP_LIBS)
 EXTRA_LTLIBRARIES += libupnp_plugin.la
 sd_LTLIBRARIES += $(LTLIBupnp)
 
-libpulselist_plugin_la_SOURCES = pulse.c
+libpulselist_plugin_la_SOURCES = services_discovery/pulse.c
 libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS)
+libpulselist_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS)
 if HAVE_PULSE
 sd_LTLIBRARIES += libpulselist_plugin.la
 endif
 
-libudev_plugin_la_SOURCES = udev.c
+libudev_plugin_la_SOURCES = services_discovery/udev.c
 libudev_plugin_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
 libudev_plugin_la_LIBADD = $(UDEV_LIBS)
 if HAVE_ALSA
@@ -54,19 +51,19 @@ libudev_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
 EXTRA_LTLIBRARIES += libudev_plugin.la
 sd_LTLIBRARIES += $(LTLIBudev)
 
-libxcb_apps_plugin_la_SOURCES = xcb_apps.c
+libxcb_apps_plugin_la_SOURCES = services_discovery/xcb_apps.c
 libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
 libxcb_apps_plugin_la_LIBADD = $(XCB_LIBS)
 if HAVE_XCB
 sd_LTLIBRARIES += libxcb_apps_plugin.la
 endif
 
-libwindrive_plugin_la_SOURCES = windrive.c
+libwindrive_plugin_la_SOURCES = services_discovery/windrive.c
 if HAVE_WIN32
 sd_LTLIBRARIES += libwindrive_plugin.la
 endif
 
-libos2drive_plugin_la_SOURCES = os2drive.c
+libos2drive_plugin_la_SOURCES = services_discovery/os2drive.c
 if HAVE_OS2
 sd_LTLIBRARIES += libos2drive_plugin.la
 endif
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 66223fa09136..5cecff20f75f 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include "upnp.hpp"
+#include "services_discovery/upnp.hpp"
 
 #include <vlc_plugin.h>
 #include <vlc_services_discovery.h>
-- 
GitLab