aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2003-08-14 07:04:57 +0000
committerAlan Modra <amodra@gmail.com>2003-08-14 07:04:57 +0000
commit68cdbb4a03848a829b1ee8e08b9d5de3c13522a8 (patch)
treee3de2eb9f6a96d4074ec5e07cd368dffeba7581c
parentda64f3bf47241a6e45fbe7149510ad64e2e751ae (diff)
downloadgdb-68cdbb4a03848a829b1ee8e08b9d5de3c13522a8.zip
gdb-68cdbb4a03848a829b1ee8e08b9d5de3c13522a8.tar.gz
gdb-68cdbb4a03848a829b1ee8e08b9d5de3c13522a8.tar.bz2
* dep-in.sed: Remove libintl.h.
* Makefile.am (POTFILES.in): Unset LC_COLLATE. * Makefile.in: Regenerate.
-rw-r--r--gprof/ChangeLog6
-rw-r--r--gprof/Makefile.am2
-rw-r--r--gprof/Makefile.in4
-rw-r--r--gprof/dep-in.sed1
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/Makefile.am2
-rw-r--r--ld/Makefile.in8
-rw-r--r--ld/dep-in.sed1
8 files changed, 22 insertions, 8 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 50e3e5b..21915af 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-14 Alan Modra <amodra@bigpond.net.au>
+
+ * dep-in.sed: Remove libintl.h.
+ * Makefile.am (POTFILES.in): Unset LC_COLLATE.
+ * Makefile.in: Regenerate.
+
2003-07-24 Nick Clifton <nickc@redhat.com>
* po/fr.po: Updated French translation.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 93873bc..18a0b52 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -45,7 +45,7 @@ diststuff: $(BUILT_SOURCES) info $(man_MANS)
POTFILES = $(sources) $(noinst_HEADERS)
po/POTFILES.in: @MAINT@ Makefile
- for file in $(POTFILES); do echo $$file; done | sort > tmp \
+ for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
MANCONF = -Dman
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 55b63ed..80d58a2 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -718,7 +718,7 @@ diststuff: $(BUILT_SOURCES) info $(man_MANS)
FUNCTION=`(echo $*|sed -e 's,.*/,,g' -e 's/_bl//')`_blurb \
FILE=$*.m $(srcdir)/$*.m
po/POTFILES.in: @MAINT@ Makefile
- for file in $(POTFILES); do echo $$file; done | sort > tmp \
+ for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
# Build the man page from the texinfo file
diff --git a/gprof/dep-in.sed b/gprof/dep-in.sed
index 0981dfc..aeb22a1 100644
--- a/gprof/dep-in.sed
+++ b/gprof/dep-in.sed
@@ -8,6 +8,7 @@ s!@BFDDIR@!$(BFDDIR)!g
s!@TOPDIR@/bfd!$(BFDDIR)!g
s!@SRCDIR@/!!g
s!@OBJDIR@/!!g
+s! \.\./intl/libintl\.h!!g
s/\\\n */ /g
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a44a027..1f32c68 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-14 Alan Modra <amodra@bigpond.net.au>
+
+ * dep-in.sed: Remove libintl.h.
+ * Makefile.am (POTFILES.in): Unset LC_COLLATE.
+ * Makefile.in: Regenerate.
+
2003-08-13 Alan Modra <amodra@bigpond.net.au>
* genscripts.sh (libpath.exp): Only generate for first emulation.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 3a04c4e..daea9ba 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -413,7 +413,7 @@ EMULATION_FILES = emultempl/pe.em emultempl/armcoff.em
POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES)
po/POTFILES.in: @MAINT@ Makefile
- for file in $(POTFILES); do echo $$file; done | sort > tmp \
+ for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
ldmain.o: ldmain.c config.status
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 9f0b384..bcc0dbd 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -605,7 +605,7 @@ deffilep.c ldgram.c ldlex.c
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
OBJECTS = $(ld_new_OBJECTS)
@@ -1087,7 +1087,7 @@ distclean-generic:
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
- -test -z "ldlexldeffilephdeffilepcldgramhldgramc$(MAINTAINERCLEANFILES)" || rm -f ldlexl deffileph deffilepc ldgramh ldgramc $(MAINTAINERCLEANFILES)
+ -test -z "ldlex.cdeffilep.hdeffilep.cldgram.hldgram.c$(MAINTAINERCLEANFILES)" || rm -f ldlex.c deffilep.h deffilep.c ldgram.h ldgram.c $(MAINTAINERCLEANFILES)
mostlyclean-am: mostlyclean-hdr mostlyclean-noinstPROGRAMS \
mostlyclean-compile mostlyclean-libtool \
mostlyclean-aminfo mostlyclean-tags mostlyclean-generic \
@@ -1144,7 +1144,7 @@ mostlyclean distclean maintainer-clean
po/POTFILES.in: @MAINT@ Makefile
- for file in $(POTFILES); do echo $$file; done | sort > tmp \
+ for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
ldmain.o: ldmain.c config.status
diff --git a/ld/dep-in.sed b/ld/dep-in.sed
index aad7d92..83418e2 100644
--- a/ld/dep-in.sed
+++ b/ld/dep-in.sed
@@ -8,6 +8,7 @@ s!@BFDDIR@!$(BFDDIR)!g
s!@TOPDIR@/bfd!$(BFDDIR)!g
s!@SRCDIR@/!!g
s! \.\./bfd/hosts/[^ ]*\.h! !g
+s! \.\./intl/libintl\.h!!g
s/\\\n */ /g