summaryrefslogtreecommitdiff
path: root/cfg.mk
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-31 19:35:58 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-31 19:40:20 -0800
commit4f61a0530c565bed2e8d0cf74ac9fd4322313093 (patch)
tree5edda0ed22e0a47b8d27da3bc92187de540fa0f1 /cfg.mk
parentca0d4f3bae56c486ec1d49d72c9ed6924236babc (diff)
downloadgrep-4f61a0530c565bed2e8d0cf74ac9fd4322313093.tar.gz
ms: move Microsoft-specific stuff to lib/ms
* cfg.mk (exclude_file_name_regexp--sc_prohibit_strcmp) (exclude_file_name_regexp--sc_require_config_h) (exclude_file_name_regexp--sc_require_config_h_first): New rules. * lib/colorize.c, lib/colorize.h, lib/colorize-impl.c: * lib/ms/colorize.h, lib/ms/colorize-impl.c: New files. * configure.ac (GREP_SRC_INCLUDES): New macro. * lib/Makefile.am (libgreputils_a_SOURCES): Add colorize.[ch]. (EXTRA_DIST): New macro. * src/Makefile.am (DEFAULT_INCLUDES): New macro. * src/main.c: Include colorize.h. (PR_SGR_START, PR_SGR_END, PR_SGR_START_IF, PR_SGR_END_IF): Now static functions, not macros. (hstdout, norm_attr, w32_console_init, w32_sgr2attr) (w32_clreol) [__MINGW32__]: Move to lib/ms/colorize-impl.c. (pr_sgr_start, pr_sgr_end): Remove; callers changed to use new print_start_colorize, print_end_colorize from colorize.h. (init_colorize): Rename from w32_console_init and move to colorize module; caller changed. (should_colorize): Move to colorize module.
Diffstat (limited to 'cfg.mk')
-rw-r--r--cfg.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/cfg.mk b/cfg.mk
index d7cb9c42..309ee23d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,7 +63,10 @@ update-copyright-env = \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
exclude_file_name_regexp--sc_bindtextdomain = ^tests/get-mb-cur-max\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-impl\.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)$$|^gl/lib/.*\.c\.diff$$)
+exclude_file_name_regexp--sc_require_config_h = ^lib/colorize\.c$$
+exclude_file_name_regexp--sc_require_config_h_first = ^lib/colorize\.c$$
exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$