misc: remove makefile recursion

diff --git a/configure.ac b/configure.ac
index cd3400687885d406e80735a50a7644b8173989a5..2b13d5b4cfaa4ef5ec104ef980a4efd38ba3262b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4257,7 +4257,6 @@ AC_CONFIG_FILES([
   modules/gui/macosx_dialog_provider/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
-  modules/misc/Makefile
   modules/mux/Makefile
   modules/packetizer/Makefile
   modules/stream_out/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 663bf4840726118d3502e3b2730aed7d458d2da4..f05787149870e657fa88bcd6248498231de6cab8 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -7,7 +7,6 @@ BASE_SUBDIRS = \
        audio_filter \
        control \
        gui \
-       misc \
        packetizer \
        text_renderer \
        video_filter \
@@ -44,6 +43,7 @@ include demux/Makefile.am
 include hw/vdpau/Makefile.am
 include lua/Makefile.am
 include meta_engine/Makefile.am
+include misc/Makefile.am
 include notify/Makefile.am
 include services_discovery/Makefile.am
 include stream_filter/Makefile.am

diff --git a/modules/misc/Makefile.am b/modules/misc/Makefile.am
index 8135cfd259deca6fbdc34a37ed43b7ea985a1406..01a2444d1369bfb6d77583a73e4b960fbd7c96e1 100644 (file)
--- a/modules/misc/Makefile.am
+++ b/modules/misc/Makefile.am
@@ -1,27 +1,33 @@
 miscdir = $(pluginsdir)/misc
-misc_LTLIBRARIES =
-EXTRA_LTLIBRARIES =
 
-include $(top_srcdir)/modules/common.am
+liblogger_plugin_la_SOURCES = misc/logger.c
+if HAVE_ANDROID
+liblogger_plugin_la_LIBADD = -llog
+endif
+libstats_plugin_la_SOURCES = misc/stats.c
 
-libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c
+misc_LTLIBRARIES = liblogger_plugin.la libstats_plugin.la
+
+libaudioscrobbler_plugin_la_SOURCES = misc/audioscrobbler.c
 libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
 misc_LTLIBRARIES += libaudioscrobbler_plugin.la
 
 libexport_plugin_la_SOURCES = \
-       playlist/html.c \
-       playlist/m3u.c \
-       playlist/xspf.c \
-       playlist/export.c
+       misc/playlist/html.c \
+       misc/playlist/m3u.c \
+       misc/playlist/xspf.c \
+       misc/playlist/export.c
 misc_LTLIBRARIES += libexport_plugin.la
 
-libfingerprinter_plugin_la_SOURCES = fingerprinter.c \
-       webservices/acoustid.c webservices/acoustid.h \
-       webservices/json.c webservices/json.h
+libfingerprinter_plugin_la_SOURCES =  \
+       misc/webservices/acoustid.c misc/webservices/acoustid.h \
+       misc/webservices/json.c misc/webservices/json.h \
+       misc/fingerprinter.c
+libfingerprinter_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/misc
 libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD)
 misc_LTLIBRARIES += libfingerprinter_plugin.la
 
-libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
+libgnutls_plugin_la_SOURCES = misc/gnutls.c misc/dhparams.h
 libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
 libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
 if HAVE_WIN32
@@ -35,51 +41,42 @@ EXTRA_LTLIBRARIES += libgnutls_plugin.la
 misc_LTLIBRARIES += $(LTLIBgnutls)
 
 if HAVE_DARWIN
-libsecuretransport_plugin_la_SOURCES = securetransport.c
+libsecuretransport_plugin_la_SOURCES = misc/securetransport.c
 libsecuretransport_plugin_la_CFLAGS = $(AM_CFLAGS) $(SECURETRANSPORT_CFLAGS)
 libsecuretransport_plugin_la_LIBADD = $(SECURETRANSPORT_LIBS)
 libsecuretransport_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)' -Wl,-framework,Security,-framework,CoreFoundation
 misc_LTLIBRARIES += libsecuretransport_plugin.la
 endif
 
-libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
+libxdg_screensaver_plugin_la_SOURCES = misc/inhibit/xdg.c
 if HAVE_XCB
 misc_LTLIBRARIES += libxdg_screensaver_plugin.la
 endif
 
-libdbus_screensaver_plugin_la_SOURCES = inhibit/dbus.c
+libdbus_screensaver_plugin_la_SOURCES = misc/inhibit/dbus.c
 libdbus_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 libdbus_screensaver_plugin_la_LIBADD = $(DBUS_LIBS)
 if HAVE_DBUS
 misc_LTLIBRARIES += libdbus_screensaver_plugin.la
 endif
 
-liblogger_plugin_la_SOURCES = logger.c
-if HAVE_ANDROID
-liblogger_plugin_la_LIBADD = -llog
-endif
-
-libstats_plugin_la_SOURCES = stats.c
-
+libaddonsvorepository_plugin_la_SOURCES = \
+       misc/addons/vorepository.c misc/addons/xmlreading.h
+libaddonsfsstorage_plugin_la_SOURCES = \
+       misc/addons/fsstorage.c misc/addons/xmlreading.h
 if ENABLE_ADDONMANAGERMODULES
-libaddonsvorepository_plugin_la_SOURCES = addons/vorepository.c addons/xmlreading.h
-libaddonsfsstorage_plugin_la_SOURCES = addons/fsstorage.c addons/xmlreading.h
 misc_LTLIBRARIES += \
        libaddonsvorepository_plugin.la \
        libaddonsfsstorage_plugin.la
 endif
 
-misc_LTLIBRARIES += \
-       liblogger_plugin.la \
-       libstats_plugin.la
-
-libvod_rtsp_plugin_la_SOURCES = rtsp.c
+libvod_rtsp_plugin_la_SOURCES = misc/rtsp.c
 libvod_rtsp_plugin_la_LIBADD = $(SOCKET_LIBS)
 if ENABLE_SOUT
 misc_LTLIBRARIES += libvod_rtsp_plugin.la
 endif
 
-libxml_plugin_la_SOURCES = xml/libxml.c
+libxml_plugin_la_SOURCES = misc/xml/libxml.c
 libxml_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS)
 libxml_plugin_la_LIBADD = $(LIBXML2_LIBS)
 libxml_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)' $(LDFLAGS_xml)