#!/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.
#
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);
# 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";
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";
sub mangle_target {
my $raw = shift;
- $raw =~ /([^:]+):[[:space:]]*(.*)/;
+ $raw =~ /([^:]+):[[:space:]]*(.*)/s;
my @left = split(/[[:space:]]+/, $1);
my @right = split(/[[:space:]]+/, $2);
}
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=|)
# 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";
# Targets are similar to variables: the target and its dependencies
# need to be mangled.
- if (/:/) {
+ if (/^[^\t].*:/) {
$_ = mangle_target($_);
}
# 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)
# 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";
-
- print M4OUT <<EOF;
-dnl This file was generated by fix-gnulib.pl
-dnl
-dnl Usage: DX_FIX_GNULIB([symbol-prefix])
-dnl where symbol-prefix is the application-specific symbol prefix to apply
-dnl to Gnulib's symbols. Defaults to \${PACKAGE}__.
-dnl top-level source directory; e.g. lib.
-AC_DEFUN([$m4macro], [dnl
-EOF
- print M4OUT <<'EOF';
-GLSRC=lib
-GLSYM_PREFIX='ifelse([$1], [], [${PACKAGE}__], [$1])'
-AC_SUBST([GLSRC])
-AC_SUBST([GLSYM_PREFIX])
+
+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}__])])
m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
set x $gl_objvar; shift
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