misc: avoid genmf in some simple cases

[vlc] / modules / misc / Modules.am

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 9374a4c0a201141649d416fbcd2867cb8ed33ab5..aa317c3d1c3a1bbcc6755a197d29b70f571b7c05 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,28 +1,27 @@
 SOURCES_vod_rtsp = rtsp.c
-SOURCES_audioscrobbler = audioscrobbler.c
-SOURCES_fingerprinter = fingerprinter.c \
-       webservices/acoustid.c \
-       webservices/acoustid.h \
-       webservices/json.c \
-       webservices/json.h
 
 SOURCES_xml = xml/libxml.c
 
+libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c
+libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS)
+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)
-if HAVE_WIN32
-libexport_plugin_la_DEPENDENCIES = libexport_plugin.rc.o
-endif
 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)
+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
@@ -31,39 +30,25 @@ EXTRA_LTLIBRARIES += libgnutls_plugin.la
 misc_LTLIBRARIES += $(LTLIBgnutls)
 
 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
-misc_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
 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
-endif
-if HAVE_WIN32
-liblogger_plugin_la_DEPENDENCIES = liblogger_plugin.rc.o
+liblogger_plugin_la_LIBADD = -llog
 endif
 
 libstats_plugin_la_SOURCES = stats.c
-libstats_plugin_la_CFLAGS = $(AM_CFLAGS)
-libstats_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libstats_plugin_la_DEPENDENCIES = libstats_plugin.rc.o
-endif
 
 misc_LTLIBRARIES += \
-       libaudioscrobbler_plugin.la \
        liblogger_plugin.la \
        libstats_plugin.la