Make fix-gnulib only need a single output file.

[cdecl99.git] / fix-gnulib.pl

diff --git a/fix-gnulib.pl b/fix-gnulib.pl
index 17163c7e24cc15d436bd5dd593c7629212bc5963..f2c8cfea2de7af6dad5ff2a64cdf0e96e401e09b 100755 (executable)
--- a/fix-gnulib.pl
+++ b/fix-gnulib.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright © 2011 Nick Bowler
+# Copyright © 2011-2012 Nick Bowler
 #
 # Prepare the Gnulib tree for inclusion into a non-recursive automake build.
 #
@@ -14,15 +14,13 @@ use Getopt::Long;
 
 my $output   = undef;
 my $input    = undef;
-my $m4output = undef;
-my $m4macro  = "DX_FIX_GNULIB";
+
+my $line     = 0;
 
 Getopt::Long::Configure("gnu_getopt", "no_auto_abbrev");
 GetOptions(
        "o|output=s"   => \$output,
        "i|input=s"    => \$input,
-       "m|m4output=s" => \$m4output,
-       "M|m4macro=s"  => \$m4macro,
 );
 
 open STDOUT, ">", $output or die "$output: $!\n" if (defined $output);
@@ -56,7 +54,7 @@ sub mangle_file {
                # Fix up things that look like filenames.
                $word = "lib/$word";
        } else {
-               print STDERR "$0: warning: unrecognized source file: $word\n";
+               print STDERR "$0:$line: warning: unrecognized source file: $word\n";
        }
 
        return "$word";
@@ -65,7 +63,7 @@ sub mangle_file {
 sub mangle_variable {
        my $raw = shift;
 
-       $raw =~ /([^=]+=)[[:space:]]*(.*)/;
+       $raw =~ /([^=]+=)[[:space:]]*(.*)/s;
        my ($left, @right) = ($1, split(/[[:space:]]+/, $2));
 
        return join(" ", ($left, map(mangle_file($_), @right))) . "\n";
@@ -74,7 +72,7 @@ sub mangle_variable {
 sub mangle_target {
        my $raw = shift;
 
-       $raw =~ /([^:]+):[[:space:]]*(.*)/;
+       $raw =~ /([^:]+):[[:space:]]*(.*)/s;
        my @left  = split(/[[:space:]]+/, $1);
        my @right = split(/[[:space:]]+/, $2);
 
@@ -85,11 +83,23 @@ sub mangle_target {
 }
 
 while (<STDIN>) {
+       $line++;
+
+       # Combine line splices.
+       while (s/\\$//) {
+               $line++;
+               $_ = $_ . <STDIN>
+       }
+
        next if (/^#/);
 
        if (!$printed_header) {
                print "# Postprocessed by ", basename($0), "\n\n";
                print <<'EOF';
+# BEGIN AUTOMAKE/M4 POLYGLOT \
+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_orderonly = $(gnulib_have_orderonly:order-only=|)
@@ -111,6 +121,14 @@ EOF
        # useful for non-recursive builds.  Strip them out.
        drop if (/^(AM_CPPFLAGS|AM_CFLAGS)/);
 
+       # Library dependencies are added automatically to libgnu.la by
+       # gnulib-tool.  Unfortunately, this means that everything linking
+       # against libgnu.la is forced to pull in the same deps, even if they're
+       # unneeded.  Furthermore, a libtool linker flag reordering bug prevents
+       # --as-needed from stripping out the useless deps, so it's better to
+       # handle them all manually.
+       drop if (/LDFLAGS/);
+
        # Rewrite automake hook targets to be more generic.
        if (s/^(.*)-local:/\1-gnulib:/) {
                print ".PHONY: $1-gnulib\n";
@@ -139,7 +157,7 @@ EOF
 
        # Targets are similar to variables: the target and its dependencies
        # need to be mangled.
-       if (/:/) {
+       if (/^[^\t].*:/) {
                $_ = mangle_target($_);
        }
 
@@ -156,7 +174,7 @@ EOF
        # Finally, references to $(srcdir) and $(builddir) need to be fixed up.
        s:\$\(srcdir\):\$\(top_srcdir\)/lib:g;
        s:\$\(builddir\):\$\(top_builddir\)/lib:g;
-} continue { print };
+} continue { s/(\n.)/\\\1/g; print; };
 
 print <<'EOF';
 gnulib_lt_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS)
@@ -168,15 +186,18 @@ print @cleanfiles;
 # 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.
-if (defined $m4output) {
-       my $lc = List::Compare->new('-u', '-a', \%sourcevars, \%allvars);
-       my @vars = $lc->get_unique;
 
-       open(M4OUT, '>', $m4output) or die "$m4output: $!\n";
+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_COMMANDS_PRE([DX_GLSYM_PREFIX([${PACKAGE}__])])
 
-       print M4OUT "dnl This file was generated by fix-gnulib.pl\n";
-       print M4OUT "AC_DEFUN([$m4macro], [dnl\n";
-       print M4OUT <<'EOF';
 m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
 set x $gl_objvar; shift
 gl_objvar=
@@ -186,10 +207,13 @@ done
 ])
 EOF
 
-       foreach (@vars) {
-               print M4OUT "$_=\${$_:+lib/\$$_}\n";
-       }
-       print M4OUT "])\n";
-
-       close M4OUT;
+foreach (@vars) {
+       print "$_=\${$_:+lib/\$$_}\n";
 }
+
+print <<'EOF';
+], [
+endif
+# ]))dnl
+# END AUTOMAKE/M4 POLYGLOT
+EOF