From 7e7d587a44280a84914474364c6806f948af17cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 28 Feb 2006 12:22:24 +0000 Subject: [PATCH] Implement clean with --enable-libtool May fix builtins recompilation (theora, flac...) --- bootstrap | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index f5dcfa54f1..171148da39 100755 --- a/bootstrap +++ b/bootstrap @@ -212,6 +212,7 @@ NULL = libvlc_LTLIBRARIES = EXTRA_DIST = Modules.am BUILT_SOURCES = +clean_modules = SUBDIRS = ${subdirs} SUFFIXES = _plugin\$(LIBEXT) _plugin.a @@ -272,6 +273,18 @@ endif mostlyclean-local: -rm -f *.a *\$(LIBEXT) +clean-local: \$(clean_modules) +if USE_LIBTOOL + @if test -z "\$(libvlc_LTLIBRARIES)"; then \ + l=\$\$(\$(VLC_CONFIG) --list plugin); \ + p=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \ + l=\$\$(\$(VLC_CONFIG) --list builtin); \ + s=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}.la" ;; esac; done\` ; \ + test -z "\$\$p\$\$s" || \ + \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$p\$\$s" clean ; \ + fi +endif + ### automake creates libvlcdir after running install-*-local ### so we have to create it ourselves first install-exec-local: all-modules @@ -376,7 +389,7 @@ EOF EOF if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -clean-local: clean-${mod} +clean_modules += clean-${mod} clean-${mod}: -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod}) @@ -421,8 +434,8 @@ lib${mod}_a_SOURCES = \$(SOURCES_${mod}) lib${mod}_la_SOURCES = \$(SOURCES_${mod}) EOF if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) -nodist_lib${mod}_la_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod}) +nodist_lib${mod}_la_SOURCES = \$(nodist_SOURCES_${mod}) EOF fi cat >> "${makf}" << EOF -- 2.39.2