Makefile factorization

diff --git a/modules/common.am b/modules/common.am
index 9ca22b606d0a645ea43f413b3e8b59abaaf7a88a..fab4fb354e1bc6227cbe2452935d0fc493adcd26 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -19,15 +19,20 @@ include $(srcdir)/Modules.am
 if HAVE_PLUGINS
 LTLIBVLC = $(top_builddir)/src/libvlc.la
 
+AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
+AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
+AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module -no-undefined \
-       -shrext $(LIBEXT)
+       -shrext $(LIBEXT) \
+        `$(VLC_CONFIG) --ldflags plugin $@`
+AM_LIBADD = $(LTLIBVLC)
+
 if HAVE_COMPILER_EXPORT
 AM_LDFLAGS += -export-dynamic
 else
 AM_LDFLAGS += -export-symbol-regex ^vlc_entry
 endif
-AM_LIBADD = $(LTLIBVLC)
 endif
 
 all: all-modules

diff --git a/modules/genmf b/modules/genmf
index e8030b9d4ae36a52e16adc3db11e075a73a91dac..0a9a0ff0b543e92e0087c72e71e4487c4efc73e0 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -64,11 +64,9 @@ BUILT_SOURCES += \$(B${mod})
 EOF
     fi
     cat >> "${makf}" << EOF
-lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
-lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
-lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \\
-       \`\$(VLC_CONFIG) --ldflags plugin ${mod}\`
+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...