merge from gcc

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index eec08665135e2a8c625a9f1a05436d1732243a36..21943b9e9aef3dfef9036fff513040231b74f2f5 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-10  Joseph Myers  <joseph@codesourcery.com>
+
+       * Makefile.in (clean): Don't remove makedepend$(EXEEXT).
+
 2008-10-27  Janis Johnson  <janis187@us.ibm.com>
 
        PR other/37897

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index 5e1cabf1a2f0e7beeb0ee66ca59ba245d2f6fffa..93fd4d26c240f662e9b0a96c0fe3fafdd792c4ea 100644 (file)
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -1,7 +1,7 @@
 # @configure_input@
 # Makefile for libdecnumber.  Run 'configure' to generate Makefile from Makefile.in
 
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -147,7 +147,7 @@ mostlyclean:
        -rm -f *.o
 
 clean: mostlyclean
-       -rm -rf makedepend$(EXEEXT) libdecnumber.a $(srcdir)/autom4te.cache
+       -rm -rf libdecnumber.a $(srcdir)/autom4te.cache
 
 distclean: clean
        -rm -f config.h stamp-h1 config.status config.cache config.log \