From 91ac76b92bb3fffa623522772c5908802b36e0bf Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 22 Oct 1996 01:25:25 +0000 Subject: [PATCH] * aclocal.m4: Fix CopySrcHeader and CopyHeader so they actually generate dependencies for the files they're copying to. Also, fix up DO_SUBDIRS to work with new recursion methods. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9231 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 6 ++++++ src/aclocal.m4 | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0fec6f560..e2c0a3bdc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 21 21:19:53 1996 Tom Yu + + * aclocal.m4: Fix CopySrcHeader and CopyHeader so they actually + generate dependencies for the files they're copying to. Also, fix + up DO_SUBDIRS to work with new recursion methods. + Mon Oct 7 15:07:38 1996 Ezra Peisach * configure.in: Add AC_KRB5_TCL so configure --help is useful. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 261b0aeb2..edd4b43d4 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -64,8 +64,11 @@ dnl DO_SUBDIRS dnl recurse into subdirs by specifying the recursion targets dnl the rules are in post.in but the target needs substitution AC_DEFUN([DO_SUBDIRS], -[RECURSE_TARGETS="all-unix clean-unix install-unix check-unix Makefiles" -AC_SUBST(RECURSE_TARGETS)]) +[ALL_RECURSE="all-recurse" +CLEAN_RECURSE="clean-recurse" +INSTALL_RECURSE="install-recurse" +CHECK_RECURSE="check-recurse" +MAKEFILES_RECURSE="Makefiles-recurse"]) dnl dnl drop in standard rules for all configure files -- CONFIG_RULES dnl @@ -82,6 +85,11 @@ AC_CONST dnl WITH_NETLIB dnl KRB_INCLUDE dnl AC_ARG_PROGRAM dnl +AC_SUBST(ALL_RECURSE) +AC_SUBST(CLEAN_RECURSE) +AC_SUBST(INSTALL_RECURSE) +AC_SUBST(CHECK_RECURSE) +AC_SUBST(MAKEFILES_RECURSE) ])dnl dnl This is somewhat gross and should go away when the build system @@ -399,7 +407,8 @@ dnl define(CopyHeader,[ AC_PUSH_MAKEFILE()dnl -includes:: $1 +includes:: $2/$1 +$2/$1: $1 @if test -d $2; then :; else (set -x; mkdir $2) fi @if cmp $1 $2/$1 >/dev/null 2>&1; then :; \ else \ @@ -417,7 +426,8 @@ dnl define(CopySrcHeader,[ AC_PUSH_MAKEFILE()dnl -includes:: $1 +includes:: $2/$1 +$2/$1: $(srcdir)/$1 @if test -d $2; then :; else (set -x; mkdir $2) fi @if cmp $(srcdir)/$1 $2/$1 >/dev/null 2>&1; then :; \ else \ -- 2.26.2