From cf71d299e7c5b7ab2b6e00f5b41defad3944d16f Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 22 Oct 1996 01:25:44 +0000 Subject: [PATCH] * pre.in: Substitute for *_RECURSE variables * post.in: Add *-recurse targets for new recursion method. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9232 dc483132-0cff-0310-8789-dd5450dbe970 --- src/config/ChangeLog | 6 ++++++ src/config/post.in | 13 +++++-------- src/config/pre.in | 20 ++++++++++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 91400f91c..c2b352509 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 21 21:21:43 1996 Tom Yu + + * pre.in: Substitute for *_RECURSE variables. + + * post.in: Add *-recurse targets for new recursion method. + Fri Oct 18 11:03:24 1996 Barry Jaspan * pre.in (DEJAFLAGS): s/:=/=/ [PR #117] diff --git a/src/config/post.in b/src/config/post.in index c23ccd694..277f92b45 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -37,6 +37,7 @@ clean-windows:: $(RM) msvc.pdb *.err Makefiles:: Makefile +Makefiles:: $(MAKEFILES_RECURSE) Makefile: $(srcdir)/Makefile.in $(thisconfigdir)/config.status \ $(SRCTOP)/config/pre.in $(SRCTOP)/config/post.in @@ -50,16 +51,12 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \ --localdir=$(BUILDTOP) \ --macrodir=$(BUILDTOP)/util/autoconf -#These don't work well with some versions of GNU make. -#all-unix clean-unix install-unix check-unix Makefiles:: -# @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \ -# *[ik]*) e=:;; *) e="exit 1";; esac; - -@RECURSE_TARGETS@:: - @e="exit 1"; \ +all-recurse clean-recurse install-recurse check-recurse Makefiles-recurse: + @case "`echo '$(MFLAGS)'|sed -e 's/ --.*$$//'`" in \ + *[ik]*) e=:;; *) e="exit 1";; esac; \ for i in $(SUBDIRS) ; do \ if test -d $$i ; then \ - target=`echo $@|sed s/-unix//`; \ + target=`echo $@|sed s/-recurse//`; \ echo "making $$target in $(CURRENT_DIR)$$i..."; \ if (cd $$i ; $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \ CURRENT_DIR=$(CURRENT_DIR)$$i/ $$target) then :; \ diff --git a/src/config/pre.in b/src/config/pre.in index 893e1aad7..c2aea1b44 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -12,10 +12,19 @@ install:: install-$(WHAT) check:: check-$(WHAT) -all-unix:: -clean-unix:: -install-unix:: -check-unix:: +# +# set up some variables for use in recursion +# +ALL_RECURSE=@ALL_RECURSE@ +CLEAN_RECURSE=@CLEAN_RECURSE@ +INSTALL_RECURSE=@INSTALL_RECURSE@ +CHECK_RECURSE=@CHECK_RECURSE@ +MAKEFILES_RECURSE=@MAKEFILES_RECURSE@ + +all-unix:: $(ALL_RECURSE) +clean-unix:: $(CLEAN_RECURSE) +install-unix:: $(INSTALL_RECURSE) +check-unix:: $(CHECK_RECURSE) # Directory syntax: R=/ @@ -159,3 +168,6 @@ all:: clean:: install:: check:: + +# +# end of pre.in -- 2.26.2