From 97cde147b5ea759749119a3e1fb39403ea7d536f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 13 Nov 2010 15:18:55 -0700 Subject: [PATCH] maint: ensure syntax check exceptions are distributed * Makefile.am (EXTRA_DIST): Factor exceptions files... (syntax_check_excpetions): into new list. Include recently added exceptions. * cfg.mk (sc_x_sc_dist_check): New check, copied from coreutils. --- Makefile.am | 19 +++++++++++++------ cfg.mk | 13 +++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index bf1b49b515..bd70a3a8ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,17 +14,14 @@ XML_EXAMPLES = \ $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \ test/*.xml storage/*.xml))) -EXTRA_DIST = \ - ChangeLog-old \ - libvirt.spec libvirt.spec.in \ - mingw32-libvirt.spec.in \ - libvirt.pc libvirt.pc.in \ - autobuild.sh \ +syntax_check_exceptions = \ .x-sc_avoid_ctype_macros \ .x-sc_avoid_if_before_free \ .x-sc_avoid_write \ .x-sc_bindtextdomain \ .x-sc_m4_quote_check \ + .x-sc_po_check \ + .x-sc_prohibit_always_true_header_tests \ .x-sc_prohibit_asprintf \ .x-sc_prohibit_close \ .x-sc_prohibit_empty_lines_at_EOF \ @@ -34,6 +31,7 @@ EXTRA_DIST = \ .x-sc_prohibit_have_config_h \ .x-sc_prohibit_HAVE_MBRTOWC \ .x-sc_prohibit_nonreentrant \ + .x-sc_prohibit_readlink \ .x-sc_prohibit_sprintf \ .x-sc_prohibit_strcmp \ .x-sc_prohibit_strncmp \ @@ -43,9 +41,18 @@ EXTRA_DIST = \ .x-sc_require_config_h \ .x-sc_require_config_h_first \ .x-sc_trailing_blank \ + .x-sc_unmarked_diagnostics + +EXTRA_DIST = \ + ChangeLog-old \ + libvirt.spec libvirt.spec.in \ + mingw32-libvirt.spec.in \ + libvirt.pc libvirt.pc.in \ + autobuild.sh \ Makefile.nonreentrant \ autogen.sh \ examples/domain-events/events-python \ + $(syntax_check_exceptions) \ $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig diff --git a/cfg.mk b/cfg.mk index 963c7db384..5b4a603d7c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -454,6 +454,19 @@ sc_prohibit_gettext_markup: halt='do not mark these strings for translation' \ $(_sc_search_regexp) +# Ensure that the syntax_check_exceptions file list in Makefile.am +# stays in sync with corresponding files in the repository. +sce = syntax_check_exceptions +sc_x_sc_dist_check: + @test "$$( ($(VC_LIST) | sed -n '/\.x-sc_/p' \ + | sed 's|^$(_dot_escaped_srcdir)/||'; \ + sed -n '/^$(sce) =[ ]*\\$$/,/[^\]$$/p' \ + $(srcdir)/Makefile.am \ + | sed 's/^ *//;/^$(sce) =/d' \ + | tr -s '\012\\' ' ' | fmt -1 \ + ) | sort | uniq -u)" \ + && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :; + # We don't use this feature of maint.mk. prev_version_file = /dev/null