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

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 366cfba911..aa11e3636a 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,31 +1,75 @@
-BASE_SUBDIRS = dummy memcpy notify testsuite playlist stats osd xml probe
-EXTRA_SUBDIRS = lua
+SOURCES_vod_rtsp = rtsp.c
+
+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
+misc_LTLIBRARIES += libexport_plugin.la
 
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+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
 
-if BUILD_LUA
-SUBDIRS += lua
+libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
+libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
+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
+misc_LTLIBRARIES += $(LTLIBgnutls)
 
-SOURCES_gtk_main = gtk_main.c
-SOURCES_gnome_main = gtk_main.c
-SOURCES_gtk2_main = gtk_main.c
-SOURCES_gnome2_main = gtk_main.c
-SOURCES_screensaver = screensaver.c
-SOURCES_qte_main = qte_main.cpp
-SOURCES_freetype = freetype.c
-SOURCES_win32text = win32text.c
-SOURCES_quartztext = quartztext.c
-SOURCES_logger = logger.c
-SOURCES_vod_rtsp = rtsp.c
-SOURCES_gnutls = gnutls.c dhparams.h
-SOURCES_svg = svg.c
-SOURCES_audioscrobbler = audioscrobbler.c
-SOURCES_inhibit = inhibit.c
+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
+if HAVE_XCB
+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 = $(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 = 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