From: RĂ©mi Denis-Courmont Date: Mon, 21 Apr 2008 18:48:43 +0000 (+0300) Subject: Makefile factorization X-Git-Tag: 0.9.0-test0~1388 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ab799a3a873d5794f8d1fc9d760218109108761a;p=vlc Makefile factorization --- diff --git a/modules/common.am b/modules/common.am index 9ca22b606d..fab4fb354e 100644 --- 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 e8030b9d4a..0a9a0ff0b5 100755 --- 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...