* configure.in: Call AC_CONFIG_HEADER. Don't try to use

	bfd/hosts/*.h file or bfd/config/*.mh file.  Call AC_PROG_CC and
	AC_PROG_RANLIB.  Substitute in values for CFLAGS, HDEFINES and AR.
	Call AC_CHECK_HEADERS for stdlib.h and time.h.  Touch stamp.h if
	creating config.h.
	* configure: Rebuild.
	* Makefile.in (AR): Define as @AR@.
	(CC): New variable, defined as @CC@.
	(CFLAGS): Define as @CFLAGS@.
	(RANLIB): Define as @RANLIB@.
	(HDEFINES, TDEFINES): New variables.
	(@host_makefile_frag@): Remove.
	(compile.o, run.o): Depend upon config.h.
	(mostlyclean): Make the same as clean, not distclean.
	(clean): Remove config.log.
	(distclean): Remove config.h and stamp-h.
	(Makefile): Don't depend upon @frags@.  Just rebuild Makefile when
	invoking config.status.
	(config.h, stamp-h): New targets.
	* compile.c: Include "config.h".  Don't include <sys/times.h>.
	Include <time.h> and <stdlib.h> if they exist.  Don't include
	"sysdep.h".
	(get_now): Remove unused local b.
	* run.c: Include "config.h".  Include <stdlib.h> if it exists.
	Don't include "sysdep.h".
	* writecode.c: Don't include "bfd.h" or "sysdep.h".  Include
	<stdio.h>.

5 files changed, 75 insertions, 36 deletions

diff --git a/sim/h8300/.Sanitize b/sim/h8300/.Sanitize
index 2887214..9e8ed06 100644
--- a/sim/h8300/.Sanitize
+++ b/sim/h8300/.Sanitize
@@ -27,6 +27,7 @@ Things-to-keep:
 
 ChangeLog
 Makefile.in
+config.in
 configure
 configure.in
 compile.c
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 3369867..dff87a1 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,5 +1,42 @@
+Fri Sep  8 12:18:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Call AC_CONFIG_HEADER.  Don't try to use
+	bfd/hosts/*.h file or bfd/config/*.mh file.  Call AC_PROG_CC and
+	AC_PROG_RANLIB.  Substitute in values for CFLAGS, HDEFINES and AR.
+	Call AC_CHECK_HEADERS for stdlib.h and time.h.  Touch stamp.h if
+	creating config.h.
+	* configure: Rebuild.
+	* Makefile.in (AR): Define as @AR@.
+	(CC): New variable, defined as @CC@.
+	(CFLAGS): Define as @CFLAGS@.
+	(RANLIB): Define as @RANLIB@.
+	(HDEFINES, TDEFINES): New variables.
+	(@host_makefile_frag@): Remove.
+	(compile.o, run.o): Depend upon config.h.
+	(mostlyclean): Make the same as clean, not distclean.
+	(clean): Remove config.log.
+	(distclean): Remove config.h and stamp-h.
+	(Makefile): Don't depend upon @frags@.  Just rebuild Makefile when
+	invoking config.status.
+	(config.h, stamp-h): New targets.
+	* compile.c: Include "config.h".  Don't include <sys/times.h>.
+	Include <time.h> and <stdlib.h> if they exist.  Don't include
+	"sysdep.h".
+	(get_now): Remove unused local b.
+	* run.c: Include "config.h".  Include <stdlib.h> if it exists.
+	Don't include "sysdep.h".
+	* writecode.c: Don't include "bfd.h" or "sysdep.h".  Include
+	<stdio.h>.
+
+Thu Aug  3 10:45:37 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Update all FSF addresses except those in COPYING* files.
+
 Wed Jul  5 14:32:54 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
+	* Makefile.in (clean): Remove run.
+	(distclean): Remove Makefile.
+
 	* h8300.mt: Removed.
 
 	* Makefile.in, configure.in: converted to autoconf.
diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 8020a34..9b1cb3f 100644
--- a/sim/h8300/Makefile.in
+++ b/sim/h8300/Makefile.in
@@ -14,7 +14,7 @@
 # 
 # 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.
 
 VPATH = @srcdir@
 srcdir = @srcdir@
@@ -54,12 +54,16 @@ INSTALL_DATA = $(INSTALL)
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
-AR = ar
+AR = @AR@
 AR_FLAGS = rc
-CFLAGS = -g
+CC = @CC@
+CFLAGS = @CFLAGS@
 BISON = bison
 MAKEINFO = makeinfo
-RANLIB = ranlib
+RANLIB = @RANLIB@
+
+HDEFINES = @HDEFINES@
+TDEFINES =
 
 .NOEXPORT:
 MAKEOVERRIDES=
@@ -68,17 +72,13 @@ INCDIR = $(srcdir)/../../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR) -I../../bfd -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb
 DEP = mkdep
 
-#### Makefile fragments come in here.
-# @host_makefile_frag@
-###
-
 all:	run
 
 run:	compile.o run.o
 	$(CC) -o run compile.o  run.o ../../bfd/libbfd.a ../../libiberty/libiberty.a
 
-compile.o:compile.c
-run.o:run.c 
+compile.o: compile.c config.h
+run.o: run.c config.h
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
@@ -94,12 +94,13 @@ tags etags: TAGS
 TAGS: force
 	etags $(INCDIR)/*.h $(srcdir)/*.h $(srcdir)/*.c
 
-clean:
+mostlyclean clean:
 	rm -f *.[oa] *~ core *.E *.p *.ip aout-params.h gen-aout
+	rm -f run config.log
 
-distclean mostlyclean realclean: clean
+distclean realclean: clean
 	rm -f TAGS
-	rm -f config.log config.cache config.status
+	rm -f Makefile config.log config.cache config.status config.h stamp-h
 
 # Dummy target to force execution of dependent targets.
 #
@@ -118,8 +119,12 @@ install:
 	else true; fi
 
 
-Makefile: Makefile.in config.status @frags
-	$(SHELL) ./config.status
+Makefile: Makefile.in config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h: stamp-h ; @true
+stamp-h: config.in config.status
+	CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
 
 config.status: configure
 	$(SHELL) ./config.status --recheck
diff --git a/sim/h8300/configure.in b/sim/h8300/configure.in
index b7a9592..aea2a8d 100644
--- a/sim/h8300/configure.in
+++ b/sim/h8300/configure.in
@@ -2,31 +2,22 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.3)dnl
 AC_INIT(Makefile.in)
 
+AC_CONFIG_HEADER(config.h:config.in)
+
 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"
-if test ! -f ${srcdir}/${files} ; then
-	files=../../bfd/hosts/std-host.h
-	AC_MSG_WARN(h8300sim has no specific support for host ${host} -- using std-host)
-fi
-AC_LINK_FILES($files, sysdep.h)
-
-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
+AC_PROG_CC
+AC_SUBST(CFLAGS)
+AC_SUBST(HDEFINES)
+AR=${AR-ar}
+AC_SUBST(AR)
+AC_PROG_RANLIB
 
-frags=
-if test $host_makefile_frag != /dev/null; then
-	frags="$frags $host_makefile_frag"
-fi
-AC_SUBST_FILE(host_makefile_frag)
-AC_SUBST(frags)
+AC_CHECK_HEADERS(stdlib.h time.h)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile,
+[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
diff --git a/sim/h8300/run.c b/sim/h8300/run.c
index 8078025..9784126 100644
--- a/sim/h8300/run.c
+++ b/sim/h8300/run.c
@@ -18,10 +18,15 @@
 
 */
 
+#include "config.h"
+
 #include <varargs.h>
 #include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include "getopt.h"
 #include "bfd.h"
-#include "sysdep.h"
 #include "remote-sim.h"
 
 void usage();