Remove MSVC/nmake build support.

47 files changed, 65 insertions, 2747 deletions

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index bcecd62..97d9c7c 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,5 +1,12 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* windows: Remove directory.
+	* Makefile.msvc: Remove file.
+	* Makefile.am (config.h.msvc, windows/stdbool.h): Remove rules.
+	(EXTRA_DIST): Remove Makefile.msvc, config.h.msvc, windows/*.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (config.h_vms): Remove rule.
 	(EXTRA_DIST): Remove Makefile.vms, config.h_vms.
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index cb5a21b..7627f53 100644
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -41,85 +41,7 @@ $(srcdir)/ABOUT-NLS: $(srcdir)/../gettext-runtime/ABOUT-NLS
 
 # Woe32 support.
 
-config.h.msvc: config.h.in ../version.sh
-	sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \
-	    -e 's/#undef ENABLE_RELOCATABLE$$/#define ENABLE_RELOCATABLE 1/' \
-	    -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
-	    -e 's/#undef HAVE_BTOWC$$/#define HAVE_BTOWC 1/' \
-	    -e 's/#undef HAVE_DECL_GETENV$$/#define HAVE_DECL_GETENV 1/' \
-	    -e 's/#undef HAVE_DECL_STRDUP$$/#define HAVE_DECL_STRDUP 1/' \
-	    -e 's/#undef HAVE_DECL_STRERROR$$/#define HAVE_DECL_STRERROR 1/' \
-	    -e 's/#undef HAVE_DECL_WCWIDTH$$/#define HAVE_DECL_WCWIDTH 0/' \
-	    -e 's/#undef HAVE_DECL__SNPRINTF$$/#define HAVE_DECL__SNPRINTF 1/' \
-	    -e 's/#undef HAVE_DECL__SNWPRINTF$$/#define HAVE_DECL__SNWPRINTF 1/' \
-	    -e 's/#undef HAVE_ENVIRON_DECL$$/#define HAVE_ENVIRON_DECL 1/' \
-	    -e 's/#undef HAVE_ERRNO_DECL$$/#define HAVE_ERRNO_DECL 1/' \
-	    -e 's/#undef HAVE_FCNTL_H$$/#define HAVE_FCNTL_H 1/' \
-	    -e 's/#undef HAVE_FWPRINTF$$/#define HAVE_FWPRINTF 1/' \
-	    -e 's/#undef HAVE_GETCWD$$/#define HAVE_GETCWD 1/' \
-	    -e 's/#undef HAVE_GETHOSTBYNAME$$/#define HAVE_GETHOSTBYNAME 1/' \
-	    -e 's/#undef HAVE_GETHOSTNAME$$/#define HAVE_GETHOSTNAME 1/' \
-	    -e 's/#undef HAVE_ICONV$$/#define HAVE_ICONV 1/' \
-	    -e 's/#undef HAVE_ISASCII$$/#define HAVE_ISASCII 1/' \
-	    -e 's/#undef HAVE_ISWCNTRL$$/#define HAVE_ISWCNTRL 1/' \
-	    -e 's/#undef HAVE_ISWPRINT$$/#define HAVE_ISWPRINT 1/' \
-	    -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \
-	    -e 's/#undef HAVE_LONG_FILE_NAMES$$/#define HAVE_LONG_FILE_NAMES 1/' \
-	    -e 's/#undef HAVE_MEMCHR$$/#define HAVE_MEMCHR 1/' \
-	    -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \
-	    -e 's/#undef HAVE_MEMSET$$/#define HAVE_MEMSET 1/' \
-	    -e 's/#undef HAVE_PTRDIFF_T$$/#define HAVE_PTRDIFF_T 1/' \
-	    -e 's/#undef HAVE_PUTENV$$/#define HAVE_PUTENV 1/' \
-	    -e 's/#undef HAVE_RAISE$$/#define HAVE_RAISE 1/' \
-	    -e 's/#undef HAVE_SEARCH_H$$/#define HAVE_SEARCH_H 1/' \
-	    -e 's/#undef HAVE_SETLOCALE$$/#define HAVE_SETLOCALE 1/' \
-	    -e 's/#undef HAVE_SIG_ATOMIC_T$$/#define HAVE_SIG_ATOMIC_T 1/' \
-	    -e 's/#undef HAVE_STDDEF_H$$/#define HAVE_STDDEF_H 1/' \
-	    -e 's/#undef HAVE_STDLIB_H$$/#define HAVE_STDLIB_H 1/' \
-	    -e 's/#undef HAVE_STRCSPN$$/#define HAVE_STRCSPN 1/' \
-	    -e 's/#undef HAVE_STRDUP$$/#define HAVE_STRDUP 1/' \
-	    -e 's/#undef HAVE_STRERROR$$/#define HAVE_STRERROR 1/' \
-	    -e 's/#undef HAVE_STRING_H$$/#define HAVE_STRING_H 1/' \
-	    -e 's/#undef HAVE_STRPBRK$$/#define HAVE_STRPBRK 1/' \
-	    -e 's/#undef HAVE_STRSTR$$/#define HAVE_STRSTR 1/' \
-	    -e 's/#undef HAVE_STRTOUL$$/#define HAVE_STRTOUL 1/' \
-	    -e 's/#undef HAVE_SYS_STAT_H$$/#define HAVE_SYS_STAT_H 1/' \
-	    -e 's/#undef HAVE_SYS_TYPES_H$$/#define HAVE_SYS_TYPES_H 1/' \
-	    -e 's/#undef HAVE_TIME_H$$/#define HAVE_TIME_H 1/' \
-	    -e 's/#undef HAVE_WCHAR_H$$/#define HAVE_WCHAR_H 1/' \
-	    -e 's/#undef HAVE_WCSLEN$$/#define HAVE_WCSLEN 1/' \
-	    -e 's/#undef HAVE_WINT_T$$/#define HAVE_WINT_T 1/' \
-	    -e 's/#undef HAVE_WMEMCHR$$/#define HAVE_WMEMCHR 1/' \
-	    -e 's/#undef HAVE_WMEMCPY$$/#define HAVE_WMEMCPY 1/' \
-	    -e 's/#undef HAVE_WPRINTF$$/#define HAVE_WPRINTF 1/' \
-	    -e 's/#undef ICONV_CONST$$/#define ICONV_CONST const/' \
-	    -e 's/#undef MALLOC_0_IS_NONNULL$$/#define MALLOC_0_IS_NONNULL 1/' \
-	    -e 's/#undef SETLOCALE_CONST$$/#define SETLOCALE_CONST const/' \
-	    -e 's/#undef SIZE_MAX$$/#define SIZE_MAX 4294967295U/' \
-	    -e 's/#undef STACK_DIRECTION$$/#define STACK_DIRECTION -1/' \
-	    -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
-	    -e 's/#undef USE_UNLOCKED_IO$$/#define USE_UNLOCKED_IO 1/' \
-	    -e 's/#undef __GETOPT_PREFIX$$/#define __GETOPT_PREFIX/' \
-	    -e 's/#undef fnmatch$$/#define fnmatch rpl_fnmatch/' \
-	    -e 's/#undef getline$$/#define getline rpl_getline/' \
-	    -e 's/#undef inline$$/#define inline __inline/' \
-	    -e 's/#undef mode_t$$/#define mode_t int/' \
-	    -e 's/#undef pid_t$$/#define pid_t int/' \
-	    -e 's/#undef restrict$$/#define restrict/' \
-	    -e 's/#undef ssize_t$$/#define ssize_t int/' \
-	    -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long/' \
-	    -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-tools"/' \
-	    -e 's/#undef VERSION$$/#define VERSION "$(VERSION)"/' \
-	    -e '/#undef INSTALLPREFIX$$/d' \
-	  < $(srcdir)/config.h.in > $@
-
-windows/stdbool.h: lib/stdbool_.h
-	test -d windows || mkdir windows
-	sed -e 's/@''HAVE__BOOL''@/0/' < $(srcdir)/lib/stdbool_.h > $@
-
-all-local : windows/stdbool.h
-
-EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/getopt.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextpo.def windows/gettextlib.rc windows/gettextsrc.rc windows/gettextpo.rc
+EXTRA_DIST += README.woe32
 
 
 # Cygwin support.
diff --git a/gettext-tools/Makefile.msvc b/gettext-tools/Makefile.msvc
deleted file mode 100644
index 9350fec..0000000
--- a/gettext-tools/Makefile.msvc
+++ /dev/null
@@ -1,449 +0,0 @@
-# -*- Makefile -*- for gettext-tools
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
-#             Note that this works only with MFLAGS=-MD.
-#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
-#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-#   DEBUG=1   for compiling with debugging information
-#   PREFIX=Some\Directory       Base directory for installation
-#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
-# Note that nmake command line flags are automatically passed to subdirectory
-# Makefiles. Therefore we don't need to pass them explicitly to subdirectory
-# Makefiles, but the subdirectory Makefiles need to have the same defaults.
-!if !defined(DLL)
-DLL=0
-!endif
-!if !defined(DEBUG)
-DEBUG=0
-!endif
-!if !defined(MFLAGS)
-!if !$(DLL)
-MFLAGS=
-!else
-MFLAGS=-MD
-!endif
-!endif
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-!if !defined(IIPREFIX)
-IIPREFIX = c:\\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)\bin
-libdir = $(exec_prefix)\lib
-includedir = $(prefix)\include
-datadir = $(prefix)\share
-localedir = $(datadir)\locale
-pkgdatadir = $(datadir)\gettext
-mandir = $(datadir)\man
-docdir = $(datadir)\doc\gettext
-emacsdir = $(datadir)\emacs
-lispdir = $(emacsdir)\site-lisp
-
-# Programs used by "make":
-
-CC = cl
-CXX = cl -TP
-
-# Set to -W3 if you want to see maximum amount of warnings, including stupid
-# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
-WARN_CFLAGS = -W1
-
-!if !$(DLL)
-PICFLAGS =
-!else
-# "-GD" (msvc5) optimizes for DLL.
-# mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
-!endif
-
-!if $(DEBUG)
-OPTIMFLAGS = -Od -Z7
-!else
-# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
-OPTIMFLAGS = -D_NDEBUG -O1
-!endif
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all : config.h force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl all
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc all
-	cd ..
-
-config.h : config.h.msvc
-	-$(RM) config.h
-	$(LN) config.h.msvc config.h
-
-install : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl install
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc install
-	cd ..
-
-installdirs : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl installdirs
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc installdirs
-	cd ..
-
-uninstall : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl uninstall
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc uninstall
-	cd ..
-
-check : all force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl check
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc check
-	cd ..
-
-mostlyclean : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl mostlyclean
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc mostlyclean
-	cd ..
-	$(RM) config.h
-
-clean : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl clean
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc clean
-	cd ..
-	$(RM) config.h
-
-distclean : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl distclean
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc distclean
-	cd ..
-	$(RM) config.h
-	$(RM) config.status config.log config.cache Makefile
-
-maintainer-clean : force
-	-mkdir intl
-	cd doc
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd intl
-	$(MAKE) -f ..\..\gettext-runtime\intl\Makefile.msvc srcdir=..\..\gettext-runtime\intl maintainer-clean
-	cd ..
-	cd lib
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd libgrep
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd libuniname
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd src
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd po
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd projects
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd misc
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd man
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd tests
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	cd examples
-	$(MAKE) -f Makefile.msvc maintainer-clean
-	cd ..
-	$(RM) config.h
-	$(RM) config.status config.log config.cache Makefile
-
-force :
diff --git a/gettext-tools/README.woe32 b/gettext-tools/README.woe32
index d037694..0c04b0b 100644
--- a/gettext-tools/README.woe32
+++ b/gettext-tools/README.woe32
@@ -1,51 +1,4 @@
 Installation on Woe32 (WinNT/2000/XP, Win95/98/ME):
 
-- Requires MS Visual C/C++ 4.0 or 5.0 or 6.0 or 7.0.
-
-  Note that binaries created with MSVC 7.0 should not be distributed: They
-  depend on a closed-source library 'msvcr70.dll' which is not normally part
-  of a Woe32 installation. You cannot distribute 'msvcr70.dll' with the
-  binaries - this would be a violation of the GPL and of the Microsoft EULA.
-  You can distribute the binaries without including 'msvcr70.dll', but this
-  will cause problems for users that don't have this library on their system.
-  Therefore it is not recommended. This problem does not occur with MSVC 6.0
-  and earlier.
-
-- Cannot build in a separate directory.
-
-- Build instructions:
-
-   Make sure that the MSVC4.0 or MSVC5.0 or MSVC6.0 or MSVC7.0 utilities
-   ("cl" etc.) are found in PATH. In a typical MSVC6.0 installation, this
-   can be achieved by running
-        C:\Program Files\Microsoft Visual Studio\VC98\bin\vcvars32.bat
-   In a typical MSVC7.0 installation, it can be achieved by running
-        C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\vsvars32.bat
-
-   Decide which compilation model you will use:
-     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-
-   You need GNU libiconv (version 1.9 or newer) installed under c:\usr. If
-   you haven't yet, build and install GNU libiconv (version 1.9 or newer)
-   using the same MFLAGS. Then come back to here, to build GNU gettext.
-
-   For shared library (DLL):
-
-        nmake -f Makefile.msvc DLL=1 MFLAGS=-MD
-
-   For static library:
-
-        nmake -f Makefile.msvc MFLAGS=-MD
-
-   If you want to build both the shared and static library, you have to
-   unpack the gettext sources twice in different directories. Don't mix
-   the two formats; you cannot use the libintl.h generated for the static
-   library together with the shared library or vice versa.
-
-- Installation:
-
-        nmake -f Makefile.msvc DLL=1 MFLAGS=-MD install PREFIX=InstallBaseDirectory
-   or
-        nmake -f Makefile.msvc MFLAGS=-MD install PREFIX=InstallBaseDirectory
+Building requires the mingw development environment (includes gcc).
+MS Visual C/C++ with "nmake" is no longer supported.
diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 2f3da2c..f727de2 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 181a380..b513082 100644
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -219,8 +219,3 @@ dist-html-split:
 	for file in `cd $$d && echo gettext_*.html`; do \
 	  cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	done
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/doc/Makefile.msvc b/gettext-tools/doc/Makefile.msvc
deleted file mode 100644
index 9e0d485..0000000
--- a/gettext-tools/doc/Makefile.msvc
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- Makefile -*- for gettext-tools/doc
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   PREFIX=Some\Directory   Base directory for installation
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-datadir = $(prefix)\share
-docdir = $(datadir)\doc\gettext
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(datadir)\doc
-	-mkdir $(docdir)
-	$(INSTALL_DATA) FAQ.html $(docdir)
-	$(INSTALL_DATA) tutorial.html $(docdir)
-	$(INSTALL_DATA) gettext_*.html $(docdir)
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(datadir)\doc
-	-mkdir $(docdir)
-
-uninstall : force
-	$(RM) $(docdir)\FAQ.html
-	$(RM) $(docdir)\tutorial.html
-	$(RM) $(docdir)\gettext_*.html
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-	$(RM) core
-
-distclean : clean
-	$(RM) Makefile
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 0532083..c3c21b3 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 711d00b..13233db 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -1142,8 +1142,3 @@ distdir1:
 
 # Temporary directories created by po/Makefile.
 CLEANFILES = tmp-hello-*
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/examples/Makefile.msvc b/gettext-tools/examples/Makefile.msvc
deleted file mode 100644
index e75f44a..0000000
--- a/gettext-tools/examples/Makefile.msvc
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Makefile -*- for gettext-tools/projects
-
-#### Start of system configuration section. ####
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all
-
-installdirs :
-
-uninstall :
-
-check :
-
-mostlyclean : clean
-
-clean : force
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index a39d231..b108fe8 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index d17e5ab..cdbff63 100644
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -301,8 +301,3 @@ SUFFIXES += .sed .sin
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
 # <<< gnulib module localcharset.
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
deleted file mode 100644
index d1e2505..0000000
--- a/gettext-tools/lib/Makefile.msvc
+++ /dev/null
@@ -1,390 +0,0 @@
-# -*- Makefile -*- for gettext-tools/lib
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
-#             Note that this works only with MFLAGS=-MD.
-#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
-#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-#   DEBUG=1   for compiling with debugging information
-#   PREFIX=Some\Directory   Base directory for installation
-!if !defined(DLL)
-DLL=0
-!endif
-!if !defined(DEBUG)
-DEBUG=0
-!endif
-!if !defined(MFLAGS)
-!if !$(DLL)
-MFLAGS=
-!else
-MFLAGS=-MD
-!endif
-!endif
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)\bin
-libdir = $(exec_prefix)\lib
-includedir = $(prefix)\include
-pkgdatadir = $(datadir)\gettext
-IIpkgdatadir = $(IIdatadir)\\gettext
-
-# Programs used by "make":
-
-CC = cl
-
-# Set to -W3 if you want to see maximum amount of warnings, including stupid
-# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
-WARN_CFLAGS = -W1
-
-!if !$(DLL)
-PICFLAGS =
-!else
-# "-GD" (msvc5) optimizes for DLL.
-# mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
-!endif
-
-!if $(DEBUG)
-OPTIMFLAGS = -Od -Z7
-DEBUGFLAGS = -Z7
-!else
-# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
-OPTIMFLAGS = -D_NDEBUG -O1
-DEBUGFLAGS =
-!endif
-
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DPKGDATADIR=\"$(IIpkgdatadir)\" -DEXEEXT=\".exe\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1
-
-INCLUDES = -I. -I.. -I..\intl -I..\windows -I$(includedir)
-
-AR = lib
-AR_FLAGS = /out:
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-OBJECTS = \
-  allocsa.obj \
-  argmatch.obj \
-  backupfile.obj addext.obj \
-  basename.obj \
-  c-ctype.obj \
-  c-strcasecmp.obj \
-  c-strncasecmp.obj \
-  classpath.obj \
-  clean-temp.obj \
-  closeout.obj \
-  copy-file.obj \
-  csharpcomp.obj \
-  csharpexec.obj \
-  error-progname.obj \
-  execute.obj \
-  exitfail.obj \
-  fatal-signal.obj \
-  findprog.obj \
-  fstrcmp.obj \
-  full-write.obj \
-  fwriteerror.obj \
-  gcd.obj \
-  hash.obj \
-  iconvstring.obj \
-  javacomp.obj \
-  javaexec.obj \
-  javaversion.obj \
-  linebreak.obj \
-  mbswidth.obj \
-  obstack.obj \
-  concatpath.obj \
-  pipe.obj \
-  progname.obj progreloc.obj \
-  propername.obj \
-  quote.obj \
-  quotearg.obj \
-  safe-read.obj \
-  safe-write.obj \
-  sh-quote.obj \
-  tmpdir.obj \
-  wait-process.obj \
-  xmalloc.obj xstrdup.obj \
-  xallocsa.obj \
-  xerror.obj \
-  xsetenv.obj \
-  xvasprintf.obj xasprintf.obj \
-  \
-  error.obj \
-  fnmatch.obj \
-  getline.obj \
-  getndelim2.obj \
-  getopt.obj getopt1.obj \
-  mkdtemp.obj \
-  relocatable.obj \
-  setenv.obj unsetenv.obj \
-  stpcpy.obj \
-  stpncpy.obj \
-  vasprintf.obj
-
-RESOURCES = gettextlib.res
-
-all : gettextlib.lib
-
-allocsa.obj : allocsa.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c allocsa.c
-
-argmatch.obj : argmatch.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c argmatch.c
-
-backupfile.obj : backupfile.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c backupfile.c
-
-addext.obj : addext.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c addext.c
-
-basename.obj : basename.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c basename.c
-
-c-ctype.obj : c-ctype.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c c-ctype.c
-
-c-strcasecmp.obj : c-strcasecmp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c c-strcasecmp.c
-
-c-strncasecmp.obj : c-strncasecmp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c c-strncasecmp.c
-
-classpath.obj : classpath.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c classpath.c
-
-clean-temp.obj : clean-temp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c clean-temp.c
-
-closeout.obj : closeout.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c closeout.c
-
-copy-file.obj : copy-file.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c copy-file.c
-
-csharpcomp.obj : csharpcomp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c csharpcomp.c
-
-csharpexec.obj : csharpexec.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c csharpexec.c
-
-error-progname.obj : error-progname.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c error-progname.c
-
-execute.obj : execute.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c execute.c
-
-exitfail.obj : exitfail.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c exitfail.c
-
-fatal-signal.obj : fatal-signal.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fatal-signal.c
-
-findprog.obj : findprog.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c findprog.c
-
-fstrcmp.obj : fstrcmp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fstrcmp.c
-
-full-write.obj : full-write.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c full-write.c
-
-fwriteerror.obj : fwriteerror.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fwriteerror.c
-
-gcd.obj : gcd.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c gcd.c
-
-hash.obj : hash.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c hash.c
-
-iconvstring.obj : iconvstring.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c iconvstring.c
-
-javacomp.obj : javacomp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c javacomp.c
-
-javaexec.obj : javaexec.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c javaexec.c
-
-javaversion.obj : javaversion.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c javaversion.c
-
-linebreak.obj : linebreak.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c linebreak.c
-
-mbswidth.obj : mbswidth.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c mbswidth.c
-
-obstack.obj : obstack.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c obstack.c
-
-concatpath.obj : concatpath.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c concatpath.c
-
-pipe.obj : pipe.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c pipe.c
-
-progname.obj : progname.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c progname.c
-
-progreloc.obj : progreloc.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c progreloc.c
-
-propername.obj : propername.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c propername.c
-
-quote.obj : quote.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c quote.c
-
-quotearg.obj : quotearg.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c quotearg.c
-
-safe-read.obj : safe-read.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c safe-read.c
-
-safe-write.obj : safe-write.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c safe-write.c
-
-sh-quote.obj : sh-quote.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c sh-quote.c
-
-tmpdir.obj : tmpdir.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c tmpdir.c
-
-wait-process.obj : wait-process.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c wait-process.c
-
-xmalloc.obj : xmalloc.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xmalloc.c
-
-xstrdup.obj : xstrdup.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xstrdup.c
-
-xallocsa.obj : xallocsa.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xallocsa.c
-
-xerror.obj : xerror.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xerror.c
-
-xsetenv.obj : xsetenv.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xsetenv.c
-
-xvasprintf.obj : xvasprintf.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xvasprintf.c
-
-xasprintf.obj : xasprintf.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xasprintf.c
-
-error.obj : error.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c error.c
-
-fnmatch.obj : fnmatch.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fnmatch.c
-
-getline.obj : getline.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c getline.c
-
-getndelim2.obj : getndelim2.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c getndelim2.c
-
-getopt.obj : getopt.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c getopt.c
-
-getopt1.obj : getopt1.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c getopt1.c
-
-mkdtemp.obj : mkdtemp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c mkdtemp.c
-
-relocatable.obj : relocatable.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c relocatable.c
-
-setenv.obj : setenv.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c setenv.c
-
-unsetenv.obj : unsetenv.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c unsetenv.c
-
-stpcpy.obj : stpcpy.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c stpcpy.c
-
-stpncpy.obj : stpncpy.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c stpncpy.c
-
-vasprintf.obj : vasprintf.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c vasprintf.c
-
-!if !$(DLL)
-
-gettextlib.lib : $(OBJECTS)
-	-$(RM) gettextlib.lib
-	$(AR) $(AR_FLAGS)gettextlib.lib $(OBJECTS)
-
-!else
-
-# gettextlib.dll and gettextlib.lib are created together.
-gettextlib.lib : ..\windows\gettextlib.def $(OBJECTS) $(RESOURCES)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextlib.def $(OBJECTS) ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextlib.dll
-
-gettextlib.res : ../windows/gettextlib.rc
-	rc -Fo gettextlib.res ../windows/gettextlib.rc
-
-!endif
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(exec_prefix)
-!if $(DLL)
-	-mkdir $(bindir)
-	$(INSTALL_DATA) gettextlib.dll $(bindir)\gettextlib.dll
-!endif
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(exec_prefix)
-!if $(DLL)
-	-mkdir $(bindir)
-!endif
-
-uninstall : force
-!if $(DLL)
-	$(RM) $(bindir)\gettextlib.dll
-!endif
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-	$(RM) *.obj
-	$(RM) *.lib
-	$(RM) *.exp
-	$(RM) *.dll
-	$(RM) gettextlib.res
-	$(RM) core
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index b867a7f..4c1870e 100644
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/libgrep/Makefile.am b/gettext-tools/libgrep/Makefile.am
index 7ae854a..b5a8b75 100644
--- a/gettext-tools/libgrep/Makefile.am
+++ b/gettext-tools/libgrep/Makefile.am
@@ -48,8 +48,3 @@ libgrep_a_DEPENDENCIES = @LIBGREPOBJS@
 EXTRA_DIST += $(LIBADD_SOURCE)
 
 AM_CPPFLAGS = -I.. -I../lib -I$(top_srcdir)/lib -I../intl
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/libgrep/Makefile.msvc b/gettext-tools/libgrep/Makefile.msvc
deleted file mode 100644
index 2398ef9..0000000
--- a/gettext-tools/libgrep/Makefile.msvc
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- Makefile -*- for gettext-tools/libgrep
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
-#             Note that this works only with MFLAGS=-MD.
-#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
-#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-#   DEBUG=1   for compiling with debugging information
-!if !defined(DLL)
-DLL=0
-!endif
-!if !defined(DEBUG)
-DEBUG=0
-!endif
-!if !defined(MFLAGS)
-!if !$(DLL)
-MFLAGS=
-!else
-MFLAGS=-MD
-!endif
-!endif
-
-# Programs used by "make":
-
-CC = cl
-
-# Set to -W3 if you want to see maximum amount of warnings, including stupid
-# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
-WARN_CFLAGS = -W1
-
-!if !$(DLL)
-PICFLAGS =
-!else
-# "-GD" (msvc5) optimizes for DLL.
-# mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
-!endif
-
-!if $(DEBUG)
-OPTIMFLAGS = -Od -Z7
-!else
-# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
-OPTIMFLAGS = -D_NDEBUG -O1
-!endif
-
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H
-
-INCLUDES = -I. -I.. -I..\lib -I..\intl -I..\windows
-
-AR = lib
-AR_FLAGS = /out:
-
-LN = copy
-RM = -del
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-OBJECTS = \
-  kwset.obj \
-  dfa.obj \
-  m-common.obj \
-  m-fgrep.obj \
-  m-regex.obj \
-  hard-locale.obj \
-  regex.obj
-
-all : grep.lib
-
-kwset.obj : kwset.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c kwset.c
-
-dfa.obj : dfa.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c dfa.c
-
-m-common.obj : m-common.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c m-common.c
-
-m-fgrep.obj : m-fgrep.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c m-fgrep.c
-
-m-regex.obj : m-regex.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c m-regex.c
-
-hard-locale.obj : hard-locale.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c hard-locale.c
-
-regex.obj : regex.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c regex.c
-
-grep.lib : $(OBJECTS)
-	-$(RM) grep.lib
-	$(AR) $(AR_FLAGS)grep.lib $(OBJECTS)
-
-install : all
-
-installdirs :
-
-uninstall :
-
-check :
-
-mostlyclean : clean
-
-clean : force
-	$(RM) *.obj
-	$(RM) *.lib
-	$(RM) core
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog
index 8c2952c..4a0b971 100644
--- a/gettext-tools/libuniname/ChangeLog
+++ b/gettext-tools/libuniname/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/libuniname/Makefile.am b/gettext-tools/libuniname/Makefile.am
index 6af72cb..9b0a589 100644
--- a/gettext-tools/libuniname/Makefile.am
+++ b/gettext-tools/libuniname/Makefile.am
@@ -39,8 +39,3 @@ noinst_PROGRAMS = test-names
 test_names_LDADD = libuniname.a ../lib/libgettextlib.la @INTL_MACOSX_LIBS@
 
 EXTRA_DIST += $(TESTS) UnicodeDataNames.txt
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/libuniname/Makefile.msvc b/gettext-tools/libuniname/Makefile.msvc
deleted file mode 100644
index 173eeb9..0000000
--- a/gettext-tools/libuniname/Makefile.msvc
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- Makefile -*- for gettext-tools/libuniname
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
-#             Note that this works only with MFLAGS=-MD.
-#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
-#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-#   DEBUG=1   for compiling with debugging information
-!if !defined(DLL)
-DLL=0
-!endif
-!if !defined(DEBUG)
-DEBUG=0
-!endif
-!if !defined(MFLAGS)
-!if !$(DLL)
-MFLAGS=
-!else
-MFLAGS=-MD
-!endif
-!endif
-
-# Programs used by "make":
-
-CC = cl
-
-# Set to -W3 if you want to see maximum amount of warnings, including stupid
-# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
-WARN_CFLAGS = -W1
-
-!if !$(DLL)
-PICFLAGS =
-!else
-# "-GD" (msvc5) optimizes for DLL.
-# mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
-!endif
-
-!if $(DEBUG)
-OPTIMFLAGS = -Od -Z7
-!else
-# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
-OPTIMFLAGS = -D_NDEBUG -O1
-!endif
-
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H
-
-INCLUDES = -I.. -I..\lib -I..\windows
-
-AR = lib
-AR_FLAGS = /out:
-
-LN = copy
-RM = -del
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-OBJECTS = uniname.obj
-
-all : uniname.lib
-
-uniname.obj : uniname.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c uniname.c
-
-uniname.lib : $(OBJECTS)
-	-$(RM) uniname.lib
-	$(AR) $(AR_FLAGS)uniname.lib $(OBJECTS)
-
-install : all
-
-installdirs :
-
-uninstall :
-
-check :
-
-mostlyclean : clean
-
-clean : force
-	$(RM) *.obj
-	$(RM) *.lib
-	$(RM) core
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index a181f09..bed0536 100644
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index 5f8e2e5..c527729 100644
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -193,8 +193,3 @@ uninstall-html:
 	for file in $(man_HTML); do \
 	  $(RM) $(DESTDIR)$(htmldir)/$$file; \
 	done
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/man/Makefile.msvc b/gettext-tools/man/Makefile.msvc
deleted file mode 100644
index de0120a..0000000
--- a/gettext-tools/man/Makefile.msvc
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- Makefile -*- for gettext-tools/man
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   PREFIX=Some\Directory   Base directory for installation
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-datadir = $(prefix)\share
-mandir = $(datadir)\man
-man1dir = $(mandir)\man1
-docdir = $(datadir)\doc\gettext
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(mandir)
-	-mkdir $(man1dir)
-	$(INSTALL_DATA) msgcmp.1 $(man1dir)\msgcmp.1
-	$(INSTALL_DATA) msgfmt.1 $(man1dir)\msgfmt.1
-	$(INSTALL_DATA) msgmerge.1 $(man1dir)\msgmerge.1
-	$(INSTALL_DATA) msgunfmt.1 $(man1dir)\msgunfmt.1
-	$(INSTALL_DATA) xgettext.1 $(man1dir)\xgettext.1
-	$(INSTALL_DATA) msgattrib.1 $(man1dir)\msgattrib.1
-	$(INSTALL_DATA) msgcat.1 $(man1dir)\msgcat.1
-	$(INSTALL_DATA) msgcomm.1 $(man1dir)\msgcomm.1
-	$(INSTALL_DATA) msgconv.1 $(man1dir)\msgconv.1
-	$(INSTALL_DATA) msgen.1 $(man1dir)\msgen.1
-	$(INSTALL_DATA) msgexec.1 $(man1dir)\msgexec.1
-	$(INSTALL_DATA) msgfilter.1 $(man1dir)\msgfilter.1
-	$(INSTALL_DATA) msggrep.1 $(man1dir)\msggrep.1
-	$(INSTALL_DATA) msginit.1 $(man1dir)\msginit.1
-	$(INSTALL_DATA) msguniq.1 $(man1dir)\msguniq.1
-	-mkdir $(datadir)\doc
-	-mkdir $(docdir)
-	$(INSTALL_DATA) msgcmp.1.html $(docdir)\msgcmp.1.html
-	$(INSTALL_DATA) msgfmt.1.html $(docdir)\msgfmt.1.html
-	$(INSTALL_DATA) msgmerge.1.html $(docdir)\msgmerge.1.html
-	$(INSTALL_DATA) msgunfmt.1.html $(docdir)\msgunfmt.1.html
-	$(INSTALL_DATA) xgettext.1.html $(docdir)\xgettext.1.html
-	$(INSTALL_DATA) msgattrib.1.html $(docdir)\msgattrib.1.html
-	$(INSTALL_DATA) msgcat.1.html $(docdir)\msgcat.1.html
-	$(INSTALL_DATA) msgcomm.1.html $(docdir)\msgcomm.1.html
-	$(INSTALL_DATA) msgconv.1.html $(docdir)\msgconv.1.html
-	$(INSTALL_DATA) msgen.1.html $(docdir)\msgen.1.html
-	$(INSTALL_DATA) msgexec.1.html $(docdir)\msgexec.1.html
-	$(INSTALL_DATA) msgfilter.1.html $(docdir)\msgfilter.1.html
-	$(INSTALL_DATA) msggrep.1.html $(docdir)\msggrep.1.html
-	$(INSTALL_DATA) msginit.1.html $(docdir)\msginit.1.html
-	$(INSTALL_DATA) msguniq.1.html $(docdir)\msguniq.1.html
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(mandir)
-	-mkdir $(man1dir)
-	-mkdir $(datadir)\doc
-	-mkdir $(docdir)
-
-uninstall : force
-	$(RM) $(man1dir)\msgcmp.1
-	$(RM) $(man1dir)\msgfmt.1
-	$(RM) $(man1dir)\msgmerge.1
-	$(RM) $(man1dir)\msgunfmt.1
-	$(RM) $(man1dir)\xgettext.1
-	$(RM) $(man1dir)\msgattrib.1
-	$(RM) $(man1dir)\msgcat.1
-	$(RM) $(man1dir)\msgcomm.1
-	$(RM) $(man1dir)\msgconv.1
-	$(RM) $(man1dir)\msgen.1
-	$(RM) $(man1dir)\msgexec.1
-	$(RM) $(man1dir)\msgfilter.1
-	$(RM) $(man1dir)\msggrep.1
-	$(RM) $(man1dir)\msginit.1
-	$(RM) $(man1dir)\msguniq.1
-	$(RM) $(docdir)\msgcmp.1.html
-	$(RM) $(docdir)\msgfmt.1.html
-	$(RM) $(docdir)\msgmerge.1.html
-	$(RM) $(docdir)\msgunfmt.1.html
-	$(RM) $(docdir)\xgettext.1.html
-	$(RM) $(docdir)\msgattrib.1.html
-	$(RM) $(docdir)\msgcat.1.html
-	$(RM) $(docdir)\msgcomm.1.html
-	$(RM) $(docdir)\msgconv.1.html
-	$(RM) $(docdir)\msgen.1.html
-	$(RM) $(docdir)\msgexec.1.html
-	$(RM) $(docdir)\msgfilter.1.html
-	$(RM) $(docdir)\msggrep.1.html
-	$(RM) $(docdir)\msginit.1.html
-	$(RM) $(docdir)\msguniq.1.html
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-	$(RM) core
-
-distclean : clean
-	$(RM) Makefile
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index d40e282..731cf5d 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
index 2a075c7..f41952b 100644
--- a/gettext-tools/misc/Makefile.am
+++ b/gettext-tools/misc/Makefile.am
@@ -44,8 +44,3 @@ archive.tar.gz:
 lisp_LISP = start-po.el po-mode.el po-compat.el
 
 EXTRA_DIST += $(lisp_LISP)
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/misc/Makefile.msvc b/gettext-tools/misc/Makefile.msvc
deleted file mode 100644
index 3286fe2..0000000
--- a/gettext-tools/misc/Makefile.msvc
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- Makefile -*- for gettext-tools/misc
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   PREFIX=Some\Directory   Base directory for installation
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-exec_prefix = $(prefix)
-datadir = $(prefix)\share
-emacsdir = $(datadir)\emacs
-lispdir = $(emacsdir)\site-lisp
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(emacsdir)
-	-mkdir $(lispdir)
-	$(INSTALL_DATA) po-mode.el $(lispdir)\po-mode.el
-	$(INSTALL_DATA) po-compat.el $(lispdir)\po-compat.el
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(emacsdir)
-	-mkdir $(lispdir)
-
-uninstall : force
-	$(RM) $(lispdir)\po-mode.el
-	$(RM) $(lispdir)\po-compat.el
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-	$(RM) core
-
-distclean : clean
-	$(RM) Makefile
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index df0d085..edfc6d4 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Rules-msvc: Remove file.
+	* Makefile.msvc.sh: Remove file.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Rules-vms: Remove file.
 	* Makefile.vms.sh: Remove file.
 
diff --git a/gettext-tools/po/Makefile.msvc.sh b/gettext-tools/po/Makefile.msvc.sh
deleted file mode 100755
index 0e17054..0000000
--- a/gettext-tools/po/Makefile.msvc.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-# Creates Makefile.msvc.
-domain=$1
-catalogs=$2
-
-cat <<\EOF
-# -*- Makefile -*- for po subdirectory
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   PREFIX=Some\Directory   Base directory for installation
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-
-# Directories used by "make":
-srcdir = .
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-datadir = $(prefix)\share
-localedir = $(datadir)\locale
-
-# Programs used by "make":
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(localedir)
-EOF
-for cat in $catalogs; do
-  cat=`basename $cat`
-  lang=`echo $cat | sed -e 's/\.gmo$//'`
-cat <<EOF
-	-mkdir \$(localedir)\\${lang}
-	-mkdir \$(localedir)\\${lang}\\LC_MESSAGES
-	\$(INSTALL_DATA) ${lang}.gmo \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
-EOF
-done
-cat <<\EOF
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(datadir)
-	-mkdir $(localedir)
-EOF
-for cat in $catalogs; do
-  cat=`basename $cat`
-  lang=`echo $cat | sed -e 's/\.gmo$//'`
-cat <<EOF
-	-mkdir \$(localedir)\\${lang}
-	-mkdir \$(localedir)\\${lang}\\LC_MESSAGES
-EOF
-done
-cat <<\EOF
-
-uninstall : force
-EOF
-for cat in $catalogs; do
-  cat=`basename $cat`
-  lang=`echo $cat | sed -e 's/\.gmo$//'`
-cat <<EOF
-	\$(RM) \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
-EOF
-done
-cat <<\EOF
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
-EOF
diff --git a/gettext-tools/po/Rules-msvc b/gettext-tools/po/Rules-msvc
deleted file mode 100644
index c91788b..0000000
--- a/gettext-tools/po/Rules-msvc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Special Makefile rules for generating a Makefile.msvc.
-
-DISTFILES.extra1 = Rules-msvc Makefile.msvc.sh Makefile.msvc
-
-dist distdir: $(srcdir)/Makefile.msvc
-
-# Makefile.msvc needs to be redone when LINGUAS has changed. When rebuilding
-# it, ensure that we use the updated value of CATALOGS.
-$(srcdir)/Makefile.msvc: $(srcdir)/Makefile.msvc.sh LINGUAS
-	$(MAKE) Makefile
-	$(MAKE) -f Makefile Makefile.msvc-update
-
-Makefile.msvc-update:
-	$(SHELL) $(srcdir)/Makefile.msvc.sh $(DOMAIN) '$(GMOFILES)' > $(srcdir)/Makefile.msvc
diff --git a/gettext-tools/projects/ChangeLog b/gettext-tools/projects/ChangeLog
index 10f80f4..d115bb0 100644
--- a/gettext-tools/projects/ChangeLog
+++ b/gettext-tools/projects/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/projects/Makefile.am b/gettext-tools/projects/Makefile.am
index eb18b68..2bf503a 100644
--- a/gettext-tools/projects/Makefile.am
+++ b/gettext-tools/projects/Makefile.am
@@ -67,8 +67,3 @@ uninstall-local:
 	  echo "$(RM) $(DESTDIR)$(projectsdir)/$$f"; \
 	  $(RM) $(DESTDIR)$(projectsdir)/$$f; \
 	done
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/projects/Makefile.msvc b/gettext-tools/projects/Makefile.msvc
deleted file mode 100644
index e75f44a..0000000
--- a/gettext-tools/projects/Makefile.msvc
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Makefile -*- for gettext-tools/projects
-
-#### Start of system configuration section. ####
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all
-
-installdirs :
-
-uninstall :
-
-check :
-
-mostlyclean : clean
-
-clean : force
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6d4e51e..5547476 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 3ad160b..c70bcf2 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -485,8 +485,3 @@ RELOCATABLE_SRC_DIR = $(top_srcdir)/lib
 RELOCATABLE_BUILD_DIR = ../lib
 RELOCATABLE_CONFIG_H_DIR = ..
 @SET_RELOCATABLE@
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc
deleted file mode 100644
index 5043d2c..0000000
--- a/gettext-tools/src/Makefile.msvc
+++ /dev/null
@@ -1,648 +0,0 @@
-# -*- Makefile -*- for gettext-tools/src
-
-#### Start of system configuration section. ####
-
-# Flags that can be set on the nmake command line:
-#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
-#             Note that this works only with MFLAGS=-MD.
-#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
-#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
-#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
-#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
-#   DEBUG=1   for compiling with debugging information
-#   PREFIX=Some\Directory       Base directory for installation
-#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
-!if !defined(DLL)
-DLL=0
-!endif
-!if !defined(DEBUG)
-DEBUG=0
-!endif
-!if !defined(MFLAGS)
-!if !$(DLL)
-MFLAGS=
-!else
-MFLAGS=-MD
-!endif
-!endif
-!if !defined(PREFIX)
-PREFIX = c:\usr
-!endif
-!if !defined(IIPREFIX)
-IIPREFIX = c:\\usr
-!endif
-
-# Directories used by "make install":
-prefix = $(PREFIX)
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)\bin
-libdir = $(exec_prefix)\lib
-includedir = $(prefix)\include
-datadir = $(prefix)\share
-localedir = $(datadir)\locale
-aliaspath =
-jardir = $(datadir)\gettext
-pkgdatadir = $(datadir)\gettext
-projectsdir = $(pkgdatadir)\projects
-IIprefix = $(IIPREFIX)
-IIexec_prefix = $(IIprefix)
-IIbindir = $(IIexec_prefix)\\bin
-IIlibdir = $(IIexec_prefix)\\lib
-IIincludedir = $(IIprefix)\\include
-IIdatadir = $(IIprefix)\\share
-IIlocaledir = $(IIdatadir)\\locale
-IIaliaspath =
-IIjardir = $(IIdatadir)\\gettext
-IIpkgdatadir = $(IIdatadir)\\gettext
-IIprojectsdir = $(IIpkgdatadir)\\projects
-
-# Programs used by "make":
-
-CC = cl
-
-# Set to -W3 if you want to see maximum amount of warnings, including stupid
-# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
-WARN_CFLAGS = -W1
-
-!if !$(DLL)
-PICFLAGS =
-!else
-# "-GD" (msvc5) optimizes for DLL.
-# mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
-!endif
-
-!if $(DEBUG)
-OPTIMFLAGS = -Od -Z7
-DEBUGFLAGS = -Z7
-!else
-# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
-OPTIMFLAGS = -D_NDEBUG -O1
-DEBUGFLAGS =
-!endif
-
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -DGETTEXTJAR=\"$(IIjardir)\\gettext.jar\" -DLIBDIR=\"$(IIlibdir)\" -DGETTEXTDATADIR=\"$(IIpkgdatadir)\" -DPROJECTSDIR=\"$(IIprojectsdir)\"
-
-INCLUDES = -I. -I.. -I..\libgrep -I..\libuniname -I..\lib -I..\intl -I..\..\gettext-runtime\intl -I..\windows -I$(includedir)
-
-AR = lib
-AR_FLAGS = /out:
-
-LN = copy
-RM = -del
-
-# Programs used by "make install":
-INSTALL = copy
-INSTALL_PROGRAM = copy
-INSTALL_DATA = copy
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-PROGRAMS = \
-msgcmp.exe msgfmt.exe msgmerge.exe msgunfmt.exe xgettext.exe \
-msgattrib.exe msgcat.exe msgcomm.exe msgconv.exe msgen.exe msgexec.exe msgfilter.exe msggrep.exe msginit.exe msguniq.exe \
-recode-sr-latin.exe
-
-OBJECTS = \
-  message.obj \
-  po-error.obj \
-  read-po-abstract.obj \
-  po-lex.obj \
-  po-gram-gen.obj \
-  po-charset.obj \
-  read-properties.obj \
-  read-stringtable.obj \
-  open-po.obj \
-  dir-list.obj \
-  str-list.obj \
-  read-po.obj \
-  write-properties.obj \
-  write-stringtable.obj \
-  write-po.obj \
-  msgl-ascii.obj \
-  msgl-iconv.obj \
-  msgl-equal.obj \
-  msgl-cat.obj \
-  msgl-english.obj \
-  file-list.obj \
-  msgl-charset.obj \
-  po-time.obj \
-  plural.obj \
-  plural-table.obj \
-  format.obj \
-  format-c.obj \
-  format-sh.obj \
-  format-python.obj \
-  format-lisp.obj \
-  format-elisp.obj \
-  format-librep.obj \
-  format-scheme.obj \
-  format-java.obj \
-  format-csharp.obj \
-  format-awk.obj \
-  format-pascal.obj \
-  format-ycp.obj \
-  format-tcl.obj \
-  format-perl.obj \
-  format-perl-brace.obj \
-  format-php.obj \
-  format-gcc-internal.obj \
-  format-qt.obj \
-  format-boost.obj
-
-msgcmp_OBJECTS = msgcmp.obj
-msgfmt_OBJECTS = msgfmt.obj write-mo.obj write-java.obj write-csharp.obj write-resources.obj write-tcl.obj write-qt.obj plural-eval.obj hash-string.obj
-msgmerge_OBJECTS = msgmerge.obj msgl-fsearch.obj plural-count.obj
-msgunfmt_OBJECTS = msgunfmt.obj read-mo.obj read-java.obj read-csharp.obj read-resources.obj read-tcl.obj
-xgettext_OBJECTS = xgettext.obj x-c.obj x-po.obj x-sh.obj x-python.obj x-lisp.obj x-elisp.obj x-librep.obj x-scheme.obj x-smalltalk.obj x-java.obj x-csharp.obj x-awk.obj x-ycp.obj x-tcl.obj x-perl.obj x-php.obj x-rst.obj x-glade.obj
-msgattrib_OBJECTS = msgattrib.obj
-msgcat_OBJECTS = msgcat.obj
-msgcomm_OBJECTS = msgcomm.obj
-msgconv_OBJECTS = msgconv.obj
-msgen_OBJECTS = msgen.obj
-msgexec_OBJECTS = msgexec.obj
-msgfilter_OBJECTS = msgfilter.obj filter-sr-latin.obj
-msggrep_OBJECTS = msggrep.obj
-msginit_OBJECTS = msginit.obj lang-table.obj plural-count.obj localealias.obj
-msguniq_OBJECTS = msguniq.obj
-recode_sr_latin_OBJECTS = recode-sr-latin.obj filter-sr-latin.obj
-LDADD =
-
-RESOURCES = gettextsrc.res
-
-all : gettextsrc.lib $(PROGRAMS) gettextpo.lib
-
-# Compilation rules for $(OBJECTS), with $(PICFLAGS).
-
-message.obj : message.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c message.c
-
-po-error.obj : po-error.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c -Tp po-error.c
-
-read-po-abstract.obj : read-po-abstract.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c read-po-abstract.c
-
-po-lex.obj : po-lex.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c po-lex.c
-
-po-gram-gen.obj : po-gram-gen.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c po-gram-gen.c
-
-po-charset.obj : po-charset.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c po-charset.c
-
-read-properties.obj : read-properties.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c read-properties.c
-
-read-stringtable.obj : read-stringtable.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c read-stringtable.c
-
-open-po.obj : open-po.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c open-po.c
-
-dir-list.obj : dir-list.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c dir-list.c
-
-str-list.obj : str-list.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c str-list.c
-
-read-po.obj : read-po.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c read-po.c
-
-write-properties.obj : write-properties.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c write-properties.c
-
-write-stringtable.obj : write-stringtable.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c write-stringtable.c
-
-write-po.obj : write-po.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c write-po.c
-
-msgl-ascii.obj : msgl-ascii.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-ascii.c
-
-msgl-iconv.obj : msgl-iconv.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-iconv.c
-
-msgl-equal.obj : msgl-equal.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-equal.c
-
-msgl-cat.obj : msgl-cat.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-cat.c
-
-msgl-english.obj : msgl-english.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-english.c
-
-file-list.obj : file-list.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c file-list.c
-
-msgl-charset.obj : msgl-charset.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c msgl-charset.c
-
-po-time.obj : po-time.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c po-time.c
-
-plural.obj : plural.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c plural.c
-
-plural-table.obj : plural-table.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c plural-table.c
-
-format.obj : format.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c -Tp format.c
-
-format-c.obj : format-c.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-c.c
-
-format-sh.obj : format-sh.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-sh.c
-
-format-python.obj : format-python.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-python.c
-
-format-lisp.obj : format-lisp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-lisp.c
-
-format-elisp.obj : format-elisp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-elisp.c
-
-format-librep.obj : format-librep.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-librep.c
-
-format-scheme.obj : format-scheme.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-scheme.c
-
-format-java.obj : format-java.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-java.c
-
-format-csharp.obj : format-csharp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-csharp.c
-
-format-awk.obj : format-awk.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-awk.c
-
-format-pascal.obj : format-pascal.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-pascal.c
-
-format-ycp.obj : format-ycp.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-ycp.c
-
-format-tcl.obj : format-tcl.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-tcl.c
-
-format-perl.obj : format-perl.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-perl.c
-
-format-perl-brace.obj : format-perl-brace.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-perl-brace.c
-
-format-php.obj : format-php.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-php.c
-
-format-gcc-internal.obj : format-gcc-internal.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-gcc-internal.c
-
-format-qt.obj : format-qt.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-qt.c
-
-format-boost.obj : format-boost.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-boost.c
-
-!if !$(DLL)
-
-gettextsrc.lib : $(OBJECTS)
-	-$(RM) gettextsrc.lib
-	$(AR) $(AR_FLAGS)gettextsrc.lib $(OBJECTS)
-
-!else
-
-# gettextsrc.dll and gettextsrc.lib are created together.
-gettextsrc.lib : ..\windows\gettextsrc.def $(OBJECTS) $(RESOURCES)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextsrc.def $(OBJECTS) ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextsrc.dll
-
-gettextsrc.res : ../windows/gettextsrc.rc
-	rc -Fo gettextsrc.res ../windows/gettextsrc.rc
-
-!endif
-
-# Compilation rules for $(program_OBJECTS), without $(PICFLAGS).
-
-msgcmp.obj : msgcmp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgcmp.c
-
-msgfmt.obj : msgfmt.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgfmt.c
-
-write-mo.obj : write-mo.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-mo.c
-
-write-java.obj : write-java.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-java.c
-
-write-csharp.obj : write-csharp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-csharp.c
-
-write-resources.obj : write-resources.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-resources.c
-
-write-tcl.obj : write-tcl.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-tcl.c
-
-write-qt.obj : write-qt.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c write-qt.c
-
-plural-eval.obj : plural-eval.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c plural-eval.c
-
-hash-string.obj : ..\..\gettext-runtime\intl\hash-string.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-runtime\intl\hash-string.c
-
-msgmerge.obj : msgmerge.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgmerge.c
-
-msgl-fsearch.obj : msgl-fsearch.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c msgl-fsearch.c
-
-plural-count.obj : plural-count.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c plural-count.c
-
-msgunfmt.obj : msgunfmt.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgunfmt.c
-
-read-mo.obj : read-mo.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c read-mo.c
-
-read-java.obj : read-java.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c read-java.c
-
-read-csharp.obj : read-csharp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c read-csharp.c
-
-read-resources.obj : read-resources.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c read-resources.c
-
-read-tcl.obj : read-tcl.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c read-tcl.c
-
-xgettext.obj : xgettext.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp xgettext.c
-
-x-c.obj : x-c.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-c.c
-
-x-po.obj : x-po.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-po.c
-
-x-sh.obj : x-sh.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-sh.c
-
-x-python.obj : x-python.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-python.c
-
-x-lisp.obj : x-lisp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-lisp.c
-
-x-elisp.obj : x-elisp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-elisp.c
-
-x-librep.obj : x-librep.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-librep.c
-
-x-scheme.obj : x-scheme.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-scheme.c
-
-x-smalltalk.obj : x-smalltalk.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-smalltalk.c
-
-x-java.obj : x-java.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-java.c
-
-x-csharp.obj : x-csharp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-csharp.c
-
-x-awk.obj : x-awk.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-awk.c
-
-x-ycp.obj : x-ycp.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-ycp.c
-
-x-tcl.obj : x-tcl.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-tcl.c
-
-x-perl.obj : x-perl.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-perl.c
-
-x-php.obj : x-php.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-php.c
-
-x-rst.obj : x-rst.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-rst.c
-
-x-glade.obj : x-glade.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c x-glade.c
-
-msgattrib.obj : msgattrib.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgattrib.c
-
-msgcat.obj : msgcat.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgcat.c
-
-msgcomm.obj : msgcomm.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgcomm.c
-
-msgconv.obj : msgconv.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgconv.c
-
-msgen.obj : msgen.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgen.c
-
-msgexec.obj : msgexec.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgexec.c
-
-msgfilter.obj : msgfilter.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgfilter.c
-
-msggrep.obj : msggrep.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msggrep.c
-
-msginit.obj : msginit.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msginit.c
-
-lang-table.obj : lang-table.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c lang-table.c
-
-localealias.obj : ..\..\gettext-runtime\intl\localealias.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -c ..\..\gettext-runtime\intl\localealias.c
-
-msguniq.obj : msguniq.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msguniq.c
-
-filter-sr-latin.obj : filter-sr-latin.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c filter-sr-latin.c
-
-recode-sr-latin.obj : recode-sr-latin.c
-	$(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c recode-sr-latin.c
-
-msgcmp.exe : $(msgcmp_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcmp_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcmp.exe
-
-msgfmt.exe : $(msgfmt_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfmt.exe
-
-msgmerge.exe : $(msgmerge_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgmerge_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgmerge.exe
-
-msgunfmt.exe : $(msgunfmt_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgunfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgunfmt.exe
-
-xgettext.exe : $(xgettext_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(xgettext_OBJECTS) ..\libuniname\uniname.lib gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fexgettext.exe
-
-msgattrib.exe : $(msgattrib_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgattrib_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgattrib.exe
-
-msgcat.exe : $(msgcat_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcat_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcat.exe
-
-msgcomm.exe : $(msgcomm_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcomm_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcomm.exe
-
-msgconv.exe : $(msgconv_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgconv_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgconv.exe
-
-msgen.exe : $(msgen_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgen_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgen.exe
-
-msgexec.exe : $(msgexec_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgexec_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgexec.exe
-
-msgfilter.exe : $(msgfilter_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgfilter_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfilter.exe
-
-msggrep.exe : $(msggrep_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msggrep_OBJECTS) ..\libgrep\grep.lib gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsggrep.exe
-
-msginit.exe : $(msginit_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msginit_OBJECTS) ..\intl\localename.obj gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsginit.exe
-
-msguniq.exe : $(msguniq_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(msguniq_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsguniq.exe
-
-recode-sr-latin.exe : $(recode_sr_latin_OBJECTS)
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) $(recode_sr_latin_OBJECTS) ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Ferecode-sr-latin.exe
-
-# Compilation rules for gettextpo.lib objects, with $(PICFLAGS).
-
-gettext-po.obj : gettext-po.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c gettext-po.c
-
-!if !$(DLL)
-
-gettextpo.lib : gettext-po.obj
-	-$(RM) gettextpo.lib
-	$(AR) $(AR_FLAGS)gettextpo.lib gettext-po.obj
-
-!else
-
-# gettextpo.dll and gettextpo.lib are created together.
-gettextpo.lib : ..\windows\gettextpo.def gettext-po.obj gettextpo.res gettextsrc.lib
-	$(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextpo.def gettext-po.obj gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib gettextpo.res -Fegettextpo.dll
-
-gettextpo.res : ../windows/gettextpo.rc
-	rc -Fo gettextpo.res ../windows/gettextpo.rc
-
-!endif
-
-install : all force
-	-mkdir $(prefix)
-	-mkdir $(exec_prefix)
-!if $(DLL)
-	-mkdir $(bindir)
-	$(INSTALL_DATA) gettextsrc.dll $(bindir)\gettextsrc.dll
-!endif
-	$(INSTALL_PROGRAM) msgcmp.exe $(bindir)\msgcmp.exe
-	$(INSTALL_PROGRAM) msgfmt.exe $(bindir)\msgfmt.exe
-	$(INSTALL_PROGRAM) msgmerge.exe $(bindir)\msgmerge.exe
-	$(INSTALL_PROGRAM) msgunfmt.exe $(bindir)\msgunfmt.exe
-	$(INSTALL_PROGRAM) xgettext.exe $(bindir)\xgettext.exe
-	$(INSTALL_PROGRAM) msgattrib.exe $(bindir)\msgattrib.exe
-	$(INSTALL_PROGRAM) msgcat.exe $(bindir)\msgcat.exe
-	$(INSTALL_PROGRAM) msgcomm.exe $(bindir)\msgcomm.exe
-	$(INSTALL_PROGRAM) msgconv.exe $(bindir)\msgconv.exe
-	$(INSTALL_PROGRAM) msgen.exe $(bindir)\msgen.exe
-	$(INSTALL_PROGRAM) msgexec.exe $(bindir)\msgexec.exe
-	$(INSTALL_PROGRAM) msgfilter.exe $(bindir)\msgfilter.exe
-	$(INSTALL_PROGRAM) msggrep.exe $(bindir)\msggrep.exe
-	$(INSTALL_PROGRAM) msginit.exe $(bindir)\msginit.exe
-	$(INSTALL_PROGRAM) msguniq.exe $(bindir)\msguniq.exe
-	$(INSTALL_PROGRAM) recode-sr-latin.exe $(bindir)\recode-sr-latin.exe
-	-mkdir $(datadir)
-	-mkdir $(pkgdatadir)
-	$(INSTALL_DATA) msgunfmt.tcl $(pkgdatadir)\msgunfmt.tcl
-	-mkdir $(includedir)
-	$(INSTALL_DATA) gettext-po.h $(includedir)\gettext-po.h
-!if $(DLL)
-	$(INSTALL_DATA) gettextpo.dll $(bindir)\gettextpo.dll
-!endif
-	-mkdir $(libdir)
-	$(INSTALL_DATA) gettextpo.lib $(libdir)\gettextpo.lib
-
-installdirs : force
-	-mkdir $(prefix)
-	-mkdir $(exec_prefix)
-!if $(DLL)
-	-mkdir $(bindir)
-!endif
-	-mkdir $(datadir)
-	-mkdir $(pkgdatadir)
-	-mkdir $(includedir)
-	-mkdir $(libdir)
-
-uninstall : force
-!if $(DLL)
-	$(RM) $(bindir)\gettextsrc.dll
-!endif
-	$(RM) $(bindir)\msgcmp.exe
-	$(RM) $(bindir)\msgfmt.exe
-	$(RM) $(bindir)\msgmerge.exe
-	$(RM) $(bindir)\msgunfmt.exe
-	$(RM) $(bindir)\xgettext.exe
-	$(RM) $(bindir)\msgattrib.exe
-	$(RM) $(bindir)\msgcat.exe
-	$(RM) $(bindir)\msgcomm.exe
-	$(RM) $(bindir)\msgconv.exe
-	$(RM) $(bindir)\msgen.exe
-	$(RM) $(bindir)\msgexec.exe
-	$(RM) $(bindir)\msgfilter.exe
-	$(RM) $(bindir)\msggrep.exe
-	$(RM) $(bindir)\msginit.exe
-	$(RM) $(bindir)\msguniq.exe
-	$(RM) $(bindir)\recode-sr-latin.exe
-	$(RM) $(pkgdatadir)\msgunfmt.tcl
-	$(RM) $(includedir)\gettext-po.h
-!if $(DLL)
-	$(RM) $(bindir)\gettextpo.dll
-!endif
-	$(RM) $(libdir)\gettextpo.lib
-
-check : all
-
-mostlyclean : clean
-
-clean : force
-	$(RM) *.obj
-	$(RM) *.lib
-	$(RM) *.exp
-	$(RM) *.dll
-	$(RM) gettextsrc.res
-	$(RM) $(PROGRAMS)
-	$(RM) core
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index c9e2988..220b367 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.msvc: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove Makefile.msvc.
+
+2006-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.vms: Remove file.
 	* Makefile.am (EXTRA_DIST): Remove Makefile.vms.
 
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index ba66749..8322e6c 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -225,8 +225,3 @@ fc5_LDADD = ../lib/libgettextlib.la $(LDADD)
 # Clean up after Solaris cc.
 clean-local:
 	rm -rf SunWS_cache
-
-
-# Woe32 support.
-
-EXTRA_DIST += Makefile.msvc
diff --git a/gettext-tools/tests/Makefile.msvc b/gettext-tools/tests/Makefile.msvc
deleted file mode 100644
index 81ee8d8..0000000
--- a/gettext-tools/tests/Makefile.msvc
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Makefile -*- for gettext-tools/tests
-
-#### Start of system configuration section. ####
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-all :
-
-install : all
-
-installdirs :
-
-uninstall :
-
-check :
-
-mostlyclean : clean
-
-clean : force
-
-distclean : clean
-
-maintainer-clean : distclean
-
-force :
diff --git a/gettext-tools/windows/alloca.h b/gettext-tools/windows/alloca.h
deleted file mode 100644
index 63b1c40..0000000
--- a/gettext-tools/windows/alloca.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* The system doesn't have <alloca.h>.  Use our alloca.h emulation.  */
-#include "alloca_.h"
diff --git a/gettext-tools/windows/fnmatch.h b/gettext-tools/windows/fnmatch.h
deleted file mode 100644
index 85c3d3b..0000000
--- a/gettext-tools/windows/fnmatch.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* The system doesn't have <fnmatch.h>.  Use our fnmatch.h emulation.  */
-#include "fnmatch_.h"
diff --git a/gettext-tools/windows/getopt.h b/gettext-tools/windows/getopt.h
deleted file mode 100644
index f0a30a5..0000000
--- a/gettext-tools/windows/getopt.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* The system doesn't have <getopt.h>.  Use our getopt.h emulation.  */
-#include "getopt_.h"
diff --git a/gettext-tools/windows/gettextlib.def b/gettext-tools/windows/gettextlib.def
deleted file mode 100644
index 4141c04..0000000
--- a/gettext-tools/windows/gettextlib.def
+++ /dev/null
@@ -1,112 +0,0 @@
-LIBRARY gettextlib
-EXPORTS
-argmatch_die
-error_message_count
-error_with_progname
-program_name
-simple_backup_suffix
-__xargmatch_internal
-_obstack_begin
-_obstack_newchunk
-addext
-argmatch
-argmatch_invalid
-argmatch_to_argument
-argmatch_valid
-at_fatal_signal
-block_fatal_signals
-c_isalnum
-c_isalpha
-c_isascii
-c_isblank
-c_iscntrl
-c_isdigit
-c_isgraph
-c_islower
-c_isprint
-c_ispunct
-c_isspace
-c_isupper
-c_isxdigit
-c_strcasecmp
-c_strncasecmp
-c_tolower
-c_toupper
-close_stdout
-compile_csharp_class
-compile_java_class
-concatenated_pathname
-copy_file_preserving
-create_pipe_bidi
-create_pipe_in
-create_pipe_out
-delete_hash
-error
-error_at_line
-error_one_per_line
-error_print_progname
-execute
-execute_csharp_program
-execute_java_class
-find_backup_file_name
-find_entry
-find_in_path
-freesa
-fstrcmp
-full_write
-fwriteerror
-gcd
-getopt_long
-get_version
-gnu_basename
-gnu_mbswidth
-gnu_stpncpy
-init_hash
-insert_entry
-iterate_table
-locale_charset
-mallocsa
-maybe_print_progname
-mbs_width_linebreaks
-mbsnwidth
-mkdtemp
-multiline_error
-multiline_warning
-new_classpath
-next_prime
-obstack_free
-optarg
-optind
-path_search
-relocate
-reset_classpath
-rpl_fnmatch
-rpl_getline
-safe_read
-safe_write
-set_classpath
-set_program_name
-set_program_name_and_installdir
-shell_quote
-shell_quote_argv
-shell_quote_copy
-shell_quote_length
-stpcpy
-strcasecmp
-strncasecmp
-u8_possible_linebreaks
-u8_width_linebreaks
-uc_width
-unblock_fatal_signals
-unsetenv
-vasprintf
-wait_subprocess
-xalloc_die
-xasprintf
-xcalloc
-xget_version
-xmalloc
-xmallocsa
-xrealloc
-xsetenv
-xstrdup
diff --git a/gettext-tools/windows/gettextlib.rc b/gettext-tools/windows/gettextlib.rc
deleted file mode 100644
index 62170ce..0000000
--- a/gettext-tools/windows/gettextlib.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Resources for gettextlib.dll */
-/* There are 4 occurrences of the version number in this file. */
-
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,15,0,0
- PRODUCTVERSION 0,15,0,0
- FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
-#ifdef _DEBUG
- FILEFLAGS 0x1L  /* VS_FF_DEBUG */
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x10004L  /* VOS_DOS_WINDOWS32 */
- FILETYPE 0x2L  /* VFT_DLL */
- FILESUBTYPE 0x0L  /* VFT2_UNKNOWN */
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
-        BEGIN
-            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
-            VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "FileDescription", "GPLed libgettextlib for Windows NT/2000/XP and Windows 95/98/ME\0"
-            VALUE "FileVersion", "0.15.0\0"
-            VALUE "InternalName", "gettextlib.dll\0"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2006\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "gettextlib.dll\0"
-            VALUE "ProductName", "libgettextlib: subroutines for gettext-tools\0"
-            VALUE "ProductVersion", "0.15.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0  /* US English, ASCII */
-    END
-END
diff --git a/gettext-tools/windows/gettextpo.def b/gettext-tools/windows/gettextpo.def
deleted file mode 100644
index bd74a9f..0000000
--- a/gettext-tools/windows/gettextpo.def
+++ /dev/null
@@ -1,41 +0,0 @@
-LIBRARY gettextpo
-EXPORTS
-libgettextpo_version
-po_file_create
-po_file_domains
-po_file_domain_header
-po_file_free
-po_file_read
-po_file_read_v2
-po_file_write
-po_filepos_file
-po_filepos_start_line
-po_header_field
-po_header_set_field
-po_message_add_filepos
-po_message_check_format
-po_message_comments
-po_message_create
-po_message_extracted_comments
-po_message_filepos
-po_message_insert
-po_message_is_format
-po_message_is_fuzzy
-po_message_is_obsolete
-po_message_iterator
-po_message_iterator_free
-po_message_msgid
-po_message_msgid_plural
-po_message_msgstr
-po_message_msgstr_plural
-po_message_remove_filepos
-po_message_set_comments
-po_message_set_extracted_comments
-po_message_set_format
-po_message_set_fuzzy
-po_message_set_msgid
-po_message_set_msgid_plural
-po_message_set_msgstr
-po_message_set_msgstr_plural
-po_message_set_obsolete
-po_next_message
diff --git a/gettext-tools/windows/gettextpo.rc b/gettext-tools/windows/gettextpo.rc
deleted file mode 100644
index 06ac799..0000000
--- a/gettext-tools/windows/gettextpo.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Resources for gettextpo.dll */
-/* There are 4 occurrences of the version number in this file. */
-
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,15,0,0
- PRODUCTVERSION 0,15,0,0
- FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
-#ifdef _DEBUG
- FILEFLAGS 0x1L  /* VS_FF_DEBUG */
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x10004L  /* VOS_DOS_WINDOWS32 */
- FILETYPE 0x2L  /* VFT_DLL */
- FILESUBTYPE 0x0L  /* VFT2_UNKNOWN */
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
-        BEGIN
-            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
-            VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "FileDescription", "GPLed libgettextpo for Windows NT/2000/XP and Windows 95/98/ME\0"
-            VALUE "FileVersion", "0.15.0\0"
-            VALUE "InternalName", "gettextpo.dll\0"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2006\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "gettextpo.dll\0"
-            VALUE "ProductName", "libgettextpo: public API for PO files\0"
-            VALUE "ProductVersion", "0.15.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0  /* US English, ASCII */
-    END
-END
diff --git a/gettext-tools/windows/gettextsrc.def b/gettext-tools/windows/gettextsrc.def
deleted file mode 100644
index fc92530..0000000
--- a/gettext-tools/windows/gettextsrc.def
+++ /dev/null
@@ -1,159 +0,0 @@
-LIBRARY gettextsrc
-EXPORTS
-allow_duplicates
-format_language
-format_language_pretty
-formatstring_awk
-formatstring_c
-formatstring_csharp
-formatstring_elisp
-formatstring_gcc_internal
-formatstring_java
-formatstring_librep
-formatstring_lisp
-formatstring_parsers
-formatstring_pascal
-formatstring_perl
-formatstring_perl_brace
-formatstring_php
-formatstring_python
-formatstring_sh
-formatstring_smalltalk
-formatstring_tcl
-formatstring_ycp
-gram_max_allowed_errors
-gram_pos
-gram_pos_column
-input_syntax
-less_than
-line_comment
-more_than
-msgcomm_mode
-omit_header
-pass_obsolete_entries
-plural_table
-plural_table_size
-po_charset_ascii
-po_charset_utf8
-po_error
-po_error_at_line
-po_gram_lval
-po_lex_charset
-po_lex_iconv
-po_lex_weird_cjk
-po_multiline_error
-po_multiline_warning
-use_first
-catenate_msgdomain_list
-compare_po_locale_charsets
-check_msgid_msgstr_format
-convert_string
-default_constructor
-default_destructor
-default_parse_brief
-default_parse_debrief
-default_directive_domain
-default_directive_message
-default_comment
-default_comment_dot
-default_comment_filepos
-default_comment_special
-default_set_domain
-default_add_message
-default_po_reader_alloc
-dir_list_append
-dir_list_nth
-dir_list_restore
-dir_list_save_reset
-extract_plural_expression
-get_sysdep_c_format_directives
-iconv_message_list
-iconv_msgdomain_list
-is_ascii_message
-is_ascii_message_list
-is_ascii_msgdomain_list
-is_ascii_string
-is_ascii_string_list
-lex_end
-lex_start
-message_alloc
-message_comment_append
-message_comment_dot_append
-message_comment_filepos
-message_copy
-message_equal
-message_free
-message_list_alloc
-message_list_append
-message_list_equal
-message_list_free
-message_list_insert_at
-message_list_list_alloc
-message_list_list_append
-message_list_list_append_list
-message_list_list_search
-message_list_list_search_fuzzy
-message_list_prepend
-message_list_remove_if_not
-message_list_search
-message_list_search_fuzzy
-message_page_width_ignore
-message_page_width_set
-message_print_comment
-message_print_comment_dot
-message_print_comment_filepos
-message_print_comment_flags
-message_print_style_escape
-message_print_style_indent
-message_print_style_uniforum
-message_print_syntax_properties
-message_print_syntax_stringtable
-msgdomain_alloc
-msgdomain_free
-msgdomain_list_alloc
-msgdomain_list_append
-msgdomain_list_english
-msgdomain_list_equal
-msgdomain_list_free
-msgdomain_list_print
-msgdomain_list_sort_by_filepos
-msgdomain_list_sort_by_msgid
-msgdomain_list_sublist
-open_po_file
-parse_plural_expression
-po_callback_comment
-po_callback_comment_filepos
-po_callback_domain
-po_callback_message
-po_charset_ascii_compatible
-po_charset_canonicalize
-po_gram_error_at_line
-po_gram_lex
-po_gram_parse
-po_is_charset_weird
-po_is_charset_weird_cjk
-po_lex_charset_close
-po_lex_charset_init
-po_lex_charset_set
-po_lex_pass_comments
-po_lex_pass_obsolete_entries
-po_parse_comment_special
-po_reader_alloc
-po_reader_free
-po_scan
-po_strftime
-possible_format_p
-read_names_from_file
-read_po
-read_po_file
-string_list_alloc
-string_list_append
-string_list_append_unique
-string_list_concat
-string_list_concat_destroy
-string_list_destroy
-string_list_equal
-string_list_free
-string_list_init
-string_list_join
-string_list_member
diff --git a/gettext-tools/windows/gettextsrc.rc b/gettext-tools/windows/gettextsrc.rc
deleted file mode 100644
index 3b05b9d..0000000
--- a/gettext-tools/windows/gettextsrc.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Resources for gettextsrc.dll */
-/* There are 4 occurrences of the version number in this file. */
-
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,15,0,0
- PRODUCTVERSION 0,15,0,0
- FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
-#ifdef _DEBUG
- FILEFLAGS 0x1L  /* VS_FF_DEBUG */
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x10004L  /* VOS_DOS_WINDOWS32 */
- FILETYPE 0x2L  /* VFT_DLL */
- FILESUBTYPE 0x0L  /* VFT2_UNKNOWN */
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
-        BEGIN
-            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
-            VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "FileDescription", "GPLed libgettextsrc for Windows NT/2000/XP and Windows 95/98/ME\0"
-            VALUE "FileVersion", "0.15.0\0"
-            VALUE "InternalName", "gettextsrc.dll\0"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2006\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "gettextsrc.dll\0"
-            VALUE "ProductName", "libgettextsrc: subroutines for gettext-tools\0"
-            VALUE "ProductVersion", "0.15.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0  /* US English, ASCII */
-    END
-END
diff --git a/gettext-tools/windows/unistd.h b/gettext-tools/windows/unistd.h
deleted file mode 100644
index 6850e7e..0000000
--- a/gettext-tools/windows/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty placeholder for unistd.h.  */