* Makefile.in (ALL_CFLAGS): Define.

	(.c.o, disassemble.o): Use $(ALL_CFLAGS).
	(MOSTLYCLEAN): Add config.log.
	(distclean): Don't remove config.log.
	* configure.in: Substitute HDEFINES.
	* configure: Rebuild.

4 files changed, 51 insertions, 41 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f578045..4dfa088 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,12 @@
+Wed Sep  6 21:21:33 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (ALL_CFLAGS): Define.
+	(.c.o, disassemble.o): Use $(ALL_CFLAGS).
+	(MOSTLYCLEAN): Add config.log.
+	(distclean): Don't remove config.log.
+	* configure.in: Substitute HDEFINES.
+	* configure: Rebuild.
+
 start-sanitize-sh3e
 Wed Sep  6 15:08:09 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
 
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 356d35a..a9be29c 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1,5 +1,5 @@
 #    Makefile template for Configure for the opcodes library.
-#    Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
+#    Copyright (C) 1990, 1991, 1992, 1995 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -14,13 +14,14 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-srcdir = .
+VPATH = @srcdir@
+srcdir = @srcdir@
 
-prefix = /usr/local
+prefix = @prefix@
 
-exec_prefix = $(prefix)
+exec_prefix = @exec_prefix@
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 
@@ -42,16 +43,17 @@ docdir = $(srcdir)/doc
 
 SHELL = /bin/sh
 
-INSTALL = `cd $(srcdir)/..; pwd`/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 
-AR = ar
-AR_FLAGS = qc
-CFLAGS = -g
+AR = @AR@
+AR_FLAGS = rc
+CC = @CC@
+CFLAGS = @CFLAGS@
 BISON = bison
 MAKEINFO = makeinfo
-RANLIB = ranlib
+RANLIB = @RANLIB@
 
 INCDIR = $(srcdir)/../include
 BFDDIR = $(srcdir)/../bfd
@@ -68,16 +70,12 @@ ALL_MACHINES = a29k-dis.o alpha-dis.o h8300-dis.o h8500-dis.o \
 	$(start-sanitize-arc) \
 	arc-dis.o arc-opc.o \
 	$(end-sanitize-arc) \
-	hppa-dis.o i386-dis.o i960-dis.o m68k-dis.o \
+	hppa-dis.o i386-dis.o i960-dis.o m68k-dis.o m68k-opc.o \
 	m88k-dis.o mips-dis.o mips-opc.o sh-dis.o sparc-dis.o \
 	sparc-opc.o z8k-dis.o ns32k-dis.o ppc-dis.o ppc-opc.o \
 	arm-dis.o w65-dis.o
 
-# BFD_MACHINES is set by configure.in.
-OFILES = $(BFD_MACHINES) dis-buf.o disassemble.o
-
-#### host and target dependent Makefile fragments come in here.
-###
+OFILES = @BFD_MACHINES@ dis-buf.o disassemble.o
 
 FLAGS_TO_PASS = \
 	"against=$(against)" \
@@ -92,9 +90,10 @@ FLAGS_TO_PASS = \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"BISON=$(BISON)"
 
-.c.o:
-	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
+ALL_CFLAGS = $(CSEARCH) @HDEFINES@ $(CFLAGS)
 
+.c.o:
+	$(CC) -c $(ALL_CFLAGS) $<
 
 # C source files that correspond to .o's.
 CFILES = i386-dis.c z8k-dis.c m68k-dis.c mips-dis.c ns32k-dis.c ppc-dis.c
@@ -122,7 +121,7 @@ $(TARGETLIB): $(OFILES)
 	 $(RANLIB) $(TARGETLIB)
 
 disassemble.o: disassemble.c $(INCDIR)/dis-asm.h
