summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--check-c-style.sh2
-rw-r--r--check-coding-style.mk2
-rw-r--r--check-misc.sh13
4 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 78f8bd135..a72b04fcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
autogen.sh \
check-coding-style.mk \
check-c-style.sh \
+ check-misc.sh \
check-whitespace.sh \
gtk-doc.make
diff --git a/check-c-style.sh b/check-c-style.sh
index 793d34b82..6483141ac 100644
--- a/check-c-style.sh
+++ b/check-c-style.sh
@@ -1,7 +1,7 @@
#!/bin/sh
fail=0
-/bin/sh "${top_srcdir}"/check-whitespace.sh "$@" || fail=$?
+( . "${top_srcdir}"/check-misc.sh ) || fail=$?
if grep -n '^ *GError *\*[[:alpha:]_][[:alnum:]_]* *;' "$@"
then
diff --git a/check-coding-style.mk b/check-coding-style.mk
index b69c63839..ef6ff1735 100644
--- a/check-coding-style.mk
+++ b/check-coding-style.mk
@@ -1,7 +1,7 @@
check-local::
@fail=0; \
if test -n "$(check_misc_sources)"; then \
- top_srcdir=$(top_srcdir) sh $(top_srcdir)/check-whitespace.sh \
+ top_srcdir=$(top_srcdir) sh $(top_srcdir)/check-misc.sh \
$(check_misc_sources) || fail=1; \
fi; \
if test -n "$(check_c_sources)"; then \
diff --git a/check-misc.sh b/check-misc.sh
new file mode 100644
index 000000000..56bfc2726
--- /dev/null
+++ b/check-misc.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+fail=0
+
+( . "${top_srcdir}"/check-whitespace.sh ) || fail=$?
+
+if egrep '(Free\s*Software\s*Foundation.*02139|02111-1307)' "$@"
+then
+ echo "^^^ The above files contain the FSF's old address in GPL headers"
+ fail=1
+fi
+
+exit $fail