[vlc-devel] commit: Complete flags factorization ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 21 22:31:47 2008 +0300| [c20040263cc401344cf0afcc9048e420bddaaa66]

Complete flags factorization

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c20040263cc401344cf0afcc9048e420bddaaa66
---

 modules/common.am |    2 +-
 modules/genmf     |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/common.am b/modules/common.am
index 47aa97c..cdd432b 100644
--- 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 d05594a..904b3d4 100755
--- 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