X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/8c2b7b249f46844af925b1f19ab5f8d242b392f3..2e5b48374d80959256e535bc1973f032158bde9e:/scripts/fix-gnulib.pl diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl index ee7a0c9..e043d77 100755 --- a/scripts/fix-gnulib.pl +++ b/scripts/fix-gnulib.pl @@ -1,8 +1,40 @@ #!/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. +# While the output of gnulib-tool is "include"-able if the --makefile-name +# option is used, it is still not suitable for non-recursive use for a couple +# reasons; chief among them is that filenames are not relative to the top +# source directory. +# +# This script postprocesses the gnulib-tool output to produce something that +# is intended to be suitable for inclusion into such non-recursive build +# environments. Since the integration involves both configure.ac and +# Makefile.am, the output must be included into _both_. Supposing the output +# is written to lib/gnulib.mk, you would add: +# +# m4_include([lib/gnulib.mk]) # to configure.ac, after any call to gl_INIT +# include $(top_srcdir)/lib/gnulib.mk # to Makefile.am +# +# You must also arrange for the Gnulib-generated header files to be built +# before the object files which depend on them; the most robust way to do this +# is by explicit prerequisites, for example: +# +# bin_PROGRAMS = foo +# $(foo_OBJECTS): $(gnulib_headers) +# +# The $(gnulib_headers) variable will expand to GNU-make order-only +# prerequisites when available, avoiding spurious incremental rebuilds when +# unused headers are changed. If this feature is not available, it will +# expand to ordinary prerequisites. It is therefore only appropriate for use +# in target prerequisites; the $(gnulib_raw_headers) variable may be used in +# other contexts when only the list of header files is required. +# +# This script also provides machinery for Gnulib symbol renaming via the +# glconfig.mk Makefile.am snippet; use of this feature is optional. +# +# Most of the specific transformations are documented below. # # License WTFPL2: Do What The Fuck You Want To Public License, version 2. # This is free software: you are free to do what the fuck you want to. @@ -14,8 +46,6 @@ use Getopt::Long; my $output = undef; my $input = undef; -my $m4output = undef; -my $m4macro = "DX_FIX_GNULIB"; my $line = 0; @@ -23,8 +53,6 @@ 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); @@ -100,12 +128,20 @@ while () { 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=|) -gnulib_core_headers = $(gnulib_orderonly) -gnulib_src_headers = $(gnulib_core_headers) -gnulib_headers = $(gnulib_src_headers) +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,12 +197,17 @@ 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; } @@ -178,7 +219,7 @@ EOF print <<'EOF'; gnulib_lt_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS) -$(gnulib_lt_objects): $(gnulib_src_headers) +$(gnulib_lt_objects): $(gnulib_headers) EOF print @cleanfiles; @@ -186,26 +227,21 @@ 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"; - - print M4OUT <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], [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 set x $gl_objvar; shift @@ -215,10 +251,14 @@ while test ${#} -gt 0; do 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