* 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.

1 files changed, 28 insertions, 25 deletions

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) $?