X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/90f9f764fa1d891ca8922f2fd0177ae44b1ed790..ff3807b3c1ad23f6a8811241665a00a0c9e957f4:/scripts/fix-ltdl.pl

diff --git a/scripts/fix-ltdl.pl b/scripts/fix-ltdl.pl
index 8065545..7dd1c8b 100755
--- a/scripts/fix-ltdl.pl
+++ b/scripts/fix-ltdl.pl
@@ -62,6 +62,7 @@ sub handle_libobj {
 	print <<EOF;
 ${am_dir_prefix}libobj_la_SOURCES += $distfile
 $ltdl_dir/$base.lo: $ltdl_dir/${am_dir_prefix}libobj_la-$base.lo
+\t\$(AM_V_at)-rm -f \$@
 \t\$(AM_V_at)(cd \$(\@D) && \$(LN_S) ${am_dir_prefix}libobj_la-\$(\@F) \$(\@F))
 EOF
 
@@ -140,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.