From 19c5af72af453ea3e65148392b19cf435505386f Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Tue, 4 Feb 1997 21:42:27 +0000 Subject: [PATCH] * Makefile.in (@COMMON_MAKEFILE_FRAG): Use COMMON_{PRE,POST}_CONFIG_FRAG instead. * configure.in: sinclude ../common/aclocal.m4. * configure: Regenerated. --- sim/d10v/ChangeLog | 7 ++ sim/d10v/configure.in | 3 +- sim/erc32/configure.in | 3 +- sim/h8300/configure.in | 3 +- sim/mips/ChangeLog | 7 ++ sim/mips/Makefile.in | 4 +- sim/mips/configure | 205 ++++----------------------------------- sim/mips/configure.in | 3 +- sim/mn10300/configure.in | 3 +- 9 files changed, 46 insertions(+), 192 deletions(-) diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 7ead91dba7c..3539dfccabf 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 4 13:33:30 1997 Doug Evans + + * Makefile.in (@COMMON_MAKEFILE_FRAG): Use + COMMON_{PRE,POST}_CONFIG_FRAG instead. + * configure.in: sinclude ../common/aclocal.m4. + * configure: Regenerated. + Thu Jan 23 11:46:23 1997 Stu Grossman (grossman@critters.cygnus.com) * configure configure.in Makefile.in: Update to new configure diff --git a/sim/d10v/configure.in b/sim/d10v/configure.in index f822c9ef364..033b0bc1615 100644 --- a/sim/d10v/configure.in +++ b/sim/d10v/configure.in @@ -1,4 +1,5 @@ -dnl Process this file with `autoconf -l ../common' to produce a configure script. +dnl Process this file with autoconf to produce a configure script. +sinclude(../common/aclocal.m4) AC_PREREQ(2.5)dnl AC_INIT(Makefile.in) diff --git a/sim/erc32/configure.in b/sim/erc32/configure.in index 880b9fd0dcc..c139f713cd6 100644 --- a/sim/erc32/configure.in +++ b/sim/erc32/configure.in @@ -1,4 +1,5 @@ -dnl Process this file with `autoconf -l ../common' to produce a configure script. +dnl Process this file with autoconf to produce a configure script. +sinclude(../common/aclocal.m4) AC_PREREQ(2.5)dnl AC_INIT(Makefile.in) diff --git a/sim/h8300/configure.in b/sim/h8300/configure.in index ca16c6c1967..67a48825045 100644 --- a/sim/h8300/configure.in +++ b/sim/h8300/configure.in @@ -1,4 +1,5 @@ -dnl Process this file with `autoconf -l ../common' to produce a configure script. +dnl Process this file with autoconf to produce a configure script. +sinclude(../common/aclocal.m4) AC_PREREQ(2.5)dnl AC_INIT(Makefile.in) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 4b32c15461f..257cc23005a 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 4 13:33:30 1997 Doug Evans + + * Makefile.in (@COMMON_MAKEFILE_FRAG): Use + COMMON_{PRE,POST}_CONFIG_FRAG instead. + * configure.in: sinclude ../common/aclocal.m4. + * configure: Regenerated. + Fri Jan 31 11:11:45 1997 Ian Lance Taylor * configure: Rebuild after change to aclocal.m4. diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index ffac38942ab..31ef4f5e00b 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -1,13 +1,15 @@ # Makefile template for Configure for the MIPS simulator. # Written by Cygnus Support. +## COMMON_PRE_CONFIG_FRAG + SIM_OBJS = interp.o # FIXME: Hack to find syscall.h? Better support for syscall.h # is in progress. SIM_EXTRA_CFLAGS = -I$(srcdir)/../../newlib/libc/sys/idt SIM_EXTRA_CLEAN = clean-extra -@COMMON_MAKEFILE_FRAG@ +## COMMON_POST_CONFIG_FRAG interp.o: interp.c engine.c support.h config.h diff --git a/sim/mips/configure b/sim/mips/configure index f8b6a047011..b0f314e008a 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -1101,12 +1101,12 @@ else sim_link_files=../common/tconfig.in fi +# targ-vals.def points to the libc macro description file. case "${target}" in -*-*-*) - sim_link_files="${sim_link_files} ../common/nltvals.def" - sim_link_links="${sim_link_links} targ-vals.def" - ;; +*-*-*) TARG_VALS_DEF=../common/nltvals.def ;; esac +sim_link_files="${sim_link_files} ${TARG_VALS_DEF}" +sim_link_links="${sim_link_links} targ-vals.def" @@ -1325,179 +1325,7 @@ done - -COMMON_MAKEFILE_FRAG=makefile-temp-$$ -cat > $COMMON_MAKEFILE_FRAG <targ-vals.h - -targ-map.c: gentmap - rm -f targ-map.c - ./gentmap -c >targ-map.c - -install: install-common \$(SIM_EXTRA_INSTALL) - -install-common: - \$(INSTALL_XFORM) run \$(bindir)/run - -check: - -info: -clean-info: -install-info: - -tags etags: TAGS - -TAGS: force - etags *.c *.h - -clean: \$(SIM_EXTRA_CLEAN) - rm -f *.[oa] *~ core gentmap targ-map.c targ-vals.h - rm -f run libsim.a - -distclean mostlyclean maintainer-clean realclean: clean - rm -f TAGS - rm -f Makefile config.cache config.log config.status - rm -f tconfig.h config.h stamp-h targ-vals.def - -.c.o: - \$(CC) -c \$(ALL_CFLAGS) \$< - -# Dummy target to force execution of dependent targets. -force: - -Makefile: Makefile.in config.status - CONFIG_HEADERS= \$(SHELL) ./config.status - -config.status: configure - \$(SHELL) ./config.status --recheck - -config.h: stamp-h ; @true -stamp-h: config.in config.status - CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \$(SHELL) ./config.status - -# We can't add dependencies to configure because it causes too much trouble -# to end users if configure's timestamp is out of sync. -.PHONY: run-autoconf -run-autoconf: - cd \$(srcdir) && autoconf -l ../common -EOF - - - - - - trap '' 1 2 15 +trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -1598,7 +1426,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -1915,9 +1741,19 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - +case "x$CONFIG_FILES" in xMakefile*) + echo "Merging Makefile.sim+Make-common.sim into Makefile ..." + rm -f Makesim1.tmp Makesim2.tmp Makefile + sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' Makesim1.tmp + sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' Makesim2.tmp + sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \ + -e '/^## COMMON_POST_/ r Makesim2.tmp' \ + Makefile + rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp + ;; + esac case "x$CONFIG_HEADERS" in xconfig.h:config.in) echo > stamp-h ;; esac - + exit 0 EOF chmod +x $CONFIG_STATUS @@ -1925,6 +1761,3 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -rm $COMMON_MAKEFILE_FRAG - - diff --git a/sim/mips/configure.in b/sim/mips/configure.in index 638c58ced3e..938ba7fc425 100644 --- a/sim/mips/configure.in +++ b/sim/mips/configure.in @@ -1,4 +1,5 @@ -dnl Process this file with `autoconf -l ../common' to produce a configure script. +dnl Process this file with autoconf to produce a configure script. +sinclude(../common/aclocal.m4) AC_PREREQ(2.5)dnl AC_INIT(Makefile.in) diff --git a/sim/mn10300/configure.in b/sim/mn10300/configure.in index f822c9ef364..033b0bc1615 100644 --- a/sim/mn10300/configure.in +++ b/sim/mn10300/configure.in @@ -1,4 +1,5 @@ -dnl Process this file with `autoconf -l ../common' to produce a configure script. +dnl Process this file with autoconf to produce a configure script. +sinclude(../common/aclocal.m4) AC_PREREQ(2.5)dnl AC_INIT(Makefile.in) -- 2.30.2