-	$(CC) -c $(CFLAGS) $(ARCHDEFS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
+	$(CC) -c @archdefs@ $(ALL_CFLAGS) $(srcdir)/disassemble.c
 
 a29k-dis.o: a29k-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/a29k.h
 dis-buf.o: dis-buf.c $(INCDIR)/dis-asm.h
@@ -133,6 +132,7 @@ i960-dis.o: i960-dis.c $(INCDIR)/dis-asm.h
 w65-dis.o: w65-dis.c
 m68k-dis.o: m68k-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/floatformat.h \
 	$(INCDIR)/opcode/m68k.h
+m68k-opc.o: m68k-opc.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/m68k.h
 mips-dis.o: mips-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/mips.h
 mips-opc.o: mips-opc.c $(INCDIR)/opcode/mips.h
 ppc-dis.o: ppc-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ppc.h
@@ -152,13 +152,13 @@ tags etags: TAGS
 TAGS: force
 	etags $(INCDIR)/*.h $(srcdir)/*.h $(srcdir)/*.c
 
-MOSTLYCLEAN = *.o core *.E *.p *.ip
+MOSTLYCLEAN = *.o core *.E *.p *.ip config.log
 mostlyclean:
 	rm -rf $(MOSTLYCLEAN)
 clean:
 	rm -f *.a $(MOSTLYCLEAN)
 distclean: clean
-	rm -rf Makefile config.status sysdep.h TAGS
+	rm -rf Makefile config.status TAGS config.cache config.h
 clobber realclean: distclean
 
 # Mark everything as depending on config.status, since the timestamp on
@@ -188,8 +188,11 @@ install:
 	$(INSTALL_DATA) $(TARGETLIB) $(libdir)/libopcodes.a
 	$(RANLIB) $(libdir)/libopcodes.a
 
-Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
-	$(SHELL) ./config.status
+Makefile: $(srcdir)/Makefile.in config.status
+	$(SHELL) config.status
+
+config.status : configure $(srcdir)/../bfd/configure.host $(srcdir)/../bfd/config.bfd
+	$(SHELL) config.status --recheck
 
 dep: $(CFILES)
 	mkdep $(CFLAGS) $?
diff --git a/opcodes/configure b/opcodes/configure
index 3b24f9c..8e9d0ea 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -434,7 +434,7 @@ fi
 . ${srcdir}/../bfd/configure.host
 
 echo $ac_n "checking for CC""... $ac_c" 1>&6
-test -z "$CC" && CC=`egrep '^CC *=' ../Makefile | tail -1 | sed 's/^CC *= *//'`
+test -z "$CC" && test -r ../Makefile && CC=`egrep '^CC *=' ../Makefile | tail -1 | sed 's/^CC *= *//'`
 test -z "$CC" && CC=cc
 echo "$ac_t""setting CC to $CC" 1>&6
 
@@ -460,6 +460,7 @@ fi
 rm -f conftest*
 
 
+
 AR=${AR-ar}
 
 # Extract the first word of "ranlib", so it can be a program name with args.
@@ -577,7 +578,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 581 "configure"
+#line 582 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -591,7 +592,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 595 "configure"
+#line 596 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -624,7 +625,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 628 "configure"
+#line 629 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -989,6 +990,7 @@ s%@exec_prefix@%$exec_prefix%g
 s%@prefix@%$prefix%g
 s%@program_transform_name@%$program_transform_name%g
 s%@CC@%$CC%g
+s%@HDEFINES@%$HDEFINES%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
diff --git a/opcodes/configure.in b/opcodes/configure.in
index c7372aa..0af46fc 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -29,8 +29,16 @@ esac])dnl
 
 # host-specific stuff:
 
+. ${srcdir}/../bfd/configure.host
+
 AC_PROG_CC
+AC_SUBST(CFLAGS)
+AC_SUBST(HDEFINES)
+AR=${AR-ar}
+AC_SUBST(AR)
 AC_PROG_RANLIB
+AC_PROG_INSTALL
+
 AC_CHECK_HEADERS(string.h strings.h)
 
 AC_CONFIG_AUX_DIR(`cd $srcdir/..;pwd`)
@@ -43,18 +51,6 @@ if test -z "$host" ; then
 fi
 AC_ARG_PROGRAM
 
-. ${srcdir}/../bfd/configure.host
-
-if test -f ${srcdir}/../bfd/config/${my_host}.mh ; then
-	host_makefile_frag=${srcdir}/../bfd/config/${my_host}.mh
-	frags=${host_makefile_frag}
-else
-	host_makefile_frag=/dev/null
-	frags=
-fi
-AC_SUBST_FILE(host_makefile_frag)
-AC_SUBST(frags)
-
 # target-specific stuff:
 
 # Canonicalize the secondary target names.