X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=Makefile;h=9c0d0c3bf44be29bcc62b55381ab42c873e5198a;hb=caefbc9f759c39878987f78e7ba0bd5df63b491d;hp=0596ba6a5739187669fdd42eb1f1d9b452bc775a;hpb=3552ea714b8a640d547de5783b394f08be252ae0;p=gnulib.git

diff --git a/Makefile b/Makefile
index 0596ba6a5..9c0d0c3bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for gnulib central.
-# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # in any medium, are permitted without royalty provided the copyright
@@ -13,15 +13,48 @@ info html dvi pdf:
 	cd doc && $(MAKE) $@ && $(MAKE) mostlyclean
 
 # Perform some platform independent checks on the gnulib code.
-check: sc_prefer_ac_check_funcs_once
+check: \
+  sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT			\
+  sc_pragma_columns							\
+  sc_prefer_ac_check_funcs_once
 
 sc_prefer_ac_check_funcs_once:
 	if test -d .git; then						\
-          git grep -w -l AC_CHECK_FUNCS modules				\
-            && { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS	\
-                   in modules/ 1>&2; exit 1; } || :			\
+	  git grep -w -l AC_CHECK_FUNCS modules				\
+	    && { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS	\
+		   in modules/ 1>&2; exit 1; } || :			\
 	else :; fi
 
+sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT:
+	if test -d .git; then						\
+	  url=http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/22874;	\
+	  git grep '^[	 ]*TESTS_ENVIRONMENT += PATH=' modules		\
+	    && { printf '%s\n' 'Do not augment PATH via TESTS_ENVIRONMENT;' \
+		 "  see <$$url>" 1>&2; exit 1; } || :			\
+	else :; fi
+
+sc_pragma_columns:
+	if test -d .git; then						\
+	  git ls-files|grep '\.in\.h$$'					\
+	      | xargs grep -l '^@PRAGMA_SYSTEM_HEADER@'			\
+	      | xargs grep -L '^@PRAGMA_COLUMNS@'			\
+	      | grep .							\
+	    && { printf '%s\n'						\
+		   'the files listed above use @PRAGMA_SYSTEM_HEADER@'	\
+		   'without also using @PRAGMA_COLUMNS@' 1>&2;		\
+		 exit 1; } || :;					\
+	else :; fi
+
+# Verify that certain (for now, only Jim Meyering and Eric Blake's)
+# *.c files are consistently cpp indented.
+sc_cpp_indent_check:
+	./gnulib-tool --extract-filelist \
+            $$(cd ./modules; grep -ilrE '(meyering|blake)' .) \
+          | sort -u \
+          | grep '\.c$$' \
+          | grep -v '/getloadavg\.c$$' \
+          | xargs cppi -c
+
 # Regenerate some files that are stored in the repository.
 regen: MODULES.html
 
@@ -30,3 +63,26 @@ regen: MODULES.html
 # where it then appears at <http://www.gnu.org/software/gnulib/MODULES.html>.
 MODULES.html: MODULES.html.sh
 	./MODULES.html.sh > MODULES.html
+
+# Run this rule once per year (usually early in January)
+# to update all FSF copyright year lists here.
+# We exclude the files listed in srclist.txt (maintained elsewhere)
+# as well as those in tests/unictype (generated).
+# Also exclude any file that includes the "GENERATED AUTOMATICALLY" comment,
+# being careful not to exclude code that merely generates the comment.
+# Also exclude doc/INSTALL*, since they too are generated.
+update-copyright:
+	exempt=$$(mktemp);						\
+	grep -v '^#' config/srclist.txt|grep -v '^$$'			\
+	  | while read src dst; do					\
+	      test -f "$$dst" && { echo "$$dst"; continue; };		\
+	      test -d "$$dst" || continue;				\
+	      echo "$$dst"/$$(basename "$$src");			\
+	    done > $$exempt;						\
+	git ls-files tests/unictype >> $$exempt;			\
+	git ls-files doc/INSTALL* >> $$exempt;				\
+	git ls-files | grep -vFf $$exempt				\
+	  | xargs grep -L '^/\*.*GENERATED AUTOMATICALLY'		\
+	  | UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79				\
+	    UPDATE_COPYRIGHT_USE_INTERVALS=1				\
+	      xargs build-aux/update-copyright