Simplify compiling format.c in C++ mode.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c6a291aa4c8ee19d0fce6df3c595a06b6086ea62..9b4da9c34aef7484202c1b7b5ca3667a57b2ec8c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (format_CFLAGS): Remove variable.
+       (format.lo): Remove variable.
+
 2006-05-09  Bruno Haible  <bruno@clisp.org>
 
        * plural-eval.h (USE_SIGINFO): Don't define on Cygwin.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 85a82ce50f924288b1fea87b3981538d999231c2..b411e3264350a8f3dedead11e613e865519153d6 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -218,15 +218,6 @@ libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
   ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 
-# Special rules for mingw.
-if MINGW
-format_CFLAGS = -x c++
-# Work around an automake 1.9 bug: *_CFLAGS settings are ignored for elements
-# of a libtool library.
-format.lo: format.c
-       $(LTCOMPILE) $(format_CFLAGS) -c -o format.lo format.c
-endif
-
 # No need to install libgettextsrc.a, except on AIX.
 install-exec-local: install-libLTLIBRARIES install-exec-clean
 install-exec-clean: