* Makefile.in (MOSTLYCLEAN): Move config.log to distclean.

2 files changed, 21 insertions, 17 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7ffb62f..de99849 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct  3 15:59:12 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (MOSTLYCLEAN): Move config.log to distclean.
+
 Wed Oct  2 23:28:42 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10x00-opc.c, mn10x00-dis.c: New files for Matsushita
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 8b86368..b2cf018 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1,5 +1,6 @@
 #    Makefile template for Configure for the opcodes library.
-#    Copyright (C) 1990, 1991, 1992, 1995 Free Software Foundation, Inc.
+#    Copyright (C) 1990, 91, 92, 93, 94, 95, 1996
+#    Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -23,11 +24,11 @@ prefix = @prefix@
 
 program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+bindir = @bindir@
+libdir = @libdir@
 
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
+datadir = @datadir@
+mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -37,10 +38,8 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-oldincludedir =
-docdir = $(srcdir)/doc
+infodir = @infodir@
+includedir = @includedir@
 
 SHELL = /bin/sh
 
@@ -77,7 +76,7 @@ TARGETLIB = libopcodes.a
 # To circumvent a Sun make VPATH bug, each file listed here
 # should also have a foo.o: foo.c line further along in this file.
 
-ALL_MACHINES = a29k-dis.o alpha-dis.o h8300-dis.o h8500-dis.o \
+ALL_MACHINES = a29k-dis.o alpha-dis.o alpha-opc.o h8300-dis.o h8500-dis.o \
 	$(start-sanitize-arc) \
 	arc-dis.o arc-opc.o \
 	$(end-sanitize-arc) \
@@ -131,9 +130,9 @@ $(TARGETLIB): $(OFILES)
 	 $(RANLIB) $(TARGETLIB)
 
 LIBIBERTY_LISTS = ../libiberty/required-list ../libiberty/needed-list
-BFD_LIST = ../bfd/piclist
+BFD_PICLIST = @BFD_PICLIST@
 
-stamp-piclist: Makefile $(LIBIBERTY_LISTS) $(BFD_LIST)
+stamp-piclist: Makefile $(LIBIBERTY_LISTS) $(BFD_PICLIST)
 	rm -f tpiclist
 	if [ -n "$(PICFLAG)" ]; then \
 	  echo $(OFILES) | sed -e 's,\([^ ][^ ]*\),pic/\1,g' > tpiclist; \
@@ -147,7 +146,7 @@ stamp-piclist: Makefile $(LIBIBERTY_LISTS) $(BFD_LIST)
 	  fi; \
 	  lobjs=`echo $$lobjs | sed -e 's,\([^ ][^ ]*\),../libiberty/\1,g'`; \
 	  echo $$lobjs >> tpiclist; \
-	  sed -e 's,\([^ ][^ ]*\),../bfd/\1,g' $(BFD_LIST) >> tpiclist; \
+	  sed -e 's,\([^ ][^ ]*\),../bfd/\1,g' $(BFD_PICLIST) >> tpiclist; \
 	else true; fi
 	$(srcdir)/../move-if-change tpiclist piclist
 	touch stamp-piclist
@@ -217,7 +216,8 @@ sparc-opc.o: sparc-opc.c $(INCDIR)/opcode/sparc.h
 z8k-dis.o: z8k-dis.c z8k-opc.h $(INCDIR)/dis-asm.h
 ns32k-dis.o: ns32k-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/ns32k.h
 sh-dis.o: sh-dis.c sh-opc.h $(INCDIR)/dis-asm.h
-alpha-dis.o: alpha-dis.c alpha-opc.h $(INCDIR)/dis-asm.h
+alpha-dis.o: alpha-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/alpha.h
+alpha-opc.o: alpha-opc.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/alpha.h
 hppa-dis.o: hppa-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/hppa.h
 m88k-dis.o: m88k-dis.c $(INCDIR)/dis-asm.h $(INCDIR)/opcode/m88k.h
 arm-dis.o: arm-dis.c arm-opc.h $(INCDIR)/dis-asm.h
@@ -227,14 +227,14 @@ tags etags: TAGS
 TAGS: force
 	etags $(INCDIR)/*.h $(srcdir)/*.h $(srcdir)/*.c
 
-MOSTLYCLEAN = *.o core *.E *.p *.ip config.log pic/*.o
+MOSTLYCLEAN = *.o core *.E *.p *.ip pic/*.o
 mostlyclean:
 	rm -rf $(MOSTLYCLEAN)
 clean:
 	rm -f *.a $(MOSTLYCLEAN) $(SHLIB) $(SHLINK) piclist stamp-piclist
 distclean: clean
 	rm -rf Makefile config.status TAGS config.cache config.h stamp-h \
-	       pic stamp-picdir
+	       pic stamp-picdir config.log
 clobber realclean maintainer-clean: distclean
 
 # Mark everything as depending on config.status, since the timestamp on
@@ -271,7 +271,7 @@ install: $(ALLLIBS)
 	    ts=lib`echo $(SHLIB) | sed -e 's,^\.\./bfd/,,' -e 's/^lib//' | sed '$(program_transform_name)'`; \
 	    ln -sf $$ts $(libdir)/$$tf; \
 	  elif [ "$$f" = "$(SHLIB)" ]; then \
-	    $(INSTALL_PROGRAM) $$f $(libdir)/$$tf; \
+	    @INSTALL_SHLIB@ \
 	  else \
 	    $(INSTALL_DATA) $$f $(libdir)/$$tf; \
 	    $(RANLIB) $(libdir)/$$tf; \