diff options
| author | Eric Blake <eblake@redhat.com> | 2012-12-22 07:18:15 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-12-22 07:19:34 -0700 |
| commit | 51c16cc5f4148ce7085a3df0c7b2828701da9f3a (patch) | |
| tree | 79faade61c18031cb0477f5a425bdb496625e72c | |
| parent | 2273b387014b4aa8acde4587a192b9bd6d4c0fac (diff) | |
| download | m4-51c16cc5f4148ce7085a3df0c7b2828701da9f3a.tar.gz | |
maint: move syntax check exemptions into cfg.mk
It's easier to maintain exemptions in a single file than it is
to maintain a bunch of hidden .x files.
* .x-sc_prohibit_tab_based_indentation: Delete file.
* .x-update-copyright: Likewise.
* Makefile.am (syntax_check_exceptions): Delete rule.
* cfg.mk (exclude_file_name_regexp): Move exemptions here.
(local-checks-to-skip): Re-enable copyright check.
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | .x-sc_prohibit_tab_based_indentation | 5 | ||||
| -rw-r--r-- | .x-update-copyright | 1 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | cfg.mk | 7 |
5 files changed, 13 insertions, 13 deletions
diff --git a/.x-sc_prohibit_tab_based_indentation b/.x-sc_prohibit_tab_based_indentation deleted file mode 100644 index bd9127ed..00000000 --- a/.x-sc_prohibit_tab_based_indentation +++ /dev/null @@ -1,5 +0,0 @@ -^GNUMakefile$ -Makefile\.am$ -\.mk$ -^HACKING$ -ChangeLog.* diff --git a/.x-update-copyright b/.x-update-copyright deleted file mode 100644 index 725ba407..00000000 --- a/.x-update-copyright +++ /dev/null @@ -1 +0,0 @@ -m4/gnulib-cache.m4 @@ -1,5 +1,12 @@ 2012-12-22 Eric Blake <eblake@redhat.com> + maint: move syntax check exemptions into cfg.mk + * .x-sc_prohibit_tab_based_indentation: Delete file. + * .x-update-copyright: Likewise. + * Makefile.am (syntax_check_exceptions): Delete rule. + * cfg.mk (exclude_file_name_regexp): Move exemptions here. + (local-checks-to-skip): Re-enable copyright check. + build: update to latest gnulib * gnulib: Update to latest. diff --git a/Makefile.am b/Makefile.am index 1556fd03..2e077f89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,8 @@ SUBDIRS = . examples lib src doc checks tests -syntax_check_exceptions = \ - .x-sc_prohibit_tab_based_indentation \ - .x-update-copyright - EXTRA_DIST = bootstrap c-boxes.el cfg.mk maint.mk \ - .prev-version .version m4/gnulib-cache.m4 $(syntax_check_exceptions) + .prev-version .version m4/gnulib-cache.m4 DISTCLEANFILES = stamp-h ## maintainer-clean should remove as much as possible that ./bootstrap can ## recreate. In the m4 directory, keep only gnulib-cache.m4. @@ -28,8 +28,6 @@ local-checks-to-skip = local-checks-to-skip += sc_bindtextdomain # M4 intentionally uses a coding style that compiles under C++. local-checks-to-skip += sc_cast_of_x_alloc_return_value -# sc_copyright_check is currently broken for multi-line copyrights. -local-checks-to-skip += sc_copyright_check # Our files include "m4.h", which in turn includes <config.h> first. config_h_header = "m4\.h" @@ -42,3 +40,8 @@ sc_prohibit_tab_based_indentation: @re='^ * ' \ msg='TAB in indentation; use only spaces' \ $(_prohibit_regexp) + +# List all syntax-check exemptions: +exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ + (^(GNU)?Makefile(\.am)?|\.mk|^HACKING|^ChangeLog.*)$$ +exclude_file_name_regexp--update-copyright = ^m4/gnulib-cache.m4$$ |