* Makefile.in, configure.in: converted to autoconf.

* configure: New file, generated with autconf 2.4.

4 files changed, 52 insertions, 89 deletions

diff --git a/sim/sh/.Sanitize b/sim/sh/.Sanitize
index 3ad8665..518da8b 100644
--- a/sim/sh/.Sanitize
+++ b/sim/sh/.Sanitize
@@ -27,6 +27,7 @@ Things-to-keep:
 
 ChangeLog
 Makefile.in
+configure
 configure.in
 interp.c
 gencode.c
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 924f9dd..c5742b4 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  5 14:32:54 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* Makefile.in, configure.in: converted to autoconf.
+	* configure: New file, generated with autconf 2.4.
+
 Fri Jun 30 16:51:38 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* interp.c (sim_open): If argument supplied, interpret as
diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index 5295aa2..cb27cd9 100644
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -1,5 +1,5 @@
-#    Makefile template for Configure for the h8300sim library.
-#    Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
+#    Makefile template for Configure for the SH sim library.
+#    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
@@ -16,14 +16,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-srcdir = .
-srcroot = $(srcdir)/../../
+VPATH = @srcdir@
+srcdir = @srcdir@
+srcroot = $(srcdir)/../..
 
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-prefix = /usr/local
-
-program_transform_name =
-exec_prefix = $(prefix)
+host_alias = @host_alias@
+target_alias = @target_alias@
+program_transform_name = @program_transform_name@
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 tooldir = $(libdir)/$(target_alias)
@@ -41,42 +43,44 @@ man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
 infodir = $(prefix)/info
 includedir = $(prefix)/include
-oldincludedir =
-docdir = $(srcdir)/doc
+docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
-
-
+# FIXME: use autoconf's AC_PROG_INSTALL
 INSTALL = $(srcroot)/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
-
-
-CC_FOR_BUILD = cc
 AR = ar
-AR_FLAGS = qc
+AR_FLAGS = rc
 CFLAGS = -g
 BISON = bison
 MAKEINFO = makeinfo
 RANLIB = ranlib
+
+.NOEXPORT
+MAKEOVERRIDES=
+
+CC_FOR_BUILD = cc
 X=xstuff.o
 XL=-lX11
 X=
 XL=
+
 INCDIR = $(srcdir)/../../include 
 CSEARCH = -I. -I$(srcdir)  -I../../include  \
   -I../../bfd -I$(INCDIR) -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb -I$(srcdir)/../../newlib/libc/sys/sh
 DEP = mkdep
 
-#### host, target, and site specific Makefile frags come in here.
+#### Makefile fragments come in here.
+# @host_makefile_frag@
+###
 
 all:	run libsim.a
 
-
 run:	interp.o $(X) run.o table.o
 	$(CC) $(CFLAGS) -o run $(X) interp.o table.o run.o ../../bfd/libbfd.a ../../libiberty/libiberty.a $(XL)
 
@@ -98,40 +102,15 @@ table.c:gencode
 gencode:gencode.c
 	$(CC_FOR_BUILD) -o gencode $(srcdir)/gencode.c
 
-
-#### host and target dependent Makefile fragments come in here.
-###
-
-FLAGS_TO_PASS = \
-	"against=$(against)" \
-	"AR=$(AR)" \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"CC=$(CC)" \
-	"CFLAGS=$(CFLAGS)" \
-	"RANLIB=$(RANLIB)" \
-	"MAKEINFO=$(MAKEINFO)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"BISON=$(BISON)"
-
 .c.o:
 	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
 
-
-
-.NOEXPORT:
-
 check:
 
 info:
 clean-info:
 install-info:
 
-# HDEPFILES comes from the host config; TDEPFILES from the target config.
-
-
-
 tags etags: TAGS
 
 TAGS: force
@@ -140,28 +119,9 @@ TAGS: force
 clean:
 	rm -f *.[oa] *~ core *.E *.p *.ip aout-params.h gen-aout
 
-clobber realclean: clean
+distclean mostlyclean realclean: clean
 	rm -f libbfd.a TAGS
 
-# Mark everything as depending on config.status, since the timestamp on
-# sysdep.h might actually move backwards if we reconfig and relink it
-# to a different hosts/h-xxx.h file.  This will force a recompile anyway.
-RECONFIG = config.status
-
-
-
-# This target should be invoked before building a new release.
-# 'VERSION' file must be present and contain a string of the form "x.y"
-#
-roll:
-	@V=`cat VERSION`		; \
-	MAJ=`sed 's/\..*//' VERSION`	; \
-	MIN=`sed 's/.*\.//' VERSION`	; \
-	V=$$MAJ.`expr $$MIN + 1`	; \
-	rm -f VERSION			; \
-	echo $$V >VERSION		; \
-	echo Version $$V
-
 # Dummy target to force execution of dependent targets.
 #
 force:
@@ -182,13 +142,15 @@ install-man: run.1
 	$(INSTALL_XFORM1) $(srcdir)/run.1 $(man1dir)/run.1
 
 
-Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
+Makefile: Makefile.in config.status @frags@
 	$(SHELL) ./config.status
 
+config.status: configure
+	$(SHELL) ./config.status --recheck
+
 dep: $(CFILES)
 	mkdep $(CFLAGS) $?
 
-
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
@@ -196,4 +158,3 @@ dep: $(CFILES)
 
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-
diff --git a/sim/sh/configure.in b/sim/sh/configure.in
index 32afd98..fc7ffb5 100644
--- a/sim/sh/configure.in
+++ b/sim/sh/configure.in
@@ -1,36 +1,32 @@
-# This file is a shell script that supplies the information necessary
-# to tailor a template configure script into the configure script
-# appropriate for this directory.  For more information, check any
-# existing configure script.
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.3)dnl
+AC_INIT(Makefile.in)
 
-srctrigger=interp.c
-srcname="shsim"
-
-# per-host:
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
+AC_CANONICAL_SYSTEM
+AC_ARG_PROGRAM
 
 . ${srcdir}/../../bfd/configure.host
 
 # Set up to make a link between the host's include file and "sysdep.h".
 files="../../bfd/hosts/${my_host}.h"
-
-links="sysdep.h"
-
-if [ ! -f ${srcdir}/${files} ] ; then
+if test ! -f ${srcdir}/${files} ; then
 	files=../../bfd/hosts/std-host.h
-	echo "[${srcname} has no specific support for host ${host} -- using std-host]"
+	AC_MSG_WARN(shsim has no specific support for host ${host} -- using std-host)
 fi
+AC_LINK_FILES($files, sysdep.h)
 
-host_makefile_frag=
-if [ -f ${srcdir}/../../bfd/config/${my_host}.mh ] ; then
+if test -f ${srcdir}/../../bfd/config/${my_host}.mh; then
 	host_makefile_frag=../../bfd/config/${my_host}.mh
+else
+	host_makefile_frag=/dev/null
 fi
 
-# per-target:
-
-
-case "${target}" in
-  sh-*-*)		sim_target=sh ;;
-  shl-*-*)		sim_target=shl ;;
-esac
+frags=
+if test $host_makefile_frag != /dev/null; then
+	frags="$frags $host_makefile_frag"
+fi
+AC_SUBST_FILE(host_makefile_frag)
+AC_SUBST(frags)
 
-target_makefile_frag=${sim_target}.mt
+AC_OUTPUT(Makefile)