X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/7bfc84094d7dc1f03af7314c4a74c216bc5a92f5..483b5af7a619117ae6ec3435bb8689e764e928a0:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 85ae632..1f15078 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -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";
 	}
@@ -138,6 +144,10 @@ gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
 gnulib_core_headers =
 gnulib_raw_headers = $(gnulib_core_headers)
 gnulib_headers = $(gnulib_orderonly) $(gnulib_raw_headers)
+
+# Oddly, gnulib tries to add to MOSTLYCLEANDIRS (which is *not* an automake
+# variable) without defining it.
+MOSTLYCLEANDIRS =
 EOF
 
 		$printed_header = 1;
@@ -161,14 +171,15 @@ EOF
 	# handle them all manually.
 	drop if (/LDFLAGS/);
 
+	# Current uses of SUFFIXES in gnulib are pointless since Automake will
+	# figure it out all on its own.  Strip it out.
+	drop if (/SUFFIXES/);
+
 	# Rewrite automake hook targets to be more generic.
 	if (s/^(.*)-local:/\1-gnulib:/) {
 		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
@@ -193,16 +204,25 @@ EOF
 		$_ = mangle_target($_);
 	}
 
+	# MKDIR_P commands need to be fixed up; in principle Gnulib could also
+	# be patched here to use $(@D) instead (and thus automatically benefit
+	# from the target being fixed up), but this will do for now.
+	s/^(\t.*\$\(MKDIR_P\)) ([[:alnum:]]+)$/\1 lib\/\2/;
+
 	# When using conditional-dependencies, *CLEANFILES can end up
 	# depending on the configuration.  This means that "make distclean"
 	# may not actually delete everything if the configuration changes
 	# after building the package.  Stash all the variables for later so
 	# they can be moved outside of any conditional.
-	if (/CLEANFILES/) {
+	if (/(CLEANFILES|CLEANDIRS)[[:space:]]*\+=/) {
 		push(@cleanfiles, $_);
 		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;
@@ -214,20 +234,17 @@ $(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
 
 AC_SUBST([GLSRC], [lib])
-AC_DEFUN_ONCE([DX_GLSYM_PREFIX], [AC_SUBST([GLSYM_PREFIX], [$1])])
+AC_CONFIG_LIBOBJ_DIR([lib])
+
+AC_DEFUN_ONCE([DX_GLSYM_PREFIX], [dnl
+AC_REQUIRE([DX_EXPORTED_SH])
+AC_SUBST([GLSYM_PREFIX], [$1])
+])
 AC_CONFIG_COMMANDS_PRE([DX_GLSYM_PREFIX([${PACKAGE}__])])
 
 m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
@@ -239,8 +256,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';