From bb0fd797b61d677dfd1903bd20f0001dd0f28841 Mon Sep 17 00:00:00 2001
From: amodra <amodra>
Date: Thu, 4 Jun 2009 06:56:53 +0000
Subject: [PATCH] 	* dep-in.sed: Don't use \n in replacement part of s
 command. 	* Makefile.am (DEP1): LC_ALL for uniq. 	Run "make dep-am". 
 * Makefile.in: Regenerate.

---
 binutils/ChangeLog   | 7 +++++++
 binutils/Makefile.am | 5 ++++-
 binutils/Makefile.in | 5 ++++-
 binutils/dep-in.sed  | 3 ++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a7d6ff6671..74ff09eee1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Don't use \n in replacement part of s command.
+	* Makefile.am (DEP1): LC_ALL for uniq.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-06-03  Tristan Gingold  <gingold@adacore.com>
 
 	* MAINTAINERS: Add myself as Mach-O maintainer.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 535e556221..d3dd46eb8b 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -411,7 +411,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -496,6 +497,7 @@ addr2line.o: \
 ar.o: \
   ar.c \
   $(BFDDIR)/libbfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ar.h \
@@ -764,6 +766,7 @@ nlmconv.o: \
 nm.o: \
   nm.c \
   $(BFDDIR)/elf-bfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ranlib.h \
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index ba7790c190..d001448349 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1186,7 +1186,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -1264,6 +1265,7 @@ addr2line.o: \
 ar.o: \
   ar.c \
   $(BFDDIR)/libbfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ar.h \
@@ -1532,6 +1534,7 @@ nlmconv.o: \
 nm.o: \
   nm.c \
   $(BFDDIR)/elf-bfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ranlib.h \
diff --git a/binutils/dep-in.sed b/binutils/dep-in.sed
index 04612289e0..4823f1e382 100644
--- a/binutils/dep-in.sed
+++ b/binutils/dep-in.sed
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
-- 
2.11.0