diff options
| author | Jim Meyering <meyering@fb.com> | 2016-08-17 10:49:10 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2016-09-10 11:03:43 -0700 |
| commit | ca2ded9ca881f752beca43df7aa3c1c59a0d397d (patch) | |
| tree | f8d136befde18437ab0bb12a36f6039c035b8187 /cfg.mk | |
| parent | 57f1fef2cfcd1cfb8e2ad2b86b8cbc09b96f6e4d (diff) | |
| download | grep-ca2ded9ca881f752beca43df7aa3c1c59a0d397d.tar.gz | |
dfa: reflect move of grep's DFA code to gnulib
Now that the core DFA code and tests reside in gnulib,
remove the copies here and use what gnulib provides.
* bootstrap.conf: Use the dfa module.
* cfg.mk: Remove settings involving files that have moved.
(_gl_TS_unmarked_extern_functions): Add dfaerror and dfawarn.
It is wrong/ugly to have to define these global symbols to use
the dfa module, but we'll adjust that separately.
* po/POTFILES.in: Apply s/src/lib/ to src/dfa.c.
* src/Makefile.am: Remove mention of dfa.[ch] and localeinfo.[ch].
* tests/Makefile.am: Remove mention of the tests that we have
moved to the gnulib module.
* src/dfa.c: Remove file.
* src/dfa.h: Likewise.
* src/localeinfo.c: Likewise.
* src/localeinfo.h: Likewise.
* tests/dfa-match: Likewise.
* tests/dfa-match-aux.c: Likewise.
* tests/invalid-char-class: Likewise.
Diffstat (limited to 'cfg.mk')
| -rw-r--r-- | cfg.mk | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -30,7 +30,7 @@ bootstrap-tools = autoconf,automake,gnulib # The tight_scope test gets confused about inline functions. # like 'to_uchar'. -_gl_TS_unmarked_extern_functions = main usage mb_clen to_uchar +_gl_TS_unmarked_extern_functions = main usage mb_clen to_uchar dfaerror dfawarn # Now that we have better tests, make this the default. export VERBOSE = yes @@ -138,16 +138,12 @@ update-copyright-env = \ include $(abs_top_srcdir)/dist-check.mk exclude_file_name_regexp--sc_bindtextdomain = \ - ^tests/(get-mb-cur-max|dfa-match-aux)\.c$$ -exclude_file_name_regexp--sc_prohibit_atoi_atof = \ - ^tests/dfa-match-aux\.c$$ + ^tests/get-mb-cur-max\.c$$ exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-.*\.c$$ exclude_file_name_regexp--sc_prohibit_xalloc_without_use = ^src/kwset\.c$$ exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ (Makefile|\.(am|mk)$$) -exclude_file_name_regexp--sc_error_message_uppercase = ^src/dfa\.c$$ -exclude_file_name_regexp--sc_prohibit_strncpy = ^src/dfa\.c$$ exclude_file_name_regexp--sc_prohibit_doubled_word = ^tests/count-newline$$ |