Tests for module 'get-rusage-data'.

[gnulib.git] / top / maint.mk

diff --git a/top/maint.mk b/top/maint.mk
index c57acd3..606d42e 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -571,6 +571,13 @@ sc_prohibit_intprops_without_use:
        re='\<($(_intprops_syms_re)) *\('                               \
          $(_sc_header_without_use)
 
+_stddef_syms_re = NULL|offsetof|ptrdiff_t|size_t|wchar_t
+# Prohibit the inclusion of stddef.h without an actual use.
+sc_prohibit_stddef_without_use:
+       @h='<stddef.h>'                                                 \
+       re='\<($(_stddef_syms_re)) *\('                                 \
+         $(_sc_header_without_use)
+
 sc_obsolete_symbols:
        @prohibit='\<(HAVE''_FCNTL_H|O''_NDELAY)\>'                     \
        halt='do not use HAVE''_FCNTL_H or O'_NDELAY                    \
@@ -1127,8 +1134,8 @@ submodule-checks ?= no-submodule-changes public-submodule-commit
 public-submodule-commit:
        $(AM_V_GEN)if test -d $(srcdir)/.git; then                      \
          cd $(srcdir) &&                                               \
-         git submodule --quiet foreach 'test $$(git rev-parse origin)' \
-             = '"$$(git merge-base --independent origin $$sha1)"'      \
+         git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \
+             = '$$(git merge-base origin $$sha1)'                      \
            || { echo '$(ME): found non-public submodule commit' >&2;   \
                 exit 1; };                                             \
        else                                                            \
@@ -1138,10 +1145,10 @@ public-submodule-commit:
 # dependent of "check" by default.  However, some of us do occasionally
 # commit a temporary change that deliberately points to a non-public
 # submodule commit, and want to be able to use rules like "make check".
-# In that case, run e.g., "make check GL_PUBLIC_SUBMODULE_COMMIT="
+# In that case, run e.g., "make check gl_public_submodule_commit="
 # to disable this test.
-GL_PUBLIC_SUBMODULE_COMMIT ?= public-submodule-commit
-check: $(GL_PUBLIC_SUBMODULE_COMMIT)
+gl_public_submodule_commit ?= public-submodule-commit
+check: $(gl_public_submodule_commit)
 
 .PHONY: alpha beta stable
 ALL_RECURSIVE_TARGETS += alpha beta stable