diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-10-24 08:41:09 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-10-24 08:41:09 -0700 |
| commit | 57276037c1357e54730a94fb1191362d4f694252 (patch) | |
| tree | f933609cb8870c42478a71a2c3f3b416c93d57aa /Makefile | |
| parent | 43418aad5d8214c1b60b080dff2c36a2caf27391 (diff) | |
| download | txr-57276037c1357e54730a94fb1191362d4f694252.tar.gz txr-57276037c1357e54730a94fb1191362d4f694252.tar.bz2 txr-57276037c1357e54730a94fb1191362d4f694252.zip | |
* Makefile: Removing trailing spaces.
(GREP_CHECK): New macro.
(enforce): Rewritten using GREP_CHECK, with new checks.
* arith.c, combi.c, debug.c, eval.c, filter.c, gc.c, hash.c, lib.c,
* lib.h, match.c, parser.l, parser.y, rand.c, regex.c, signal.c,
* signal.h, stream.c, syslog.c, txr.c, unwind.c, utf8.c: Remove
trailing spaces.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -137,7 +137,7 @@ tests/010/reghash.ok: TXR_OPTS := -B tests/002/%: TXR_SCRIPT_ON_CMDLINE := y -tests/011/%: TXR_DBG_OPTS := +tests/011/%: TXR_DBG_OPTS := %.ok: %.txr mkdir -p $(dir $@) @@ -150,14 +150,21 @@ tests/011/%: TXR_DBG_OPTS := %.expected: %.txr ./$(PROG) $(TXR_OPTS) $^ $(TXR_ARGS) > $@ -.PHONY: enforce -enforce: - @if [ $$(grep -E '\<void[\t ]*\*' $(SRCS) | wc -l) -ne 1 ] ; then \ - echo "New 'void *' occurrences have been found:" ; \ - grep -n -E '\<void[\t ]*\*' $(SRCS) \ - | grep -v -F 'typedef void *yyscan_t' ; \ +define GREP_CHECK + @if [ $$(grep -E $(1) $(SRCS) | wc -l) -ne $(3) ] ; then \ + echo "New '$(2)' occurrences have been found:" ; \ + grep -n -E $(1) $(SRCS) \ + | sed -e 's/\(.*:.*:\).*/\1 $(2)/' \ + | grep $(4) ; \ exit 1 ; \ fi +endef + +.PHONY: enforce +enforce: + $(call GREP_CHECK,'\<void[ ]*\*',void *,1,-v 'typedef void \*yyscan_t') + $(call GREP_CHECK,' ',tabs,0,'.') + $(call GREP_CHECK,' $$',trailing spaces,0,'.') # # Installation macro. @@ -203,7 +210,7 @@ zip: install # # Install the tests as well as the script to run them -# +# install-tests: mkdir -p $(DESTDIR)$(datadir) (cd $(top_srcdir) ; \ @@ -218,7 +225,7 @@ install-tests: # # Generate web page from man page -# +# txr-manpage.html: txr.1 genman.txr man2html $< | ./$(PROG) genman.txr - > $@ |