bfd/ChangeLog

	* configure.in (AC_OUTPUT <bfd-in3.h>): Remove version.h.
	* configure: Regenerate.
	* Makefile.am (BFD_H_FILES): Add version.h.
	* Makefile.in: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.

bfd/doc/ChangeLog
	* Makefile.am (BFD_H_DEP): Add ../version.h.
	* Makefile.in: Regenerate.

9 files changed, 69 insertions, 47 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0311dfb..3500403 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2001-10-03  Alan Modra  <amodra@bigpond.net.au>
 
+	* configure.in (AC_OUTPUT <bfd-in3.h>): Remove version.h.
+	* configure: Regenerate.
+	* Makefile.am (BFD_H_FILES): Add version.h.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
 	* elflink.h (elf_fix_symbol_flags): Copy flags to weakdef using
 	elf_backend_copy_indirect_symbol so that backend has a chance to
 	copy other necessary fields.
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f9b0564..9edff8f 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -504,7 +504,7 @@ SOURCE_HFILES = \
 	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
 	libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
 	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \
-	xcoff-target.h
+	xcoff-target.h version.h
 
 ## ... and all .h files which are in the build tree.
 BUILD_HFILES = \
@@ -702,7 +702,7 @@ stmp-bfd-h: bfd-in3.h
 	touch stmp-bfd-h
 
 BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
+	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
 LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
 LIBCOFF_H_FILES = libcoff-in.h coffcode.h
 
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 7a08a91..582bbcc 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -638,7 +638,7 @@ SOURCE_HFILES = \
 	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
 	libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
 	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \
-	xcoff-target.h
+	xcoff-target.h version.h
 
 
 BUILD_HFILES = \
@@ -673,7 +673,7 @@ BFD_H_DEPS = $(INCDIR)/ansidecl.h
 LOCAL_H_DEPS = libbfd.h sysdep.h config.h
 
 BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
+	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
 
 LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
 LIBCOFF_H_FILES = libcoff-in.h coffcode.h
@@ -711,7 +711,7 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README ./stamp-h.in COPYING ChangeLog Makefile.am \
 Makefile.in TODO acinclude.m4 aclocal.m4 bfd-in2.h config.in configure \
-configure.in version.h
+configure.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -763,8 +763,8 @@ distclean-hdr:
 	-rm -f config.h
 
 maintainer-clean-hdr:
-bfd-in3.h: $(top_builddir)/config.status bfd-in2.h version.h
-	cd $(top_builddir) && CONFIG_FILES=$@:bfd-in2.h:version.h CONFIG_HEADERS= $(SHELL) ./config.status
+bfd-in3.h: $(top_builddir)/config.status bfd-in2.h
+	cd $(top_builddir) && CONFIG_FILES=$@:bfd-in2.h CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-noinstLIBRARIES:
 
diff --git a/bfd/configure b/bfd/configure
index 4056fcf..eb18a7b 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -4313,7 +4313,7 @@ fi
       l=
    
 
-            if test -d $srcdir/po; then
+            if test -f $srcdir/po/POTFILES.in; then
       test -d po || mkdir po
       if test "x$srcdir" != "x."; then
 	 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -6613,7 +6613,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile doc/Makefile bfd-in3.h:bfd-in2.h:version.h po/Makefile.in:po/Make-in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -6767,7 +6767,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile bfd-in3.h:bfd-in2.h:version.h po/Makefile.in:po/Make-in"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/bfd/configure.in b/bfd/configure.in
index d71f45f..c952d9c 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -771,6 +771,6 @@ case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
 esac
 
 rm -f doc/config.status
