Simplify compiling format.c in C++ mode.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 9b4da9c34aef7484202c1b7b5ca3667a57b2ec8c..1fd85b9d002f52cc07fd17544f5b48d1a1969eb0 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * Makefile.am (format_CFLAGS): Remove variable.
        (format.lo): Remove variable.
+       (FORMAT_SOURCE) [MINGW]: Use ../mingw/c++format.cc instead of format.c.
 
 2006-05-09  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index b411e3264350a8f3dedead11e613e865519153d6..f2fdb7a200c4cfc616e2b4a6bb77059256f6734d 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -110,7 +110,12 @@ read-po-abstract.c po-lex.c po-gram-gen.y po-charset.c \
 read-properties.c read-stringtable.c open-po.c dir-list.c str-list.c
 
 # xgettext and msgfmt deal with format strings.
-FORMAT_SOURCE = format.c format-invalid.h \
+if !MINGW
+FORMAT_SOURCE = format.c
+else
+FORMAT_SOURCE = ../mingw/c++format.cc
+endif
+FORMAT_SOURCE += format-invalid.h \
 format-c.c format-sh.c format-python.c format-lisp.c format-elisp.c \
 format-librep.c format-scheme.c format-java.c format-csharp.c format-awk.c \
 format-pascal.c format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \