PR c++/50958

[pf3gnuchains/gcc-fork.git] / libcpp / Makefile.in

diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 268d1ba..d6df46d 100644 (file)
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -1,7 +1,7 @@
 # @configure_input@
 # Makefile for libcpp.  Run 'configure' to generate Makefile from Makefile.in
 
-# Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 #This file is part of libcpp.
 
@@ -56,6 +56,7 @@ XGETTEXT = @XGETTEXT@
 CCDEPMODE = @CCDEPMODE@
 CXXDEPMODE = @CXXDEPMODE@
 DEPDIR = @DEPDIR@
+NOEXCEPTION_FLAGS = @noexception_flags@
 
 datarootdir = @datarootdir@
 datadir = @datadir@
@@ -72,7 +73,8 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
        -I$(srcdir)/include
 
 ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
-ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(INCLUDES) $(CPPFLAGS)
+ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \
+       $(CPPFLAGS)
 
 # The name of the compiler to use.
 ENABLE_BUILD_WITH_CXX = @ENABLE_BUILD_WITH_CXX@
@@ -249,8 +251,15 @@ po/$(PACKAGE).pot: $(libcpp_a_SOURCES)
        $(mkinstalldirs) $(srcdir)/po
        $(XGETTEXT) --default-domain=$(PACKAGE) \
          --keyword=_ --keyword=N_ \
-         --keyword=cpp_error:3 --keyword=cpp_errno:3 \
+         --keyword=cpp_error:3 \
+         --keyword=cpp_warning:3 \
+         --keyword=cpp_pedwarning:3 \
+         --keyword=cpp_warning_syshdr:3 \
          --keyword=cpp_error_with_line:5 \
+         --keyword=cpp_warning_with_line:5 \
+         --keyword=cpp_pedwarning_with_line:5 \
+         --keyword=cpp_warning_with_line_syshdr:5 \
+         --keyword=cpp_errno:3 \
          --keyword=SYNTAX_ERROR --keyword=SYNTAX_ERROR2 \
          --copyright-holder="Free Software Foundation, Inc." \
          --msgid-bugs-address="http://gcc.gnu.org/bugs.html" \