* xcoff.h: Rename to xcoff-target.h

	* Makefile.am: Change all instances of xcoff.h to xcoff-target.h
	* coff-rs6000.c: Ditto.
	* coff64-rs6000.c: Ditto.
	* coff-pmac.c: Ditto.
	* Makefile.in: Regenerate.

7 files changed, 20 insertions, 11 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b8c6f356df2..7006a691e1a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+Fri May  5 20:44:40 2000  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* xcoff.h: Rename to xcoff-target.h
+	* Makefile.am: Change all instances of xcoff.h to xcoff-target.h
+	* coff-rs6000.c: Ditto.
+	* coff64-rs6000.c: Ditto.
+	* coff-pmac.c: Ditto.
+	* Makefile.in: Regenerate.
+	
 Fri May  5 16:51:03 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
 	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags):
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 1ae468e87dd..bc899fad353 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -464,7 +464,7 @@ SOURCE_HFILES = \
 	elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
 	hppa_stubs.h 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 xcoff.h
+	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h xcoff-target.h
 
 HFILES = \
 	elf32-target.h elf64-target.h targmatch.h \
@@ -805,10 +805,10 @@ coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
   ecoffswap.h
 coff-pmac.lo: coff-pmac.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \
   $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
 coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \
@@ -1110,7 +1110,7 @@ coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
   libecoff.h coffswap.h ecoffswap.h
 coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6k64.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \
   libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 0d64e7f30f3..61a80949d82 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -587,7 +587,7 @@ SOURCE_HFILES = \
 	elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
 	hppa_stubs.h 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 xcoff.h
+	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h xcoff-target.h
 
 
 HFILES = \
@@ -1333,10 +1333,10 @@ coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
   ecoffswap.h
 coff-pmac.lo: coff-pmac.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \
   $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
 coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \
@@ -1638,7 +1638,7 @@ coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
   libecoff.h coffswap.h ecoffswap.h
 coff64-rs6000.lo: coff64-rs6000.c $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6k64.h libcoff.h $(INCDIR)/bfdlink.h \
-  xcoff.h coffcode.h coffswap.h
+  xcoff-target.h coffcode.h coffswap.h
 demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \
   libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
diff --git a/bfd/coff-pmac.c b/bfd/coff-pmac.c
index 0a550729d0e..790160b7de5 100644
--- a/bfd/coff-pmac.c
+++ b/bfd/coff-pmac.c
@@ -31,6 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "coff/rs6000.h"
 #include "libcoff.h"
-#include "xcoff.h"
+#include "xcoff-target.h"
 
 
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index aa44e4484ba..46894001a7b 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libcoff.h"
 #define TARGET_NAME "aixcoff-rs6000"
 #define TARGET_SYM rs6000coff_vec
-#include "xcoff.h"
+#include "xcoff-target.h"
 
 
 /* The main body of code is in coffcode.h.  */
diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
index 25f7e9c1819..8e5c501bf7a 100644
--- a/bfd/coff64-rs6000.c
+++ b/bfd/coff64-rs6000.c
@@ -356,5 +356,5 @@ end:
 #define TARGET_NAME "aixcoff64-rs6000"
 #define TARGET_SYM rs6000coff64_vec
 
-#include "xcoff.h"
+#include "xcoff-target.h"
 
diff --git a/bfd/xcoff.h b/bfd/xcoff-target.h
index a103ac9c8a6..a103ac9c8a6 100644
--- a/bfd/xcoff.h
+++ b/bfd/xcoff-target.h