Complete flags factorization

diff --git a/modules/common.am b/modules/common.am
index 47aa97c3f42cd608c0878ee0d18eab2801f18d94..cdd432bd24d8fd7adf4948027f332495572aa8a0 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -25,7 +25,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module -no-undefined \
        -shrext $(LIBEXT) \
         `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = $(LTLIBVLC)
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLC)
 
 if HAVE_COMPILER_EXPORT
 AM_LDFLAGS += -export-dynamic

diff --git a/modules/genmf b/modules/genmf
index d05594ad73671784f1e910d13133219a1471eef4..904b3d48619f2c0c47415f0e8fb45cc447a60592 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -46,13 +46,13 @@ EOF
 # The ${mod} plugin
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
+# Force per-target objects:
 lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS)
 lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS)
 lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS)
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \\
-       \`\$(VLC_CONFIG) -libs plugin ${mod}\`
-# Automake does not understand \`...\` very well inside LIBADD...
-lib${mod}_plugin_la_DEPENDENCIES = \$(AM_LIBADD)
+# Set LIBADD and DEPENDENCIES manually:
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_DEPENDENCIES =
 
 EOF
   done