X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=cfg.mk;h=4321e64336be0a739201be36f8d371b7804ade8e;hb=aef5feaf109fa88968c9e1c78754e20386c4b96a;hp=136c96c3a6df9dd968800c228c2f5e4e7790a412;hpb=ec347e5ed8daee2fe0c34a23fb13633918e99503;p=debian%2Fgzip

diff --git a/cfg.mk b/cfg.mk
index 136c96c..4321e64 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,17 +19,11 @@ manual_title = gzip: the data compression program
 
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =		\
+  sc_bindtextdomain		\
   sc_error_message_period	\
   sc_error_message_uppercase	\
-  sc_m4_quote_check		\
-  sc_obsolete_symbols		\
   sc_program_name		\
-  sc_prohibit_S_IS_definition	\
-  sc_prohibit_atoi_atof		\
-  sc_prohibit_stat_st_blocks	\
-  sc_space_tab			\
-  sc_useless_cpp_parens
-
+  sc_texinfo_acronym
 
 # Tools used to bootstrap this package, used for "announcement".
 bootstrap-tools = autoconf,automake,gnulib
@@ -37,14 +31,14 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = e35901d8427a032d2b88a3195ed24a8f
+old_NEWS_hash = dada3abad00e555713d6e99738224904
 
 sc_obs_header_regex = \
   \<(STDC_HEADERS|HAVE_(LIMITS|STRING|UNISTD|STDLIB)_H)\>
 sc_prohibit_obsolete_HAVE_HEADER_H:
-	@re='^[	 ]*#[	 ]*(el)?if.*$(sc_obs_header_regex)' \
-	msg='remove the above obsolete #if...HAVE_HEADER_H test(s)' \
-	  $(_prohibit_regexp)
+	@prohibit='^[	 ]*#[	 ]*(el)?if.*$(sc_obs_header_regex)' \
+	halt='remove the above obsolete #if...HAVE_HEADER_H test(s)' \
+	  $(_sc_search_regexp)
 
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
@@ -52,12 +46,37 @@ update-copyright-env = \
 
 # Indent only with spaces.
 sc_prohibit_tab_based_indentation:
-	@re='^ *	'						\
-	msg='TAB in indentation; use only spaces'			\
-	  $(_prohibit_regexp)
+	@prohibit='^ *	'						\
+	halt='TAB in indentation; use only spaces'			\
+	  $(_sc_search_regexp)
 
 # Don't use "indent-tabs-mode: nil" anymore.  No longer needed.
 sc_prohibit_emacs__indent_tabs_mode__setting:
-	@re='^( *[*#] *)?indent-tabs-mode:'				\
-	msg='use of emacs indent-tabs-mode: setting'			\
-	  $(_prohibit_regexp)
+	@prohibit='^( *[*#] *)?indent-tabs-mode:'			\
+	halt='use of emacs indent-tabs-mode: setting'			\
+	  $(_sc_search_regexp)
+
+include $(srcdir)/dist-check.mk
+
+exclude_file_name_regexp--sc_file_system = ^NEWS$$
+exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
+  (^|/)(GNU)?[Mm]akefile|(^|/)ChangeLog|\.(am|mk)$$
+exclude_file_name_regexp--sc_require_config_h = ^lib/match\.c$$
+exclude_file_name_regexp--sc_require_config_h_first = ^lib/match\.c$$
+exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
+  ^tests/hufts-segv\.gz$$
+exclude_file_name_regexp--sc_prohibit_strcmp = ^gzip\.c$$
+exclude_file_name_regexp--sc_prohibit_always-defined_macros = ^tailor\.h$$
+exclude_file_name_regexp--sc_prohibit_atoi_atof = ^(gzip|sample/sub)\.c$$
+exclude_file_name_regexp--sc_space_tab = ^lib/match\.c$$
+exclude_file_name_regexp--sc_useless_cpp_parens = ^(lib/match\.c|tailor\.h)$$
+
+exclude_file_name_regexp--sc_prohibit_double_semicolon = ^lib/match\.c$$
+
+# Tell the tight_scope rule that sources are in ".".
+export _gl_TS_dir = .
+
+# Tell the tight_scope rule that these variables are deliberately "extern".
+export _gl_TS_unmarked_extern_vars = \
+  block_start d_buf inbuf outbuf prev read_buf strstart window \
+  match_start prev_length max_chain_length good_match nice_match