X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/27fd2e6316f403905a9a946a9a6b9ea9bab843ed..1315e91f1161399cafe4bfd1a9622b8056a45dd3:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 6663e6e..b93cf22 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -87,7 +87,14 @@ while (<STDIN>) {
 	next if (/^#/);
 
 	if (!$printed_header) {
-		print "# Postprocessed by ", basename($0), "\n";
+		print "# Postprocessed by ", basename($0), "\n\n";
+		print <<'EOF';
+# This trick should define gnulib_orderonly to | iff we're using GNU make.
+gnulib_have_orderonly = $(findstring order-only,$(.FEATURES))
+gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
+gnulib_headers = $(gnulib_orderonly)
+EOF
+
 		$printed_header = 1;
 		drop;
 	}
@@ -122,6 +129,11 @@ while (<STDIN>) {
 		}
 	}
 
+	# 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.
+	s/BUILT_SOURCES/gnulib_headers/;
+
 	# Targets are similar to variables: the target and its dependencies
 	# need to be mangled.
 	if (/:/) {
@@ -133,6 +145,8 @@ while (<STDIN>) {
 	s:\$\(builddir\):\$\(top_builddir\)/lib:g;
 } continue { print };
 
+print "\$(libgnu_la_OBJECTS): \$(gnulib_headers)\n";
+
 # Some filenames are AC_SUBSTed by the Gnulib macros, and thus we need to
 # prepend lib/ if and only if they're not empty.  Unfortunately, make is not
 # powerful to do this, so we need to put this transformation into configure