Move sc_tight_scope into maint.mk.

It does not work, and I don't know how it was supposed to work: it seems
to be looking for sources in the build tree.  I just moved it at a better
place, fixing it is still required.

	* src/local.mk (echo): Remove.
	(sc_tight_scope): Move to...
	* maint.mk: here.

diff --git a/ChangeLog b/ChangeLog
index edb5cf66e153de3c4f0f9b57a72c4ed68029f8e2..e3ca023dc15e72f9f62141636add6d39abcbd5c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-15  Akim Demaille  <demaille@gostai.com>
+
+       Move sc_tight_scope into maint.mk.
+       It does not work, and I don't know how it was supposed to work: it seems
+       to be looking for sources in the build tree.  I just moved it at a better
+       place, fixing it is still required.
+       
+       * src/local.mk (echo): Remove.
+       (sc_tight_scope): Move to...
+       * maint.mk: here.
+
 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Regen.

diff --git a/maint.mk b/maint.mk
index 93d6b6aa6ea1c39b1e22f2dcb7a37295e54c2c4f..b83e1dcec873d25c0ca859e96d67baebf7f2712d 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -404,8 +404,33 @@ sc_the_the:
          { echo '$(ME): found use of "the ''the";' 1>&2;               \
            exit 1; } || :
 
-#sc_tight_scope:
-#      $(MAKE) -C src $@
+# Most functions in src/*.c should have static scope.
+# Any that don't must be marked with `extern', but `main'
+# and `usage' are exceptions.  They're always extern, but
+# don't need to be marked.
+#
+# The second nm|grep checks for file-scope variables with `extern' scope.
+sc_tight_scope: $(all_programs)
+       @t=exceptions-$$$$;                                             \
+       trap 's=$$?; rm -f $$t; exit $$s' 0 1 2 13 15;                  \
+       ( printf '^main$$\n^usage$$\n';                                 \
+         grep -h -A1 '^extern .*[^;]$$' $(SOURCES)                     \
+           | grep -vE '^(extern |--)' |sed 's/^/^/;s/ .*/$$/' ) > $$t; \
+       if nm -e *.$(OBJEXT)                                            \
+           | sed -n 's/.* T //p'                                       \
+           | grep -Ev -f $$t; then                                     \
+         echo 'the above functions should have static scope' 1>&2;     \
+         exit 1;                                                       \
+       fi;                                                             \
+       ( printf '^program_name$$\n';                                   \
+         sed -n 's/^extern .*[* ]\([a-zA-Z_][a-zA-Z_0-9]*\);$$/^\1$$/p' \
+           $$(ls $(SOURCES) | grep '\.h$$') /dev/null) > $$t;          \
+       if nm -e *.$(OBJEXT)                                            \
+           | sed -n 's/.* [BD] //p'                                    \
+           | grep -Ev -f $$t; then                                     \
+         echo 'the above variables should have static scope' 1>&2;     \
+         exit 1;                                                       \
+       fi
 
 sc_trailing_blank:
        @grep -n '[      ]$$' $$($(VC_LIST_EXCEPT)) &&                  \

diff --git a/src/local.mk b/src/local.mk
index d54d528690cb98b5d73f234650d43e6f991960dd..29c19c1616c2bc5cdd399ad3c51b25a2b2bd35c4 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -118,37 +118,3 @@ src/yacc:
        echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
        chmod a+x $@.tmp
        mv $@.tmp $@
-
-echo:
-       echo $(src_bison_SOURCES) $(noinst_HEADERS)
-
-# The following rule is not designed to be portable,
-# and relies on tools that not everyone has.
-
-# Most functions in src/*.c should have static scope.
-# Any that don't must be marked with `extern', but `main'
-# and `usage' are exceptions.  They're always extern, but
-# don't need to be marked.
-#
-# The second nm|grep checks for file-scope variables with `extern' scope.
-sc_tight_scope: $(all_programs)
-       @t=exceptions-$$$$;                                             \
-       trap 's=$$?; rm -f $$t; exit $$s' 0 1 2 13 15;                  \
-       ( printf '^main$$\n^usage$$\n';                                 \
-         grep -h -A1 '^extern .*[^;]$$' $(SOURCES)                     \
-           | grep -vE '^(extern |--)' |sed 's/^/^/;s/ .*/$$/' ) > $$t; \
-       if nm -e *.$(OBJEXT)                                            \
-           | sed -n 's/.* T //p'                                       \
-           | grep -Ev -f $$t; then                                     \
-         echo 'the above functions should have static scope' 1>&2;     \
-         exit 1;                                                       \
-       fi;                                                             \
-       ( printf '^program_name$$\n';                                   \
-         sed -n 's/^extern .*[* ]\([a-zA-Z_][a-zA-Z_0-9]*\);$$/^\1$$/p' \
-           $$(ls $(SOURCES) | grep '\.h$$') /dev/null) > $$t;          \
-       if nm -e *.$(OBJEXT)                                            \
-           | sed -n 's/.* [BD] //p'                                    \
-           | grep -Ev -f $$t; then                                     \
-         echo 'the above variables should have static scope' 1>&2;     \
-         exit 1;                                                       \
-       fi