diff options
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/Makefile.am | 16 | ||||
| -rw-r--r-- | bfd/Makefile.in | 19 | ||||
| -rw-r--r-- | bfd/dep-in.sed | 1 |
4 files changed, 18 insertions, 25 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 86cdde2..ad8cee8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2003-08-14 Alan Modra <amodra@bigpond.net.au> + + * dep-in.sed: Remove libintl.h. + * Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Unset LC_COLLATE. + (POTFILES.in): Remove target. + * Makefile.in: Regenerate. + 2003-08-12 Alan Modra <amodra@bigpond.net.au> * elf64-ppc.c (ppc64_elf_next_input_section): Update comment. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index eaec975..d27c873 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -606,23 +606,15 @@ SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES) BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES) po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) - for file in $(SRC_POTFILES); do echo $$file; done | sort > tmp.src \ + for file in $(SRC_POTFILES); do echo $$file; done \ + | LC_COLLATE= sort > tmp.src \ && mv tmp.src $(srcdir)/po/SRC-POTFILES.in po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) - for file in $(BLD_POTFILES); do echo $$file; done | sort > tmp.bld \ + for file in $(BLD_POTFILES); do echo $$file; done \ + | LC_COLLATE= sort > tmp.bld \ && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in -# The following target is retained for upgrade purposes. -# This target used to exist in older versions of this makefile, and was -# referenced by <builddir>/po/Makefile (which is created from <srcdir>/po/Make-in) -# So old versions of <builddir>/po/Makefile will try to regenerate themselves -# when make is next run, but that dependency cannot be completed without a build -# of po/POTFILES.in. Hence the presence of this rule. This rule will be deleted -# once it is no longer needed - probably in the fall of 2001. -po/POTFILES.in: - - diststuff: info # Various kinds of .o files to put in libbfd.a: diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 38ecfab3..58ba21d 100644 --- a/bfd/Makefile.in +++ b/bfd/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 @@ -811,7 +811,7 @@ configure.in version.h DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES) OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS) @@ -1177,22 +1177,15 @@ mostlyclean distclean maintainer-clean po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) - for file in $(SRC_POTFILES); do echo $$file; done | sort > tmp.src \ + for file in $(SRC_POTFILES); do echo $$file; done \ + | LC_COLLATE= sort > tmp.src \ && mv tmp.src $(srcdir)/po/SRC-POTFILES.in po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) - for file in $(BLD_POTFILES); do echo $$file; done | sort > tmp.bld \ + for file in $(BLD_POTFILES); do echo $$file; done \ + | LC_COLLATE= sort > tmp.bld \ && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in -# The following target is retained for upgrade purposes. -# This target used to exist in older versions of this makefile, and was -# referenced by <builddir>/po/Makefile (which is created from <srcdir>/po/Make-in) -# So old versions of <builddir>/po/Makefile will try to regenerate themselves -# when make is next run, but that dependency cannot be completed without a build -# of po/POTFILES.in. Hence the presence of this rule. This rule will be deleted -# once it is no longer needed - probably in the fall of 2001. -po/POTFILES.in: - diststuff: info stamp-ofiles: Makefile diff --git a/bfd/dep-in.sed b/bfd/dep-in.sed index ce8b79b..90a2e6a 100644 --- a/bfd/dep-in.sed +++ b/bfd/dep-in.sed @@ -18,6 +18,7 @@ s! config.h!!g s! \$(INCDIR)/fopen-[^ ]*\.h!!g s! \$(INCDIR)/ansidecl\.h!!g s! \$(INCDIR)/symcat\.h!!g +s! \.\./intl/libintl\.h!!g s/\\\n */ /g |