X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/10d9cf84b7e2ea5b5086d064e09d6504e12ecbd7..c6dcb6021d8f593bbb1bc1e82d0f193685e5a4a7:/fix-gnulib.pl

diff --git a/fix-gnulib.pl b/fix-gnulib.pl
index 1f50d49..ee7a0c9 100755
--- a/fix-gnulib.pl
+++ b/fix-gnulib.pl
@@ -17,6 +17,8 @@ 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,
@@ -30,6 +32,7 @@ open STDIN,  "<", $input  or die "$input: $!\n"  if (defined $input);
 
 my $printed_header = 0;
 my (%allvars, %sourcevars);
+my @cleanfiles;
 
 sub drop {
 	undef $_;
@@ -55,7 +58,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";
@@ -64,7 +67,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";
@@ -73,7 +76,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);
 
@@ -84,6 +87,14 @@ sub mangle_target {
 }
 
 while (<STDIN>) {
+	$line++;
+
+	# Combine line splices.
+	while (s/\\$//) {
+		$line++;
+		$_ = $_ . <STDIN>
+	}
+
 	next if (/^#/);
 
 	if (!$printed_header) {
@@ -92,7 +103,9 @@ while (<STDIN>) {
 # 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)
+gnulib_core_headers = $(gnulib_orderonly)
+gnulib_src_headers = $(gnulib_core_headers)
+gnulib_headers = $(gnulib_src_headers)
 EOF
 
 		$printed_header = 1;
@@ -108,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";
@@ -132,23 +153,34 @@ EOF
 	# 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/;
+	s/BUILT_SOURCES/gnulib_core_headers/;
 
 	# Targets are similar to variables: the target and its dependencies
 	# need to be mangled.
-	if (/:/) {
+	if (/^[^\t].*:/) {
 		$_ = mangle_target($_);
 	}
 
+	# 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/) {
+		push(@cleanfiles, $_);
+		drop;
+	}
+
 	# 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)
-$(gnulib_lt_objects): $(gnulib_headers)
+$(gnulib_lt_objects): $(gnulib_src_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
@@ -160,9 +192,21 @@ if (defined $m4output) {
 
 	open(M4OUT, '>', $m4output) or die "$m4output: $!\n";
 
-	print M4OUT "dnl This file was generated by fix-gnulib.pl\n";
-	print M4OUT "AC_DEFUN([$m4macro], [dnl\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])
+
 m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
 set x $gl_objvar; shift
 gl_objvar=
@@ -171,7 +215,6 @@ while test ${#} -gt 0; do
 done
 ])
 EOF
-
 	foreach (@vars) {
 		print M4OUT "$_=\${$_:+lib/\$$_}\n";
 	}