[PATCH 3/3] remove lib/ms/

[Paolo Bonzini]

* configure.ac: Create lib/colorize.c as a symbolic link.
* lib/colorize-posix.c: New name of lib/colorize-impl.c.
* lib/colorize-w32.c: New name of lib/ms/colorize-impl.c.
* lib/colorize.c: Delete.
* lib/Makefile.am (EXTRA_DIST): Adjust.
* .gitignore: Adjust.
* cfg.mk: Adjust syntax-check exclusions.
---
 .gitignore                                 |    3 +++
 cfg.mk                                     |    4 +---
 configure.ac                               |    6 +++---
 lib/Makefile.am                            |    2 +-
 lib/{colorize-impl.c => colorize-posix.c}  |    0
 lib/{ms/colorize-impl.c => colorize-w32.c} |    0
 lib/colorize.c                             |    1 -
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/{colorize-impl.c => colorize-posix.c} (100%)
 rename lib/{ms/colorize-impl.c => colorize-w32.c} (100%)
 delete mode 100644 lib/colorize.c

diff --git a/.gitignore b/.gitignore
index e4c7b47..35f5d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,8 @@ Makefile.in
 TAGS
 !/gnulib-tests/Makefile.am
 !/lib/Makefile.am
+!/lib/colorize-posix.c
+!/lib/colorize-w32.c
+!/lib/colorize.h
 !/lib/savedir.c
 !/lib/savedir.h
diff --git a/cfg.mk b/cfg.mk
index 204727d..5040199 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,10 +63,8 @@ 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_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)$$|^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$$
diff --git a/configure.ac b/configure.ac
index 0cfeb62..d681dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,10 +201,10 @@ fi
 gl_FUNC_PCRE
 
 case $host_os in
-  mingw*) GREP_SRC_INCLUDES='-I$(top_srcdir)/lib/ms' ;;
-  *) GREP_SRC_INCLUDES= ;;
+  mingw*) suffix=w32 ;;
+  *) suffix=posix ;;
 esac
-AC_SUBST([GREP_SRC_INCLUDES])
+AC_CONFIG_LINKS([lib/colorize.c:lib/colorize-$suffix.c])
 
 AC_CONFIG_FILES([
   Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9127784..afbf3cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 libgreputils_a_SOURCES += \
   colorize.c colorize.h savedir.c savedir.h
 
-EXTRA_DIST += colorize-impl.c ms/colorize-impl.c
+EXTRA_DIST += colorize-posix.c colorize-w32.c
 
 libgreputils_a_LIBADD += $(LIBOBJS) $(ALLOCA)
 libgreputils_a_DEPENDENCIES += $(LIBOBJS) $(ALLOCA)
diff --git a/lib/colorize-impl.c b/lib/colorize-posix.c
similarity index 100%
rename from lib/colorize-impl.c
rename to lib/colorize-posix.c
diff --git a/lib/ms/colorize-impl.c b/lib/colorize-w32.c
similarity index 100%
rename from lib/ms/colorize-impl.c
rename to lib/colorize-w32.c
diff --git a/lib/colorize.c b/lib/colorize.c
deleted file mode 100644
index 51b1847..0000000
--- a/lib/colorize.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <colorize-impl.c>
-- 
1.7.7.1