X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2FModules.am;h=aa11e3636a8ef274f885172bff9b88d697b62901;hb=eaa5b3205e95fbf6f256ffdf00f72adc08bba77c;hp=37d4ba28da4be25bad7e6ad4a393631f93da51c4;hpb=a43414d06f78d2a6e7d5c87ae612c32b69bc6d19;p=vlc

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 37d4ba28da..aa11e3636a 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,60 +1,75 @@
-BASE_SUBDIRS = playlist stats osd
-
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS)
-
-SOURCES_logger = logger.c
 SOURCES_vod_rtsp = rtsp.c
-SOURCES_audioscrobbler = audioscrobbler.c
-SOURCES_inhibit = inhibit.c
-SOURCES_sqlite = sqlite.c
+
 SOURCES_xml = xml/libxml.c
 
-SOURCES_memcpy = memcpy.c
-libvlc_LTLIBRARIES += libmemcpy_plugin.la
+libaudioscrobbler_plugin_la_SOURCES = 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_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_LIBADD = $(LIBM) $(LIBPTHREAD)
+misc_LTLIBRARIES += libfingerprinter_plugin.la
 
 libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
-libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS) $(GCRYPT_CFLAGS)
-libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS) $(GCRYPT_LIBS)
+libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
+libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
 if HAVE_WIN32
-libgnutls_plugin_la_LIBADD += -lcrypt32 $(SOCKET_LIBS)
+libgnutls_plugin_la_LIBADD += $(SOCKET_LIBS)
+endif
+libgnutls_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)'
+if HAVE_DARWIN
+libgnutls_plugin_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation
 endif
-libgnutls_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libgnutls_plugin.la
-libvlc_LTLIBRARIES += $(LTLIBgnutls)
+misc_LTLIBRARIES += $(LTLIBgnutls)
+
+if HAVE_DARWIN
+libsecuretransport_plugin_la_SOURCES = 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_CFLAGS = $(AM_CFLAGS)
-libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
-libxdg_screensaver_plugin_la_DEPENDENCIES =
-libxscreensaver_plugin_la_SOURCES = inhibit/xscreensaver.c
-libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
-libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD)
-libxscreensaver_plugin_la_DEPENDENCIES =
 if HAVE_XCB
-libvlc_LTLIBRARIES += \
-	libxdg_screensaver_plugin.la \
-	libxscreensaver_plugin.la
+misc_LTLIBRARIES += libxdg_screensaver_plugin.la
 endif
 
-libmce_plugin_la_SOURCES = inhibit/mce.c
-libmce_plugin_la_CFLAGS = $(AM_CLFAGS) $(DBUS_CFLAGS) $(MCE_CFLAGS)
-libmce_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(MCE_LIBS)
-libmce_plugin_la_DEPENDENCIES =
-EXTRA_LTLIBRARIES += libmce_plugin.la
-libvlc_LTLIBRARIES += $(LTLIBmce)
+libdbus_screensaver_plugin_la_SOURCES = 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_LIBADD = $(AM_LIBADD)
+liblogger_plugin_la_SOURCES = logger.c
 if HAVE_ANDROID
-liblogger_plugin_la_LIBADD += -llog
+liblogger_plugin_la_LIBADD = -llog
 endif
 
-libvlc_LTLIBRARIES += \
-	libaudioscrobbler_plugin.la \
-	liblogger_plugin.la
+libstats_plugin_la_SOURCES = stats.c
+
+libaddonsvorepository_plugin_la_SOURCES = addons/vorepository.c addons/xmlreading.h
+libaddonsfsstorage_plugin_la_SOURCES = addons/fsstorage.c addons/xmlreading.h
+
+misc_LTLIBRARIES += \
+	liblogger_plugin.la \
+	libstats_plugin.la \
+        libaddonsvorepository_plugin.la \
+        libaddonsfsstorage_plugin.la
 
 if ENABLE_SOUT
-libvlc_LTLIBRARIES += \
+misc_LTLIBRARIES += \
 	libvod_rtsp_plugin.la \
 	$(NULL)
 endif