* 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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 91400f91c7552a31d224e70a7811293c4036dfe7..c2b3525092ffea94cc8c56b16e55af6c1225fecf 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 21 21:21:43 1996  Tom Yu  <tlyu@mit.edu>
+
+       * pre.in: Substitute for *_RECURSE variables.
+
+       * post.in: Add *-recurse targets for new recursion method.
+
 Fri Oct 18 11:03:24 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * pre.in (DEJAFLAGS): s/:=/=/ [PR #117]

diff --git a/src/config/post.in b/src/config/post.in
index c23ccd694e1af3fc4607ec8ee45862e2ffd307b6..277f92b4586defc96440a09387067c35886a1832 100644 (file)
--- 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 893e1aad7547b1772a1e0c156523159746c67d61..c2aea1b440c8b2bfc1f337ac8f4f35d15164a1d9 100644 (file)
--- 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