diff options
-rwxr-xr-x | bootstrap | 51 | ||||
-rw-r--r-- | doc/Makefile.am | 8 | ||||
-rw-r--r-- | pies/Makefile.am | 4 |
3 files changed, 39 insertions, 24 deletions
@@ -430,21 +430,29 @@ silent_rules_prog=' | |||
430 | # state = 1 - first line inside a rule | 430 | # state = 1 - first line inside a rule |
431 | # state = 2 - subsequent lines inside a rule | 431 | # state = 2 - subsequent lines inside a rule |
432 | # cont = 1 - this line is a continuation of the previous one | 432 | # cont = 1 - this line is a continuation of the previous one |
433 | 433 | # defn = 1 - insert AM_V_GEN/AM_V_at definitions after the initail comment | |
434 | # Print comment lines | 434 | # Print comment lines |
435 | /^[ \t]*#/ { print; next } | 435 | /^[ \t]*#/ { print; next } |
436 | # Insert AM_V_ definitions, if required. | ||
437 | state == 0 && defn == 1 { | ||
438 | print "AM_DEFAULT_VERBOSITY=0" # FIXME | ||
439 | print "AM_V_GEN = $(am__v_GEN_$(V))" | ||
440 | print "am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))" | ||
441 | print "am__v_GEN_0 = @echo \" GEN \" $@;" | ||
442 | print "AM_V_at = $(am__v_at_$(V))" | ||
443 | print "am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))" | ||
444 | print "am__v_at_0 = @" | ||
445 | defn = 0 | ||
446 | } | ||
436 | # Start of a rule | 447 | # Start of a rule |
437 | /^[^ \t].*:/ { print; state = 1; cont = 0; next } | 448 | /^[^ \t].*:/ { print; state = 1; cont = 0; next } |
438 | # First action within the rule | 449 | # First action within the rule |
439 | state == 1 && /^\t/ { | 450 | state == 1 && /^\t/ { |
440 | # Print silent rules without changes. The second match | 451 | # Print silent rules without changes. The second match |
441 | # is necessary to handle @VAR@ substitutions. | 452 | # is necessary to handle @VAR@ substitutions. |
442 | if (match($1, /^@/) && !match($1, /@$/)) | 453 | if (!(match($1, /^@/) && !match($1, /.@$/))) |
443 | 454 | sub(/^\t[\t ]*/, "&$(AM_V_GEN)") | |
444 | else { | 455 | |
445 | sub(/^\t[\t ]*/,"") | ||
446 | print "\t$(AM_V_GEN)" $0 | ||
447 | } | ||
448 | cont = match($0, /\\$/) | 456 | cont = match($0, /\\$/) |
449 | state = 2 | 457 | state = 2 |
450 | next | 458 | next |
@@ -452,22 +460,32 @@ state == 1 && /^\t/ { | |||
452 | # All non-continuation lines within the rule are prefixed | 460 | # All non-continuation lines within the rule are prefixed |
453 | # with $(AM_V_at). | 461 | # with $(AM_V_at). |
454 | state == 2 && /^\t/ && NF > 0 { | 462 | state == 2 && /^\t/ && NF > 0 { |
455 | if (!cont) { | 463 | if (!cont) |
456 | sub(/^\t[\t ]*/,"") | 464 | sub(/^\t[\t ]*/, "&$(AM_V_at)") |
457 | print "\t$(AM_V_at)" $0 | 465 | |
458 | } else | ||
459 | |||
460 | cont = match($0, /\\$/) | 466 | cont = match($0, /\\$/) |
461 | next | 467 | next |
462 | } | 468 | } |
463 | # Everything else is output verbatim | 469 | # Everything else is output verbatim |
464 | { print }' | 470 | { print } |
471 | ' | ||
465 | 472 | ||
466 | silent_rules=yes | 473 | silent_rules=yes |
467 | grep 'AM_SILENT_RULES' configure.ac > /dev/null || | 474 | grep 'AM_SILENT_RULES' configure.ac > /dev/null || |
468 | grep '^[ ]*AM_INIT_AUTOMAKE([^)][^)]*silent-rules' configure.ac > /dev/null || | 475 | grep '^[ ]*AM_INIT_AUTOMAKE([^)][^)]*silent-rules' configure.ac > /dev/null || |
469 | silent_rules=no | 476 | silent_rules=no |
470 | 477 | ||
478 | silentize() { | ||
479 | if test "$silent_rules" = yes; then | ||
480 | case $1 in | ||
481 | *.am) defn=0;; | ||
482 | *.in) defn=1;; | ||
483 | esac | ||
484 | awk -v defn=$defn "$silent_rules_prog" $1 > ${1}-t && | ||
485 | mv ${1}-t $1 | ||
486 | fi | ||
487 | } | ||
488 | |||
471 | slurp() { | 489 | slurp() { |
472 | for dir in . `(cd $1 && find * -type d -print)`; do | 490 | for dir in . `(cd $1 && find * -type d -print)`; do |
473 | copied= | 491 | copied= |
@@ -489,10 +507,7 @@ slurp() { | |||
489 | rm -f $dir/$gnulib_mk && | 507 | rm -f $dir/$gnulib_mk && |
490 | sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk | 508 | sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk |
491 | } | 509 | } |
492 | if test "$silent_rules" = yes; then | 510 | silentize $dir/$gnulib_mk |
493 | awk "$silent_rules_prog" $dir/$gnulib_mk > $dir/${gnulib_mk}-t && | ||
494 | mv $dir/${gnulib_mk}-t $dir/${gnulib_mk} | ||
495 | fi | ||
496 | elif { test "${2+set}" = set && test -r $2/$dir/$file; } || | 511 | elif { test "${2+set}" = set && test -r $2/$dir/$file; } || |
497 | version_controlled_file $dir $file; then | 512 | version_controlled_file $dir $file; then |
498 | echo "$0: $dir/$file overrides $1/$dir/$file" | 513 | echo "$0: $dir/$file overrides $1/$dir/$file" |
@@ -651,7 +666,7 @@ if test $with_gettext = yes; then | |||
651 | '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} | 666 | '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} |
652 | } | 667 | } |
653 | ' po/Makevars.template >po/Makevars | 668 | ' po/Makevars.template >po/Makevars |
654 | 669 | silentize po/Makefile.in.in | |
655 | if test -d runtime-po; then | 670 | if test -d runtime-po; then |
656 | # Similarly for runtime-po/Makevars, but not quite the same. | 671 | # Similarly for runtime-po/Makevars, but not quite the same. |
657 | rm -f runtime-po/Makevars | 672 | rm -f runtime-po/Makevars |
diff --git a/doc/Makefile.am b/doc/Makefile.am index c10bb0b..1a7396c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -35,7 +35,7 @@ EXTRA_DIST = \ | |||
35 | untabify.el | 35 | untabify.el |
36 | 36 | ||
37 | clean-local: | 37 | clean-local: |
38 | rm -rf manual | 38 | @rm -rf manual |
39 | 39 | ||
40 | # Checking | 40 | # Checking |
41 | check-format: | 41 | check-format: |
@@ -141,15 +141,15 @@ check-unrevised: | |||
141 | all-check-docs: check-format check-options check-pragmas check-builtins check-mflib check-exceptions check-refs check-fixmes check-writeme check-unrevised | 141 | all-check-docs: check-format check-options check-pragmas check-builtins check-mflib check-exceptions check-refs check-fixmes check-writeme check-unrevised |
142 | 142 | ||
143 | check-docs: | 143 | check-docs: |
144 | $(MAKE) -k all-check-docs | 144 | @$(MAKE) -k all-check-docs |
145 | 145 | ||
146 | # | 146 | # |
147 | 147 | ||
148 | master-menu: | 148 | master-menu: |
149 | emacs -batch -l mastermenu.el -f make-master-menu $(info_TEXINFOS) | 149 | $(AM_V_GEN)emacs -batch -l mastermenu.el -f make-master-menu $(info_TEXINFOS) |
150 | 150 | ||
151 | untabify: | 151 | untabify: |
152 | emacs -batch -l untabify.el $(info_TEXINFOS) $(mailfromd_TEXINFOS) | 152 | @emacs -batch -l untabify.el $(info_TEXINFOS) $(mailfromd_TEXINFOS) |
153 | 153 | ||
154 | final: untabify master-menu | 154 | final: untabify master-menu |
155 | 155 | ||
diff --git a/pies/Makefile.am b/pies/Makefile.am index 1902804..7aaf759 100644 --- a/pies/Makefile.am +++ b/pies/Makefile.am | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of mailfrom filter. | 1 | # This file is part of mailfrom filter. |
2 | # Copyright (C) 2008 Sergey Poznyakoff | 2 | # Copyright (C) 2008, 2009 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -34,7 +34,7 @@ EXTRA_DIST = pies.rcin | |||
34 | noinst_DATA = pies.rc | 34 | noinst_DATA = pies.rc |
35 | DISTCLEANFILES = pies.rc | 35 | DISTCLEANFILES = pies.rc |
36 | .rcin.rc: | 36 | .rcin.rc: |
37 | sed 's|SBINDIR|$(sbindir)|g' $< > $@ | 37 | $(AM_V_GEN)sed 's|SBINDIR|$(sbindir)|g' $< > $@ |
38 | 38 | ||
39 | meta1lex.c: meta1gram.h | 39 | meta1lex.c: meta1gram.h |
40 | 40 | ||