sd: avoid genmf

diff --git a/configure.ac b/configure.ac
index 4a0cc2da9c00e0ce79bd0c38f9da1277563f5884..386aa0582aec6eff87c47f02fead1cb7a08b14ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3978,7 +3978,6 @@ dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
 PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
 
 EXTEND_HELP_STRING([Misc options:])
 

diff --git a/modules/services_discovery/.gitignore b/modules/services_discovery/.gitignore
deleted file mode 100644 (file)
index 08a6d72..0000000
--- a/modules/services_discovery/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am

diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Makefile.am
similarity index 54%
rename from modules/services_discovery/Modules.am
rename to modules/services_discovery/Makefile.am
index 00023bf3a7830fb7a9f49bb7ace77fcf1ea6f328..b1b306189080545d4aaf9344b685507df14bb8d0 100644 (file)
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Makefile.am
@@ -1,17 +1,41 @@
 sddir = $(pluginsdir)/services_discovery
 sd_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
-SOURCES_upnp = upnp.cpp upnp.hpp
-SOURCES_bonjour = bonjour.c
-SOURCES_podcast = podcast.c
-SOURCES_mtp = mtp.c
-SOURCES_mediadirs = mediadirs.c
+include ../common.am
+
+libmediadirs_plugin_la_SOURCES = mediadirs.c
+sd_LTLIBRARIES += libmediadirs_plugin.la
+
+libpodcast_plugin_la_SOURCES = podcast.c
+sd_LTLIBRARIES += libpodcast_plugin.la
 
 libsap_plugin_la_SOURCES = sap.c
 libsap_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_sap)
 libsap_plugin_la_LIBADD = $(LIBS_sap) $(SOCKET_LIBS)
 sd_LTLIBRARIES += libsap_plugin.la
 
+libbonjour_plugin_la_SOURCES = bonjour.c
+libbonjour_plugin_la_CFLAGS = $(AM_CFLAGS) $(BONJOUR_CFLAGS)
+libbonjour_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
+libbonjour_plugin_la_LIBADD = $(BONJOUR_LIBS)
+EXTRA_LTLIBRARIES += libbonjour_plugin.la
+sd_LTLIBRARIES += $(LTLIBbonjour)
+
+libmtp_plugin_la_SOURCES = mtp.c
+libmtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
+libmtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
+libmtp_plugin_la_LIBADD = $(MTP_LIBS)
+EXTRA_LTLIBRARIES += libmtp_plugin.la
+sd_LTLIBRARIES += $(LTLIBmtp)
+
+libupnp_plugin_la_SOURCES = upnp.cpp upnp.hpp
+libupnp_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(UPNP_CFLAGS)
+libupnp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
+libupnp_plugin_la_LIBADD = $(UPNP_LIBS)
+EXTRA_LTLIBRARIES += libupnp_plugin.la
+sd_LTLIBRARIES += $(LTLIBupnp)
+
 libpulselist_plugin_la_SOURCES = pulse.c
 libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS)
@@ -46,7 +70,3 @@ libos2drive_plugin_la_SOURCES = os2drive.c
 if HAVE_OS2
 sd_LTLIBRARIES += libos2drive_plugin.la
 endif
-
-services_discovery_LTLIBRARIES += \
-       libmediadirs_plugin.la \
-       libpodcast_plugin.la