Use var_InheritString for --decklink-video-connection.

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index ec9783e3f19d0c3454f65dcdf6316d677ca7f314..5e4d65f57e381b811050e6e620243e813e526b06 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -6,8 +6,7 @@
 # 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)
@@ -21,21 +20,15 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module \
        -export-symbol-regex ^vlc_entry \
        -shrext $(LIBEXT) \
+       -rpath "$(libvlcdir)" \
+       -no-undefined \
         `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@`
-if HAVE_WIN32
-# Windows does not support undefined symbols
-AM_LIBADD += $(LTLIBVLCCORE)
-endif
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
+       $(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