UPNP: When removing server, also remove it from SD listings

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index 233e17a38408f18a6638dd12e4c4dac1f740d2c2..f001a7f80ecb430a84549312e5f90477cd185ff1 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -6,42 +6,29 @@
 # Authors: Sam Hocevar <sam@zoy.org>
 
 NULL =
-SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
+libvlcdir = $(vlclibdir)/plugins/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
 LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
-AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
-AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
-AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
+AM_CFLAGS = `$(VLC_CONFIG) --cflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
+AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
+AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module \
-       -export-symbol-regex ^vlc_entry \
+       -export-symbols-regex ^vlc_entry \
        -shrext $(LIBEXT) \
-        `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@`
-if HAVE_WIN32
-# Windows does not support undefined symbols
-AM_LDFLAGS += -no-undefined
-AM_LIBADD += $(LTLIBVLCCORE)
-endif
-if HAVE_WINCE
-# Same for Windows CE
-AM_LDFLAGS += -no-undefined
-AM_LIBADD += $(LTLIBVLCCORE)
-endif
+       -rpath "$(libvlcdir)" \
+       -no-undefined \
+        `$(VLC_CONFIG) --ldflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
+AM_LIBADD = `$(VLC_CONFIG) -libs $(VLC_DEFAULT_PLUGIN_TYPE) $@` \
+       $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
 
 include $(srcdir)/Modules.am
 
 if MAINTAINER_MODE
 $(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-       cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
+       $(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
 endif
-
-nice:
-       $(top_builddir)/compile
-
-.PHONY: nice