From c8cd6f237b0a1b8ed66e8fd73d1f239b5b6de340 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 21 Feb 1996 17:02:23 +0000 Subject: [PATCH] * Makefile.in (all): Simplify. (clean, mostlyclean): SUBDIRS may contain whitespace; fix the loop as in the all target. (distclean, maintainer-clean, realclean): Likewise. (install): Likewise. --- sim/ChangeLog | 12 ++++++++ sim/Makefile.in | 74 ++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 9c4ddb5d5eb..6616dee2abf 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,15 @@ +Wed Feb 21 11:59:57 1996 Ian Lance Taylor + + * Makefile.in (all): Simplify. + (clean, mostlyclean): SUBDIRS may contain whitespace; fix the loop + as in the all target. + (distclean, maintainer-clean, realclean): Likewise. + (install): Likewise. + +Thu Feb 15 18:37:00 1996 Fred Fish + + * Makefile.in (all): Remove extra '\' char from shell script. + Wed Feb 14 16:43:59 1996 Mike Meissner * Makefile.in (all): Avoid a for loop with zero elements, even if diff --git a/sim/Makefile.in b/sim/Makefile.in index 4879055bb5f..c09ee3c6e7a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -98,51 +98,49 @@ FLAGS_TO_PASS = \ "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 + @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 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 + @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 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 + @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 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 + @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) install); \ + else true; fi; \ + done info: install-info: -- 2.30.2