From: David Edelsohn Date: Fri, 31 Jan 1997 15:20:26 +0000 (+0000) Subject: * aclocal.m4 (SIM_AC_COMMON): Move COMMON_MAKEFILE_FRAG from here. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cd89e778dcf8c563e61f00d0221e3179daee179;p=binutils-gdb.git * aclocal.m4 (SIM_AC_COMMON): Move COMMON_MAKEFILE_FRAG from here. (SIM_AC_OUTPUT): To here. --- diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index af74523d081..957a40e8756 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 31 07:16:49 1997 Doug Evans + + * aclocal.m4 (SIM_AC_COMMON): Move COMMON_MAKEFILE_FRAG from here. + (SIM_AC_OUTPUT): To here. + Fri Jan 24 10:37:17 1997 Stu Grossman (grossman@critters.cygnus.com) * aclocal.m4 (COMMON_MAKEFILE_FRAG): Quote a couple of $'s in diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4 index 69a3c155c34..e25c37bf0e8 100644 --- a/sim/common/aclocal.m4 +++ b/sim/common/aclocal.m4 @@ -1,8 +1,20 @@ # This file contains common code used by all simulators. -# SIM_AC_COMMON invokes AC macros used by all simulators and by the -# common directory. -# SIM_AC_OUTPUT is a cover function to AC_OUTPUT to use generate the -# Makefile in a target specific directory. +# +# SIM_AC_COMMON invokes AC macros used by all simulators and by the common +# directory. It is intended to be invoked before any target specific stuff. +# SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile. +# It is intended to be invoked last. +# +# The simulator's configure.in should look like: +# +# dnl Process this file with `autoconf -l ../common' to produce a configure script. +# AC_PREREQ(2.5)dnl +# AC_INIT(Makefile.in) +# SIM_AC_COMMON +# +# ... target specific stuff ... +# +# SIM_AC_OUTPUT AC_DEFUN(SIM_AC_COMMON, [ @@ -115,7 +127,19 @@ case "${target}" in ;; esac -dnl Stuff that gets inserted into the Makefile +]) dnl End of SIM_AC_COMMON + +dnl Generate the Makefile in a target specific directory. +dnl Substitutions aren't performed on the file in AC_SUBST_FILE, +dnl so this is a cover macro to tuck the details away of how we cope. +dnl It also inserts default definitions of the SIM_FOO variables. + +AC_DEFUN(SIM_AC_OUTPUT, +[ + +dnl Stuff that gets inserted into the Makefile. +dnl This is done now and not in SIM_AC_COMMON to catch updated values for +dnl LIBS, etc. that may get changed by target specific checks. COMMON_MAKEFILE_FRAG=makefile-temp-$$ cat > $COMMON_MAKEFILE_FRAG < stamp-h ;; esac