Tue Jun 7 18:45:39 1994 Stan Shebs (shebs@andros.cygnus.com)

	* mpw-config.in (target_arch): Compute from canonical target.
	(m68k, mips, powerpc, sparc): Add architectures.
	* mpw-make.in (disassemble.c.o): Add.
	(ALL_CFLAGS): Remove special flags (-mc68020 -mc68881 -model far).

5 files changed, 28 insertions, 23 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index da4452b..6611c02 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -1,4 +1,4 @@
-# .Sanitize for devo/opcodes
+# .Sanitize for devo/opcodes.
 
 # Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
@@ -21,12 +21,6 @@ else
 	lose_these_too="mpw-make.in mpw-config.in ChangeLog.mpw"
 fi
 
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
-	keep_these_too="mpw-xconfig.in ChangeLog.gm ${keep_these_too}"
-else
-	lose_these_too="mpw-xconfig.in ChangeLog.gm ${lose_these_too}"
-fi
-
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
diff --git a/opcodes/ChangeLog.gm b/opcodes/ChangeLog.gm
deleted file mode 100644
index 0bfd980..0000000
--- a/opcodes/ChangeLog.gm
+++ /dev/null
@@ -1,14 +0,0 @@
-Wed Mar 30 15:31:55 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* mpw-xconfig.in (opcode/mips.h): Don't forward-include here.
-	(BFD_MACHINES): Set appropriately.
-
-Mon Jan 24 12:09:35 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* mpw-xconfig.in (opcode/mips.h): Create using forward-include.
-
-Mon Jan  3 12:54:35 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
- 	* mpw-xconfig.in: New file, mpw x mips configuration bits.
-
-
diff --git a/opcodes/ChangeLog.mpw b/opcodes/ChangeLog.mpw
index 2c1b48a..89394f2 100644
--- a/opcodes/ChangeLog.mpw
+++ b/opcodes/ChangeLog.mpw
@@ -1,3 +1,10 @@
+Tue Jun  7 18:45:39 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-config.in (target_arch): Compute from canonical target.
+	(m68k, mips, powerpc, sparc): Add architectures.
+	* mpw-make.in (disassemble.c.o): Add.
+	(ALL_CFLAGS): Remove special flags (-mc68020 -mc68881 -model far). 
+
 Wed Mar 30 15:30:44 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-config.in (BFD_MACHINES): Set to a default value.
diff --git a/opcodes/mpw-config.in b/opcodes/mpw-config.in
index b18d4c0..635076f 100644
--- a/opcodes/mpw-config.in
+++ b/opcodes/mpw-config.in
@@ -3,3 +3,19 @@
 forward-include "{srcroot}"bfd:hosts:mpw.h sysdep.h
 
 Set BFD_MACHINES " "
+
+Set target_arch `echo {target_canonical} | sed -e 's/-.*-.*//'`
+
+If "{target_arch}" =~ /m68k/
+	Set BFD_MACHINES  '"{o}"m68k-dis.c.o'
+	Set archname ARCH_m68k
+Else If "{target_arch}" =~ /mips/
+	Set BFD_MACHINES  '"{o}"mips-dis.c.o "{o}"mips-opc.c.o'
+	Set archname ARCH_mips
+Else If "{target_arch}" =~ /powerpc/
+	Set BFD_MACHINES  '"{o}"ppc-dis.c.o "{o}"ppc-opc.c.o'
+	Set archname ARCH_powerpc
+Else If "{target_arch}" =~ /sparc/
+	Set BFD_MACHINES  '"{o}"sparc-dis.c.o "{o}"sparc-opc.c.o'
+	Set archname ARCH_sparc
+End If
diff --git a/opcodes/mpw-make.in b/opcodes/mpw-make.in
index 017fb4c..05eabca 100644
--- a/opcodes/mpw-make.in
+++ b/opcodes/mpw-make.in
@@ -73,7 +73,7 @@ BFDDIR = "{topsrcdir}"bfd
 CSEARCH =  -i {INCDIR},{INCDIR}:,{BFDDIR}:,::bfd:,"{INCDIR}":mpw:,::extra-include:
 DEP = mkdep
 
-ALL_CFLAGS =  -mc68020 -mc68881 -model far {CSEARCH}
+ALL_CFLAGS =  {CSEARCH} {ARCHDEFS}
 
 TARGETLIB = libopcodes.o
 
@@ -87,7 +87,7 @@ ALL_MACHINES = a29k-dis.o alpha-dis.o h8300-dis.o h8500-dis.o ¶
 
 # BFD_MACHINES is set by configure.in.
 
-OFILES = {BFD_MACHINES} "{o}"dis-buf.c.o
+OFILES = {BFD_MACHINES} "{o}"dis-buf.c.o "{o}"disassemble.c.o
 
 #### host and target dependent Makefile fragments come in here.
 ###
@@ -121,6 +121,8 @@ all \Option-f {TARGETLIB}
 	 Lib -o {TARGETLIB} {OFILES}
 #	 {RANLIB} {TARGETLIB}
 
+"{o}"disassemble.c.o \Option-f "{s}"disassemble.c {INCDIR}:dis-asm.h
+
 "{o}"a29k-dis.o \Option-f "{s}"a29k-dis.c {INCDIR}:dis-asm.h {INCDIR}:opcode:a29k.h
 "{o}"dis-buf.c.o \Option-f "{s}"dis-buf.c {INCDIR}:dis-asm.h
 "{o}"h8500-dis.o \Option-f "{s}"h8500-dis.c h8500-opc.h {INCDIR}:dis-asm.h