* configure.in: Define TARGET_BYTES_BIG_ENDIAN if endian is set.

	Don't set targ or gas_target.  Define SCO_ELF and
	TARGET_SOLARIS_COMMENT when appropriate.  Don't substitute for
	target_frag.
	* Makefile.am: Remove @target_frag@.
	(INCLUDES): Remove $(INTERNAL_CFLAGS), $(CROSS), $(HDEFINES), and
	$(TDEFINES).
	(dep-am): Mark as phony.
	* acconfig.h: Add TARGET_BYTES_BIG_ENDIAN, TARGET_SOLARIS_COMMENT,
	and SCO_ELF.
	* config/arm-big.mt, config/arm-lit.mt: Remove.
	* config/mips-big.mt, config/mips-lit.mt: Remove.
	* config/ppc-big.mt, config/ppc-lit.mt: Remove.
	* config/ppc-sol.mt: Remove.
	* config/i386coff.mt, config/m68kcoff.mt: Remove.
	* config/m88kcoff.mt: Remove.
	* config/sco5.mt: Remove.
	* configure, config.in, Makefile.in: Rebuild.

16 files changed, 37 insertions, 34 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0c7c446..fcc1845 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,24 @@
 Wed Aug  6 00:30:30 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.in: Define TARGET_BYTES_BIG_ENDIAN if endian is set.
+	Don't set targ or gas_target.  Define SCO_ELF and
+	TARGET_SOLARIS_COMMENT when appropriate.  Don't substitute for
+	target_frag.
+	* Makefile.am: Remove @target_frag@.
+	(INCLUDES): Remove $(INTERNAL_CFLAGS), $(CROSS), $(HDEFINES), and
+	$(TDEFINES).
+	(dep-am): Mark as phony.
+	* acconfig.h: Add TARGET_BYTES_BIG_ENDIAN, TARGET_SOLARIS_COMMENT,
+	and SCO_ELF.
+	* config/arm-big.mt, config/arm-lit.mt: Remove.
+	* config/mips-big.mt, config/mips-lit.mt: Remove.
+	* config/ppc-big.mt, config/ppc-lit.mt: Remove.
+	* config/ppc-sol.mt: Remove.
+	* config/i386coff.mt, config/m68kcoff.mt: Remove.
+	* config/m88kcoff.mt: Remove.
+	* config/sco5.mt: Remove.
+	* configure, config.in, Makefile.in: Rebuild.
+
 	* Makefile.am ($(srcdir)/config/m68k-parse.h): New target, to
 	further try to circumvent the .y.h rule.
 	* Makefile.in: Rebuild.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index cb23dea..547f146 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -293,8 +293,6 @@ MULTI_CFILES = \
 	config/e-mipsecoff.c \
 	config/e-mipself.c
 
-# @target_frag@
-
 OBJS = \
 	$(TARG_CPU_O) \
 	$(OBJ_FORMAT_O) \
@@ -347,7 +345,7 @@ INCDIR = $(BASEDIR)/include
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -D_GNU_SOURCE $(INTERNAL_CFLAGS) $(CROSS) $(HDEFINES) $(TDEFINES) -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR)
+INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
@@ -780,7 +778,7 @@ dep-am: .dep
 	cat .dep >> tmp-Makefile.am
 	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
 
-.PHONY: dep dep-in
+.PHONY: dep dep-in dep-am
 
 # start-sanitize-arc
 TCDEP_arc_elf = $(INCDIR)/opcode/arc.h
diff --git a/gas/Makefile.in b/gas/Makefile.in
index d254365..37b808a 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -367,8 +367,6 @@ MULTI_CFILES = \
 	config/e-mipsecoff.c \
 	config/e-mipself.c
 
-# @target_frag@
-
 OBJS = \
 	$(TARG_CPU_O) \
 	$(OBJ_FORMAT_O) \
@@ -415,7 +413,7 @@ INCDIR = $(BASEDIR)/include
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -D_GNU_SOURCE $(INTERNAL_CFLAGS) $(CROSS) $(HDEFINES) $(TDEFINES) -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR)
+INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
@@ -1160,7 +1158,7 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h
+config.h: stamp-h ; @true
 stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
@@ -1841,7 +1839,7 @@ dep-am: .dep
 	cat .dep >> tmp-Makefile.am
 	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
 
