From ff3807b3c1ad23f6a8811241665a00a0c9e957f4 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 11 May 2012 20:00:02 -0400 Subject: [PATCH] fix-ltdl: Move all convenience libs to EXTRA_LTLIBRARIES only. There's no reason to list these in noinst_LTLIBRARIES in a non-recursive build, as they will be picked up correctly by ordinary prerequisites. --- scripts/fix-ltdl.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/fix-ltdl.pl b/scripts/fix-ltdl.pl index da987be..7dd1c8b 100755 --- a/scripts/fix-ltdl.pl +++ b/scripts/fix-ltdl.pl @@ -141,6 +141,15 @@ EOF $_ = fixup_libobjs($_); } + # There is no reason to list $(LT_DLLOADERS) in noinst_LTLIBRARIES; + # these will be picked up as ordinary prerequisites. They're already + # all in EXTRA_LTLIBRARIES. + drop if (/^noinst_LTLIBRARIES.*\$\(LT_DLLOADERS\)$/); + + # Don't list other libs in noinst_LTLIBRARIES so that they don't get + # built unless explicitly required by prerequisites. + s/noinst_LTLIBRARIES/EXTRA_LTLIBRARIES/; + # BUILT_SOURCES has similar problems to recursive make: inadequate # dependencies lead to incorrect builds. Collect them into an # ordinary variable so we can deal with them later. -- 2.43.0