X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2FModules.am;h=62a54d197b43aedb4aab37176f5f730d21d4d536;hb=734a505509828c3333067ea6be174f3a6525e486;hp=df8e1a5a919265ad3e1d2e287e8ddf3d076ff2bf;hpb=3a22cff898497cceffcf70666223a83eec0ec314;p=vlc

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index df8e1a5a91..62a54d197b 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,66 +1,78 @@
 SOURCES_vod_rtsp = rtsp.c
-SOURCES_audioscrobbler = audioscrobbler.c
-SOURCES_fingerprinter = fingerprinter.c \
-	webservices/acoustid.c \
-	webservices/acoustid.h \
-	webservices/use_json.h \
-	webservices/json.c \
-	webservices/json.h
 
 SOURCES_xml = xml/libxml.c
 
+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
-libexport_plugin_la_CFLAGS = $(AM_CFLAGS)
-libexport_plugin_la_LIBADD = $(AM_LIBADD)
-libvlc_LTLIBRARIES += libexport_plugin.la
+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)
-libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS)
+libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
 if HAVE_WIN32
 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
 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)
 if HAVE_XCB
-libvlc_LTLIBRARIES += \
-	libxdg_screensaver_plugin.la
+misc_LTLIBRARIES += libxdg_screensaver_plugin.la
 endif
 
 libdbus_screensaver_plugin_la_SOURCES = inhibit/dbus.c
 libdbus_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_screensaver_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS)
+libdbus_screensaver_plugin_la_LIBADD = $(DBUS_LIBS)
 if HAVE_DBUS
-libvlc_LTLIBRARIES += libdbus_screensaver_plugin.la
+misc_LTLIBRARIES += libdbus_screensaver_plugin.la
 endif
 
 liblogger_plugin_la_SOURCES = logger.c
-liblogger_plugin_la_CFLAGS = $(AM_CFLAGS)
-liblogger_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_ANDROID
-liblogger_plugin_la_LIBADD += -llog
+liblogger_plugin_la_LIBADD = -llog
 endif
 
 libstats_plugin_la_SOURCES = stats.c
-libstats_plugin_la_CFLAGS = $(AM_CFLAGS)
-libstats_plugin_la_LIBADD = $(AM_LIBADD)
 
-libvlc_LTLIBRARIES += \
-	libaudioscrobbler_plugin.la \
-	libfingerprinter_plugin.la \
+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
 
 if ENABLE_SOUT
-libvlc_LTLIBRARIES += \
+misc_LTLIBRARIES += \
 	libvod_rtsp_plugin.la \
 	$(NULL)
 endif