diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/.gitignore | 3 | ||||
| -rw-r--r-- | build-aux/Makefile.am | 2 | ||||
| -rwxr-xr-x | build-aux/cross-options.pl | 74 | ||||
| -rw-r--r-- | build-aux/local.mk | 5 | ||||
| l--------- | build-aux/move-if-change | 1 |
5 files changed, 44 insertions, 41 deletions
diff --git a/build-aux/.gitignore b/build-aux/.gitignore index f09add4f..008e7452 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -1,11 +1,10 @@ -/Makefile -/Makefile.in /announce-gen /arg-nonnull.h /c++defs.h /compile /config.guess /config.rpath +/config.rpath~ /config.sub /depcomp /gendocs.sh diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am deleted file mode 100644 index 8d0cfb29..00000000 --- a/build-aux/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = prev-version.txt cross-options.pl update-b4-copyright diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl index 7762e276..0f5009ce 100755 --- a/build-aux/cross-options.pl +++ b/build-aux/cross-options.pl @@ -18,50 +18,50 @@ while (<STDIN>) \s # Spaces. /x) { - my ($short, $long, $opt, $arg) = ($1, $2, $3, $4); - $short = '' if ! defined $short; - $short = '-d' if $long eq '--defines' && ! $short; - my $dir = '%' . substr($long, 2); - if (index ($scanner, "\"$dir\"") < 0) - { - if ($long eq '--force-define') { $dir = '%define'; } - else { $dir = ''; } - } - if ($arg) - { + my ($short, $long, $opt, $arg) = ($1, $2, $3, $4); + $short = '' if ! defined $short; + $short = '-d' if $long eq '--defines' && ! $short; + my $dir = '%' . substr($long, 2); + if (index ($scanner, "\"$dir\"") < 0) + { + if ($long eq '--force-define') { $dir = '%define'; } + else { $dir = ''; } + } + if ($arg) + { # if $opt, $arg contains the closing ]. substr ($arg, -1) = '' if $opt eq '['; - $arg =~ s/^=//; + $arg =~ s/^=//; $arg = lc ($arg); - my $dir_arg = $arg; + my $dir_arg = $arg; # If the argument is compite (e.g., for --define[=NAME[=VALUE]]), # put each word in @var, to build @var{name}[=@var{value}], not # @var{name[=value]}]. - $arg =~ s/(\w+)/\@var{$1}/g; - my $long_arg = "=$arg"; - if ($opt eq '[') { - $long_arg = "[$long_arg]"; - $arg = "[$arg]"; - } - # For arguments of directives: this only works if all arguments - # are strings and have the same syntax as on the command line. - if ($dir_arg eq 'name[=value]') - { - $dir_arg = '@var{name} ["@var{value}"]'; - } - else - { - $dir_arg =~ s/(\w+)/\@var{"$1"}/g; - $dir_arg = '[' . $dir_arg . ']' - if $opt eq '['; - } - $long = "$long$long_arg"; - $short = "$short $arg" if $short && $short ne '-d'; - $dir = "$dir $dir_arg" if $dir; - } - $option{$long} = $short; - $directive{$long} = $dir; + $arg =~ s/(\w+)/\@var{$1}/g; + my $long_arg = "=$arg"; + if ($opt eq '[') { + $long_arg = "[$long_arg]"; + $arg = "[$arg]"; + } + # For arguments of directives: this only works if all arguments + # are strings and have the same syntax as on the command line. + if ($dir_arg eq 'name[=value]') + { + $dir_arg = '@var{name} ["@var{value}"]'; + } + else + { + $dir_arg =~ s/(\w+)/\@var{"$1"}/g; + $dir_arg = '[' . $dir_arg . ']' + if $opt eq '['; + } + $long = "$long$long_arg"; + $short = "$short $arg" if $short && $short ne '-d'; + $dir = "$dir $dir_arg" if $dir; + } + $option{$long} = $short; + $directive{$long} = $dir; } } diff --git a/build-aux/local.mk b/build-aux/local.mk new file mode 100644 index 00000000..29c907a4 --- /dev/null +++ b/build-aux/local.mk @@ -0,0 +1,5 @@ +EXTRA_DIST += \ + build-aux/cross-options.pl \ + build-aux/move-if-change \ + build-aux/prev-version.txt \ + build-aux/update-b4-copyright diff --git a/build-aux/move-if-change b/build-aux/move-if-change new file mode 120000 index 00000000..2df61a60 --- /dev/null +++ b/build-aux/move-if-change @@ -0,0 +1 @@ +../gnulib/build-aux/move-if-change
\ No newline at end of file |