-AC_OUTPUT(Makefile doc/Makefile bfd-in3.h:bfd-in2.h:version.h po/Makefile.in:po/Make-in,
+AC_OUTPUT(Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in,
 [sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' -e '/BLD-POTFILES =/r po/BLD-POTFILES' po/Makefile.in > po/Makefile])
 
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index f889a09..f39627d 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (BFD_H_DEP): Add ../version.h.
+	* Makefile.in: Regenerate.
+
 2001-10-02  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.in: Regenerate.
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 5fe4c23..91e2d02 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -183,7 +183,8 @@ s-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
 	touch s-linker
 linker.texi: s-linker
 
-LIBBFD_H_DEP = $(srcdir)/../libbfd-in.h	\
+LIBBFD_H_DEP = \
+	$(srcdir)/../libbfd-in.h	\
 	$(srcdir)/../init.c		\
 	$(srcdir)/../libbfd.c		\
 	$(srcdir)/../cache.c		\
@@ -204,7 +205,8 @@ libbfd.h: $(LIBBFD_H_DEP)
 	  esac; \
 	done
 
-LIBCOFF_H_DEP = $(srcdir)/../libcoff-in.h	\
+LIBCOFF_H_DEP = \
+	$(srcdir)/../libcoff-in.h	\
 	$(srcdir)/../coffcode.h		\
 	$(srcdir)/header.sed		\
 	$(srcdir)/proto.str		\
@@ -220,7 +222,8 @@ libcoff.h: $(LIBCOFF_H_DEP)
 	  esac; \
 	done
 
-BFD_H_DEP = $(srcdir)/../bfd-in.h 	\
+BFD_H_DEP = \
+	$(srcdir)/../bfd-in.h 		\
 	$(srcdir)/../init.c 		\
 	$(srcdir)/../opncls.c 		\
 	$(srcdir)/../libbfd.c 		\
@@ -235,6 +238,7 @@ BFD_H_DEP = $(srcdir)/../bfd-in.h 	\
 	$(srcdir)/../format.c		\
 	$(srcdir)/header.sed		\
 	$(srcdir)/proto.str		\
+	$(srcdir)/../version.h		\
 	$(MKDOC)
 
 bfd.h: $(BFD_H_DEP)
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index aec63a5..80b46b3 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -176,7 +176,8 @@ info_TEXINFOS = bfd.texinfo
 
 MKDOC = chew$(EXEEXT_FOR_BUILD)
 
-LIBBFD_H_DEP = $(srcdir)/../libbfd-in.h	\
+LIBBFD_H_DEP = \
+	$(srcdir)/../libbfd-in.h	\
 	$(srcdir)/../init.c		\
 	$(srcdir)/../libbfd.c		\
 	$(srcdir)/../cache.c		\
@@ -188,14 +189,16 @@ LIBBFD_H_DEP = $(srcdir)/../libbfd-in.h	\
 	$(MKDOC)
 
 
-LIBCOFF_H_DEP = $(srcdir)/../libcoff-in.h	\
+LIBCOFF_H_DEP = \
+	$(srcdir)/../libcoff-in.h	\
 	$(srcdir)/../coffcode.h		\
 	$(srcdir)/header.sed		\
 	$(srcdir)/proto.str		\
 	$(MKDOC)
 
 
-BFD_H_DEP = $(srcdir)/../bfd-in.h 	\
+BFD_H_DEP = \
+	$(srcdir)/../bfd-in.h 		\
 	$(srcdir)/../init.c 		\
 	$(srcdir)/../opncls.c 		\
 	$(srcdir)/../libbfd.c 		\
@@ -210,6 +213,7 @@ BFD_H_DEP = $(srcdir)/../bfd-in.h 	\
 	$(srcdir)/../format.c		\
 	$(srcdir)/header.sed		\
 	$(srcdir)/proto.str		\
+	$(srcdir)/../version.h		\
 	$(MKDOC)
 
 
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 224c46c..bf1269f 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -1,15 +1,15 @@
 aix386-core.c
-aout0.c
-aout32.c
-aout64.c
 aout-adobe.c
 aout-arm.c
 aout-cris.c
-aoutf1.h
 aout-ns32k.c
 aout-sparcle.c
 aout-target.h
 aout-tic30.c
+aout0.c
+aout32.c
+aout64.c
+aoutf1.h
 aoutx.h
 archive.c
 archures.c
@@ -22,21 +22,17 @@ cf-i386lynx.c
 cf-m68klynx.c
 cf-sparclynx.c
 cisco-core.c
-coff64-rs6000.c
 coff-a29k.c
 coff-alpha.c
 coff-apollo.c
 coff-arm.c
 coff-aux.c
-coffcode.h
-coffgen.c
 coff-go32.c
 coff-h8300.c
 coff-h8500.c
 coff-i386.c
 coff-i860.c
 coff-i960.c
-cofflink.c
 coff-m68k.c
 coff-m88k.c
 coff-mips.c
@@ -45,7 +41,6 @@ coff-sh.c
 coff-sparc.c
 coff-stgo32.c
 coff-svm68k.c
-coffswap.h
 coff-tic30.c
 coff-tic54x.c
 coff-tic80.c
@@ -53,6 +48,11 @@ coff-u68k.c
 coff-w65.c
 coff-we32k.c
 coff-z8k.c
+coff64-rs6000.c
+coffcode.h
+coffgen.c
+cofflink.c
+coffswap.h
 corefile.c
 cpu-a29k.c
 cpu-alpha.c
@@ -105,15 +105,20 @@ ecofflink.c
 ecoffswap.h
 efi-app-ia32.c
 efi-app-ia64.c
+elf-bfd.h
+elf-hppa.h
+elf-m10200.c
+elf-m10300.c
+elf.c
 elf32-arc.c
 elf32-arm.h
 elf32-avr.c
-elf32.c
 elf32-cris.c
 elf32-d10v.c
 elf32-d30v.c
 elf32-fr30.c
 elf32-gen.c
+elf32-h8300.c
 elf32-hppa.c
 elf32-hppa.h
 elf32-i370.c
@@ -131,30 +136,27 @@ elf32-openrisc.c
 elf32-pj.c
 elf32-ppc.c
 elf32-s390.c
-elf32-sh.c
 elf32-sh-lin.c
+elf32-sh.c
 elf32-sparc.c
 elf32-v850.c
+elf32.c
 elf64-alpha.c
-elf64.c
 elf64-gen.c
 elf64-hppa.c
 elf64-hppa.h
 elf64-mips.c
+elf64-ppc.c
 elf64-s390.c
 elf64-sparc.c
 elf64-x86-64.c
+elf64.c
 elfarm-nabi.c
 elfarm-oabi.c
-elf-bfd.h
-elf.c
 elfcode.h
 elfcore.h
-elf-hppa.h
 elflink.c
 elflink.h
-elf-m10200.c
-elf-m10300.c
 epoc-pe-arm.c
 epoc-pei-arm.c
 format.c
@@ -201,16 +203,16 @@ merge.c
 mipsbsd.c
 netbsd.h
 newsos3.c
+nlm-target.h
+nlm.c
 nlm32-alpha.c
-nlm32.c
 nlm32-i386.c
 nlm32-ppc.c
 nlm32-sparc.c
+nlm32.c
 nlm64.c
-nlm.c
 nlmcode.h
 nlmswap.h
-nlm-target.h
 ns32k.h
 ns32knetbsd.c
 oasys.c
@@ -220,20 +222,20 @@ pc532-mach.c
 pdp11.c
 pe-arm.c
 pe-i386.c
+pe-mcore.c
+pe-mips.c
+pe-ppc.c
+pe-sh.c
 pei-arm.c
-peicode.h
 pei-i386.c
 pei-mcore.c
 pei-mips.c
 pei-ppc.c
 pei-sh.c
-pe-mcore.c
-pe-mips.c
-pe-ppc.c
-pe-sh.c
+peicode.h
 ppcboot.c
-reloc16.c
 reloc.c
+reloc16.c
 riscix.c
 sco5-core.c
 section.c
@@ -243,8 +245,8 @@ sparclinux.c
 sparclynx.c
 sparcnetbsd.c
 srec.c
-stabs.c
 stab-syms.c
+stabs.c
 sunos.c
 syms.c
 targets.c
@@ -252,11 +254,12 @@ tekhex.c
 trad-core.c
 vaxnetbsd.c
 versados.c
-vms.c
+version.h
 vms-gsd.c
-vms.h
 vms-hdr.c
 vms-misc.c
 vms-tir.c
-xcofflink.c
+vms.c
+vms.h
 xcoff-target.h
+xcofflink.c