X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/3bc1572c6a889842c58ab9d1a7958708b2ba8a42..6c8f7873ed3769c48b3bad95f92e5c32e7f6cec1:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 2ddf1f8..b60bced 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright © 2011-2012 Nick Bowler
+# Copyright © 2011-2014 Nick Bowler
 #
 # Prepare the Gnulib tree for inclusion into a non-recursive automake build.
 # While the output of gnulib-tool is "include"-able if the --makefile-name
@@ -41,7 +41,6 @@
 # There is NO WARRANTY, to the extent permitted by law.
 
 use strict;
-use List::Compare;
 use Getopt::Long;
 
 my $output   = undef;
@@ -59,9 +58,14 @@ open STDOUT, ">", $output or die "$output: $!\n" if (defined $output);
 open STDIN,  "<", $input  or die "$input: $!\n"  if (defined $input);
 
 my $printed_header = 0;
-my (%allvars, %sourcevars);
 my @cleanfiles;
 
+# Hashes to record make variables used in the automake source.  The allvars
+# hash contains variables actually assigned in the Makefile, sourcevars
+# contains variables used as filenames.  Keys are the variable name, and
+# the value is always set to 1.
+my (%allvars, %sourcevars);
+
 sub drop {
 	undef $_;
 	next;
@@ -83,8 +87,10 @@ sub mangle_file {
 		# Do nothing.  Generic transformation will take care of
 		# $(srcdir) and $(builddir).
 	} elsif ($word =~ /^[[:word:].+\/-]+$/) {
-		# Fix up things that look like filenames.
-		$word = "lib/$word";
+		# Mangle the filename.  Assume that all relevant files start
+		# with a non-dot (so we don't transform suffix rules) and
+		# contain at least one dot (so we don't transform phony rules).
+		$word = "lib/$word" if ($word =~ /^[^.]+\./);
 	} else {
 		print STDERR "$0:$line: warning: unrecognized source file: $word\n";
 	}
@@ -133,7 +139,8 @@ m4_unquote(m4_argn([2], [
 .PHONY: # Automake code follows
 
 # This trick should define gnulib_orderonly to | iff we're using GNU make.
-gnulib_have_orderonly = $(findstring order-only,$(.FEATURES))
+gnulib_make_features = $(.FEATURES)
+gnulib_have_orderonly = $(findstring order-only,$(gnulib_make_features))
 gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
 gnulib_core_headers =
 gnulib_raw_headers = $(gnulib_core_headers)
@@ -174,9 +181,6 @@ EOF
 		print ".PHONY: $1-gnulib\n";
 		print "$1-local: $1-gnulib\n";
 		s/$1-generic//;
-
-		# Don't let these targets get confused with filenames below.
-		next;
 	}
 
 	# We need to mangle filenames in make variables; prepending a lib/ on
@@ -216,6 +220,10 @@ EOF
 		drop;
 	}
 
+	# Change t-$@ to $@-t as the former will break if $@ has a directory
+	# component.
+	s/t-\$@/\$\@-t/g;
+
 	# Finally, references to $(srcdir) and $(builddir) need to be fixed up.
 	s:\$\(srcdir\):\$\(top_srcdir\)/lib:g;
 	s:\$\(builddir\):\$\(top_builddir\)/lib:g;
@@ -227,14 +235,6 @@ $(gnulib_lt_objects): $(gnulib_headers)
 EOF
 print @cleanfiles;
 
-# 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
-# itself by defining a new autoconf macro.
-
-my $lc = List::Compare->new('-u', '-a', \%sourcevars, \%allvars);
-my @vars = $lc->get_unique;
-
 print <<'EOF';
 if FALSE
 ], [dnl M4 code follows
@@ -257,8 +257,13 @@ done
 ])
 EOF
 
-foreach (@vars) {
-	print "$_=\${$_:+lib/\$$_}\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
+# itself by defining a new autoconf macro.
+
+foreach (keys %sourcevars) {
+	print "$_=\${$_:+lib/\$$_}\n" unless $allvars{$_};
 }
 
 print <<'EOF';