GnuTLS: plugin needs crypt32 on Windows to use the certificate store

[vlc] / modules / misc / Modules.am

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index c6b5bae4422c02b7f891458c5cc6dccbabf6ddf9..a555a7cc9649fbe2fd7124cbd33015839710a33e 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,38 +1,53 @@
-BASE_SUBDIRS = dummy notify testsuite playlist stats osd xml
-EXTRA_SUBDIRS = lua
+BASE_SUBDIRS = playlist stats osd
 
 SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS)
 
-if BUILD_LUA
-SUBDIRS += lua
-endif
-
-SOURCES_freetype = freetype.c text_renderer.h
-SOURCES_win32text = win32text.c
-SOURCES_quartztext = quartztext.c text_renderer.h
 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
 SOURCES_sqlite = sqlite.c
+SOURCES_xml = xml/libxml.c
+
+SOURCES_memcpy = memcpy.c
+libvlc_LTLIBRARIES += libmemcpy_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)
+if HAVE_WIN32
+libgnutls_plugin_la_LIBADD += -lcrypt32
+endif
+libgnutls_plugin_la_DEPENDENCIES =
+EXTRA_LTLIBRARIES += libgnutls_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBgnutls)
 
-SOURCES_xscreensaver = inhibit/screensaver.c
-SOURCES_xdg_screensaver = inhibit/xdg.c
-SOURCES_osso_screensaver = inhibit/osso.c
+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
+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)
 
 libvlc_LTLIBRARIES += \
        libaudioscrobbler_plugin.la \
        liblogger_plugin.la
 
-if HAVE_WINCE
-libvlc_LTLIBRARIES += libwin32text_plugin.la
-endif
-if HAVE_DARWIN
-libvlc_LTLIBRARIES += libquartztext_plugin.la
-endif
 if ENABLE_SOUT
 libvlc_LTLIBRARIES += \
        libvod_rtsp_plugin.la \