-.PHONY: dep dep-in
+.PHONY: dep dep-in dep-am
 # end-sanitize-arc
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
diff --git a/gas/acconfig.h b/gas/acconfig.h
index ae1587b..fe6ea23 100644
--- a/gas/acconfig.h
+++ b/gas/acconfig.h
@@ -40,9 +40,9 @@
 
 #undef MANY_SEGMENTS
 
-/* Needed only for sparc configuration.  */
-#undef SPARC_V9
-#undef SPARC_ARCH64
+/* The configure script defines this for some targets based on the
+   target name used.  It is not always defined.  */
+#undef TARGET_BYTES_BIG_ENDIAN
 
 /* Needed only for some configurations that can produce multiple output
    formats.  */
@@ -68,3 +68,13 @@
 
 /* Using cgen code?  */
 #undef USING_CGEN
+
+/* Needed only for sparc configuration.  */
+#undef SPARC_V9
+#undef SPARC_ARCH64
+
+/* Needed only for PowerPC Solaris.  */
+#undef TARGET_SOLARIS_COMMENT
+
+/* Needed only for SCO 5.  */
+#undef SCO_ELF
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 51ea5dd..42d6312 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -56,8 +56,6 @@ fi
 Things-to-keep:
 
 aout_gnu.h
-arm-big.mt
-arm-lit.mt
 atof-ieee.c
 atof-tahoe.c
 atof-vax.c
@@ -66,15 +64,10 @@ e-i386coff.c
 e-i386elf.c
 e-mipsecoff.c
 e-mipself.c
-i386coff.mt
 itbl-mips.h
 m68k-parse.h
 m68k-parse.y
-m68kcoff.mt
 m88k-opcode.h
-m88kcoff.mt
-mips-big.mt
-mips-lit.mt
 obj-aout.c
 obj-aout.h
 obj-bout.c
@@ -99,10 +92,6 @@ obj-som.c
 obj-som.h
 obj-vms.c
 obj-vms.h
-ppc-big.mt
-ppc-lit.mt
-ppc-sol.mt
-sco5.mt
 tc-a29k.c
 tc-a29k.h
 tc-alpha.c
diff --git a/gas/config/arm-big.mt b/gas/config/arm-big.mt
deleted file mode 100644
index da08852..0000000
--- a/gas/config/arm-big.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=1
diff --git a/gas/config/arm-lit.mt b/gas/config/arm-lit.mt
deleted file mode 100644
index b5f7dea..0000000
--- a/gas/config/arm-lit.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=0
diff --git a/gas/config/i386coff.mt b/gas/config/i386coff.mt
deleted file mode 100644
index efda833..0000000
--- a/gas/config/i386coff.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DI386COFF
diff --git a/gas/config/m68kcoff.mt b/gas/config/m68kcoff.mt
deleted file mode 100644
index 0d07eb1..0000000
--- a/gas/config/m68kcoff.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DM68KCOFF
diff --git a/gas/config/m88kcoff.mt b/gas/config/m88kcoff.mt
deleted file mode 100644
index 474f6a0..0000000
--- a/gas/config/m88kcoff.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DM88KCOFF
diff --git a/gas/config/mips-big.mt b/gas/config/mips-big.mt
deleted file mode 100644
index da08852..0000000
--- a/gas/config/mips-big.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=1
diff --git a/gas/config/mips-lit.mt b/gas/config/mips-lit.mt
deleted file mode 100644
index b5f7dea..0000000
--- a/gas/config/mips-lit.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=0
diff --git a/gas/config/ppc-big.mt b/gas/config/ppc-big.mt
deleted file mode 100644
index da08852..0000000
--- a/gas/config/ppc-big.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=1
diff --git a/gas/config/ppc-lit.mt b/gas/config/ppc-lit.mt
deleted file mode 100644
index b5f7dea..0000000
--- a/gas/config/ppc-lit.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=0
diff --git a/gas/config/ppc-sol.mt b/gas/config/ppc-sol.mt
deleted file mode 100644
index ec452ef..0000000
--- a/gas/config/ppc-sol.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DTARGET_BYTES_BIG_ENDIAN=0 -DTARGET_SOLARIS_COMMENT
diff --git a/gas/config/sco5.mt b/gas/config/sco5.mt
deleted file mode 100644
index 8879320..0000000
--- a/gas/config/sco5.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DSCO_ELF