misc: remove Modules.am

diff --git a/configure.ac b/configure.ac
index 3f5318697c5002cc28cbdde76988cc138d7070d3..cd3400687885d406e80735a50a7644b8173989a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -636,7 +636,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
 
 AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop stream_out_chromecast vod_rtsp oldrc netsync ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
+  VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop stream_out_chromecast oldrc netsync ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
 ])
 AC_SUBST(SOCKET_LIBS)
 

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

diff --git a/modules/misc/Modules.am b/modules/misc/Makefile.am
similarity index 81%
rename from modules/misc/Modules.am
rename to modules/misc/Makefile.am
index 62a54d197b43aedb4aab37176f5f730d21d4d536..8135cfd259deca6fbdc34a37ed43b7ea985a1406 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Makefile.am
@@ -1,6 +1,8 @@
-SOURCES_vod_rtsp = rtsp.c
+miscdir = $(pluginsdir)/misc
+misc_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
-SOURCES_xml = xml/libxml.c
+include $(top_srcdir)/modules/common.am
 
 libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c
 libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
@@ -71,8 +73,15 @@ misc_LTLIBRARIES += \
        liblogger_plugin.la \
        libstats_plugin.la
 
+libvod_rtsp_plugin_la_SOURCES = rtsp.c
+libvod_rtsp_plugin_la_LIBADD = $(SOCKET_LIBS)
 if ENABLE_SOUT
-misc_LTLIBRARIES += \
-       libvod_rtsp_plugin.la \
-       $(NULL)
+misc_LTLIBRARIES += libvod_rtsp_plugin.la
 endif
+
+libxml_plugin_la_SOURCES = xml/libxml.c
+libxml_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS)
+libxml_plugin_la_LIBADD = $(LIBXML2_LIBS)
+libxml_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)' $(LDFLAGS_xml)
+EXTRA_LTLIBRARIES += libxml_plugin.la
+misc_LTLIBRARIES += $(LTLIBxml)