From 9fc3ba754eb530a0f8be01788fae79f7539222ce Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Thu, 15 Feb 1996 23:46:30 +0000 Subject: [PATCH] Make configure work on first stage of HP/UX and Solaris. --- sim/ChangeLog | 12 ++- sim/Makefile.in | 261 +++++++++++------------------------------------- 2 files changed, 69 insertions(+), 204 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 951e6bb7dc2..9c4ddb5d5eb 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,12 @@ +Wed Feb 14 16:43:59 1996 Mike Meissner + + * Makefile.in (all): Avoid a for loop with zero elements, even if + the loop will not be executed because of an if statement. + +Wed Jan 31 21:48:34 1996 Fred Fish + + * Makefile.in (install): Add missing semicolon in "fi \". + Thu Nov 9 16:10:56 1995 Michael Meissner * Makefile.in (AR, CC, CFLAGS, CC_FOR_BUILD, RANLIB): Pick up @@ -6,7 +15,8 @@ Thu Nov 9 16:10:56 1995 Michael Meissner * configure.in: Pick up AR, CC, CFLAGS, CC_FOR_BUILD, RANLIB using configure defaults. (powerpc*-*-eabi*): Build simulator for all powerpc eabi targets - if we are using GCC to build with. + if either --enable-sim-powerpc is used, or the host compiler is + GCC. Wed Nov 8 15:46:49 1995 James G. Smith diff --git a/sim/Makefile.in b/sim/Makefile.in index 77a4003e23d..4879055bb5f 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -16,7 +16,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@ @@ -56,12 +56,13 @@ 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 -BISON = bison +CC = @CC@ +CFLAGS = @CFLAGS@ +CC_FOR_BUILD = @CC_FOR_BUILD@ MAKEINFO = makeinfo -RANLIB = ranlib +RANLIB = @RANLIB@ SUBDIRS = @subdirs@ @@ -73,9 +74,9 @@ INCDIR = $(srcdir)/../include CSEARCH = -I. -I$(srcdir) -I$(INCDIR) DEP = mkdep -ALL=all-nothing -CLEAN=clean-nothing -DO_INSTALL=install-nothing +# compilers to use to create programs which must be run in the build +# environment. +CC_FOR_BUILD = $(CC) #### Makefile fragments come in here. # @target_makefile_frag@ @@ -88,25 +89,61 @@ FLAGS_TO_PASS = \ "AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CFLAGS=$(CFLAGS)" \ "RANLIB=$(RANLIB)" \ "MAKEINFO=$(MAKEINFO)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "BISON=$(BISON)" - -all: $(ALL) - -clean: $(CLEAN) - -install: $(DO_INSTALL) - -mostlyclean: clean - -distclean realclean: clean + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" + +all: + @if [ x"${SUBDIRS}" != x ] ; then \ + rootme=`pwd` ; export rootme ; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + for dir in . ${SUBDIRS}; do \ + if [ "$$dir" = "." ]; then \ + true; \\ + elif [ -d $$dir ]; then \ + (cd $$dir; $(MAKE) $(FLAGS_TO_PASS)); \ + else true; fi; \ + done ; \ + else true; fi + +clean mostlyclean: + @if [ x"${SUBDIRS}" != x ] ; then \ + rootme=`pwd` ; export rootme ; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + for dir in ${SUBDIRS}; do \ + if [ -d $$dir ]; then \ + (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \ + else true; fi; \ + done ; \ + else true; fi + +distclean maintainer-clean realclean: + @if [ x"${SUBDIRS}" != x ] ; then \ + rootme=`pwd` ; export rootme ; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + for dir in ${SUBDIRS}; do \ + if [ -d $$dir ]; then \ + (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \ + else true; fi; \ + done ; \ + else true; fi rm -f Makefile config.cache config.log config.status +install: + @if [ x${SUBDIRS} != x ] ; then \ + rootme=`pwd` ; export rootme ; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + for dir in ${SUBDIRS}; do \ + if [ -d $$dir ]; then \ + (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) install); \ + else true; fi; \ + done; \ + else true; fi + info: install-info: dvi: @@ -118,193 +155,11 @@ dvi: check: installcheck: -### none - -all-nothing: force - -clean-nothing: force - -install-nothing: force - - -### z8k - -all-z8k: force - @if [ -f ./z8k/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./z8k ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-z8k: force - @if [ -f ./z8k/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - ( cd ./z8k ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-z8k: force - @if [ -f ./z8k/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./z8k ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - - -### h8300 - -all-h8300: force - @if [ -f ./h8300/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./h8300 ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-h8300: force - @if [ -f ./h8300/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - ( cd ./h8300 ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-h8300: force - @if [ -f ./h8300/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./h8300 ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - -### - -### h8500 - -all-h8500: force - @if [ -f ./h8500/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./h8500 ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-h8500: force - @if [ -f ./h8500/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - ( cd ./h8500 ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-h8500: force - @if [ -f ./h8500/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./h8500 ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - -### - -### sh - -all-sh: force - @if [ -f ./sh/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./sh ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-sh: force - @if [ -f ./sh/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./sh ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-sh: force - @if [ -f ./sh/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./sh ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - TAGS: -### - -### w65 - -all-w65: force - @if [ -f ./w65/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./w65 ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-w65: force - @if [ -f ./w65/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - ( cd ./w65 ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-w65: force - @if [ -f ./w65/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./w65 ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - - -### arm - -all-arm: force - @if [ -f ./arm/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./arm ; $(MAKE) $(FLAGS_TO_PASS) all) ; \ - else \ - true ; \ - fi - -install-arm: force - @if [ -f ./arm/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - ( cd ./arm ; $(MAKE) $(FLAGS_TO_PASS) install) ; \ - else \ - true ; \ - fi - -clean-arm: force - @if [ -f ./arm/Makefile ] ; then \ - rootme=`pwd` ; export rootme ; \ - ( cd ./arm ; $(MAKE) $(FLAGS_TO_PASS) clean) ; \ - else \ - true ; \ - fi - - force: - -# with the gnu make, this is done automatically. - -Makefile: Makefile.in config.status @frags@ +Makefile: Makefile.in config.status $(SHELL) ./config.status config.status: configure -- 2.30.2