Skip to content

V
vlc-1.1
Commit af603674 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Use noinst_ rather than libvlc_ for builtins

parent 3e6aa513
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
bootstrap
View file @ af603674
...@@ -210,6 +210,7 @@ mods = ${mods} ...@@ -210,6 +210,7 @@ mods = ${mods}
NULL = NULL =
libvlc_LTLIBRARIES = libvlc_LTLIBRARIES =
noinst_LTLIBRARIES =
EXTRA_DIST = Modules.am EXTRA_DIST = Modules.am
BUILT_SOURCES = BUILT_SOURCES =
clean_modules = clean_modules =
...@@ -275,13 +276,14 @@ mostlyclean-local: ...@@ -275,13 +276,14 @@ mostlyclean-local:
clean-local: \$(clean_modules) clean-local: \$(clean_modules)
if USE_LIBTOOL if USE_LIBTOOL
@if test -z "\$(libvlc_LTLIBRARIES)"; then \ @if test -z "\$(libvlc_LTLIBRARIES)\$(noinst_LTLIBRARIES)"; then \
l=\$\$(\$(VLC_CONFIG) --list plugin); \ l=\$\$(\$(VLC_CONFIG) --list plugin); \
p=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \ p=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
l=\$\$(\$(VLC_CONFIG) --list builtin); \ l=\$\$(\$(VLC_CONFIG) --list builtin); \
s=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}.la" ;; esac; done\` ; \ s=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}.la" ;; esac; done\` ; \
test -z "\$\$p\$\$s" || \ test -z "\$\$p\$\$s" || \
\$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$p\$\$s" clean ; \ \$(MAKE) \$(AM_MAKEFLAGS) \
libvlc_LTLIBRARIES="\$\$p" noinst_LTLIBRARIES="\$\$s" clean ; \
fi fi
endif endif
...@@ -418,6 +420,7 @@ lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` ...@@ -418,6 +420,7 @@ lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\ lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\
-rpath '\$(libvlcdir)' -module -shrext \$(LIBEXT) -rpath '\$(libvlcdir)' -module -shrext \$(LIBEXT)
lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC) lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
lib${mod}_plugin_la_DEPENDENCIES = \$(LTLIBVLC)
lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod}) lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod})
EOF EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment