Change subdir processing so that SUBDIRS will contain the configured

subdirs only for the makefile in the directory with the configure
script, and will have only $(LOCAL_SUBDIRS) elsewhere.  Drop the use
of "MY_SUBDIRS=." to override SUBDIRS in favor of this way of keeping
SUBDIRS empty.  Drop other uses of MY_SUBDIRS in favor of
LOCAL_SUBDIRS or (in one case, the top level) overriding the SUBDIRS
setting from pre.in.

One less thing to keep tweaking as configure scripts get reorganized
and merged.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16158 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index add07d89fb897ba01ac9161a67ffa6210d679ebc..22ee3073da621904e1fbc511f75903faf24713ee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (SUBDIRS): Renamed from MY_SUBDIRS.
+
 2004-03-07  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Look for tclConfig.sh in

diff --git a/src/Makefile.in b/src/Makefile.in
index fa8983410d01186a23714bb8e44f8665a557df65..1918d0b038d84b991627fc7a5f2bf26320cb3b7b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,7 @@ datadir=@datadir@
 thisconfigdir=.
 myfulldir=.
 mydir=.
-MY_SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
+SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
        config-files gen-manpages
 BUILDTOP=$(REL)$(C)
 LOCALINCLUDES = -I$(srcdir) 

diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 265179e7831ad2dee128deec7035291d56638c3d..fb9776a92c7e38849fb730ba65925532eef1a8b0 100644 (file)
--- a/src/appl/ChangeLog
+++ b/src/appl/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2004-02-09  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for sys/time.h and time.h.

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 9c8df958bb48ed55361aa0882172a476142d947f..2a7d80aea9fc84bca9d04e7db274db2afb2f1993 100644 (file)
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -3,5 +3,5 @@ myfulldir=appl
 mydir=.
 BUILDTOP=$(REL)..
 
-MY_SUBDIRS= sample simple user_user bsd gss-sample gssftp telnet
+LOCAL_SUBDIRS= sample simple user_user gss-sample
 

diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index d3bf699826931e6e324e5adab2af541e26310625..b641880dba576ac7c7bff5dae936da69efd2740f 100644 (file)
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2003-02-26  Jeffrey Altman <jaltman@mit.edu>
 
     * gss-client.c: merge if (this) if (that) into if (this && that)

diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index e3d71af0f9c0ec9b7d669c0d92878c0c1ecce04a..7ef17fde686cfabd1312887f2e09cd1a12635376 100644 (file)
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=appl/gss-sample
 mydir=gss-sample
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/sample/ChangeLog b/src/appl/sample/ChangeLog
index 5ba334d2935cc9a0ba7c7f5d3519371dbf6c654d..404dce1304d076429f661cf9beb6c4b7fb83e015 100644 (file)
--- a/src/appl/sample/ChangeLog
+++ b/src/appl/sample/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index b26fff2643565d8d2d9b769909df1c1af7b36709..a580359e4a189728625e4e28880e2baf788365f4 100644 (file)
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
 myfulldir=appl/sample
 mydir=sample
-MY_SUBDIRS = sclient sserver
+LOCAL_SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..

diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 9263c7a534af06dede5d7f987da2a1127fe3aff8..51a10942bd6a9a51e4c1e1dc3da0e731278ad2d1 100644 (file)
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 6906bbf12c867cf80abc9125173aa10d4f4af8d1..868f678eb6e62064b78f6e53ba92652e91c5f44f 100644 (file)
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./../..
 myfulldir=appl/sample/sclient
 mydir=sample/sclient
-MY_SUBDIRS=.
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 838c0a33a98b28fd3e3099afca68aa59f559bfe3..902f203e3ce27893c7b3b44d5d6e1cd322e1bf57 100644 (file)
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 0f59b0af99e034250be03443efe0e0a4ca1da39b..32e8864efa6d3bb2b33a9f2b40f986b511339dbf 100644 (file)
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./../..
 myfulldir=appl/sample/sserver
 mydir=sample/sserver
-MY_SUBDIRS=.
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog
index 80bba459b88710117176e755bba7785f56cf63a7..9c9da9569657d331335bff2f3f141cb390fc1602 100644 (file)
--- a/src/appl/simple/ChangeLog
+++ b/src/appl/simple/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index fb3375491793623b91b5f0fb01e778f154e059f9..9e6f16da2eab818346982fd5045857b1209be19e 100644 (file)
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
 myfulldir=appl/simple
 mydir=simple
-MY_SUBDIRS = client server
+LOCAL_SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..

diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 76c08d5597d35b4b009a17eecec5f5d1ba4e66bb..29b95a64fed8db6f1e35b497274ee99b65cc586c 100644 (file)
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index e97c5fe102a4fe961a1e88c454a54ee4d2606570..c7023ca1d16c672d9dae36d1d91503ec6542f22e 100644 (file)
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./../..
 myfulldir=appl/simple/client
 mydir=simple/client
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index d6431aa3357f0cc46dfd60528c4826d4b70d224d..67d2769e4b402eead65ef4d1d833e1d152ecd0bb 100644 (file)
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 1c405371f6651579f9ca8959e43e899035dfde66..d670edaa724689154066db8c4efe716c9c69a45e 100644 (file)
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./../..
 myfulldir=appl/simple/server
 mydir=simple/server
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..

diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 147d9c2939aa7fdc96cb927312972ed2c607bfd1..308df58d1d3c270cebf876a90b4cba6f0eccb1e8 100644 (file)
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
        * server.c: Include port-sockets.h.

diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 782311b44c975ba89f7282b2b1183866249de21c..e55eda8a2131fac8bc8a7f7c94fffb8e8ec0cea1 100644 (file)
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=appl/user_user
 mydir=user_user
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 502fc4b7d0165b028660538c72947a101b91f720..80d6a9b7f8581004a21d7481019c56aab88fac94 100644 (file)
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2003-06-27  Jen Selby <jenselby@mit.edu>
 
        * kdc.conf.M: replaced the @LOCALSTATEDIR typos with

diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in
index f25789da864297be4f396c0a2f994475ea513b00..378438e133fa3fd5dabb2cf4eaea3b8139d03ed9 100644 (file)
--- a/src/config-files/Makefile.in
+++ b/src/config-files/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=config-files
 mydir=config-files
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 all::
 

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 20a11c3309eb02fca5407440b9d333580472c935..d93a5453842349bfa95c93d307112ce12c32a2ea 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * pre.in (SUBDIRS): Use autoconf substitution trick to make
+       SUBDIRS contain @subdirs@ only for the directory containing the
+       configure script, and only LOCAL_SUBDIRS elsewhere.
+
+       * post.in (RECURSE_TARGETS): Drop MY_SUBDIRS support.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
        * pre.in (APPUTILS_DEPLIB, APPUTILS_LIB): New vars.

diff --git a/src/config/post.in b/src/config/post.in
index 85f6bb9827c5f35c5758efe4794e7c6cc4796d89..26d5aa176d029ab767b545d0848b8bc1dabe1858 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -168,11 +168,7 @@ RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
 $(RECURSE_TARGETS):
        @case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \
                in *[ik]*) e="status=1" ;; *) e="exit 1";; esac; \
-       if test -z "$(MY_SUBDIRS)" ; then \
-               do_subdirs="$(SUBDIRS)" ; \
-       else \
-               do_subdirs="$(MY_SUBDIRS)" ; \
-       fi; \
+       do_subdirs="$(SUBDIRS)" ; \
        status=0; \
        if test -n "$$do_subdirs" && test -z "$(NORECURSE)"; then \
        for i in $$do_subdirs ; do \

diff --git a/src/config/pre.in b/src/config/pre.in
index 6b20fc769321f74353a717886f5126a337903748..67930b240520e121e6c134c0d88444849c9c8bac 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -131,7 +131,10 @@ C=./
 # "/" for UNIX, "\" for Windows; *sigh*
 S=/
 
-SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
+#SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
+SUBDIRS_@top_srcdir@ = @subdirs@
+SUBDIRS = $(SUBDIRS_@srcdir@) $(LOCAL_SUBDIRS)
+#
 srcdir = @srcdir@
 SRCTOP = @srcdir@/$(BUILDTOP)
 VPATH = @srcdir@

diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog
index 48ccebcd4d797a87d9bc52fef4bb4f9a8fd8928f..7c7cb1a1cb05c6b4455ba7c6125e201591388164 100644 (file)
--- a/src/gen-manpages/ChangeLog
+++ b/src/gen-manpages/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in
index ab99fcdb5eebd1681ba09030e37fc7cca8fbe2eb..a005278b50f3e7d5889627fd0ddbe79c535a9032 100644 (file)
--- a/src/gen-manpages/Makefile.in
+++ b/src/gen-manpages/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=gen-manpages
 mydir=gen-manpages
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 all::
 

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 0fd2369ab2086dfbe3ab2413405a1cdf5f3faba8..6b2ba91abd42bc3c510ffd683d560fcf663caf94 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2004-03-05  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5.hin (krb5_kt_register): Ops table is now const.

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index a7fb55772ab87675a68f478f2a5807b817ee39cd..a54505982d10a82cfcf57f56da6d2f50f3896b9c 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=.
 myfulldir=include
 mydir=.
-MY_SUBDIRS=krb5 @maybe_kerberosIV@
+LOCAL_SUBDIRS=krb5 @maybe_kerberosIV@
 BUILDTOP=$(REL)..
 ##DOSBUILDTOP = ..
 NO_OUTPRE=1

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 226443b38b7535de311ebfb0fc21c8a99bb605f5..d05f70d38445f0b69a0966120ebb976af5f1ea5d 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2003-09-23  Jeffrey Altman  <jaltman@mit.edu>
 
        * krb.h: Modify the declaration of the CREDENTIALS structure to

diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in
index 9de938f5f29aa80b294594133a2e56f59a01d0e1..785484f9181f9ea97518c70206b6a65676c43f69 100644 (file)
--- a/src/include/kerberosIV/Makefile.in
+++ b/src/include/kerberosIV/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=include/kerberosIV
 mydir=kerberosIV
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 KRB4_HEADERS=krb.h des.h mit-copyright.h
 

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 09f6dad99c4e08bf035df59c7af1e84dc035e614..9edf7e4813a64e2bf1bd69080f3681de68b74c54 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2003-08-26  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-config.h: Unused file deleted.

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 037130a905c12b9ee282bf30bf9aeb199fd9463b..bca7cd33fafbb5f1c802757c9588d532a13d787a 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./..
 myfulldir=include/krb5
 mydir=krb5
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 96af4b12a3ab08c6072f887e07a487b77507fe6b..617f06c9c0396ffeb78372cfc7f530631b9cc247 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2004-03-05  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Removed.  Directory configured from top level

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index d288b4fae0f093595e44a599ff3fbf70b00b575b..3a44b0fea116f850cda7f6cc7af98d08c88ae106 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=..
 myfulldir=kdc
 mydir=kdc
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 # -DUSE_RCACHE - enable replay cache for KDC
 # -DNOCACHE    - disable lookaside cache, which is used to resend previous

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 0e621f2d604af9d6023371b2423955b475dd7aa6..f1f2548b03136039f44ad51f813008b1f6b17c19 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2004-03-05  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Removed.  Directory configured from top level

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 3f17f89267f0952064a457edb97a0e62336e093b..68e7b361378d34b9562528388ec2b9939459378d 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=..
 myfulldir=krb524
 mydir=krb524
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 # Copyright 1994 by OpenVision Technologies, Inc.
 # 

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index f27894cdd037ef7afededbd8f514c05c7b75ea90..80e49d9fc9bbb355dd4d3b2fb6f175b4f3e814a6 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2004-02-26  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (MY_SUBDIRS): Add apputils.

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 54e20c2bfca01248237aef9d934ba2ff0e3e6420..04659d08aa938fd0d1ee9bfe6193302d09959088 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib
 mydir=lib
-MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
+LOCAL_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
 BUILDTOP=$(REL)..
 
 MAC_SUBDIRS = crypto krb5 gssapi

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 41cae76aab196ff5c2e6213f8d30f3661e88c228..4b5678634f318a2b1e995da90d0db2146f5a9e6c 100644 (file)
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2004-03-05  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Removed.  Directory configured from top level

diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 1f97c8d7c08a0844ffa08dbbc5530aa20ba0a8df..bca4663a73282d64296bd366d07d64ad13b63631 100644 (file)
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=..
 myfulldir=slave
 mydir=slave
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 5639956fa11b3c56552ce4e1b9245091b1fdaa01..d86f53b7eb158c346a9065183f82f35de629a56b 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
 2004-03-05  Ken Raeburn  <raeburn@mit.edu>
 
        * reconf: Delete autom4te.cache directories after running

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index dc5d9ddce90a0a6dcf010db7d4185db1c00e78f9..f5207181c4683e2cc9c8cde697f304ef9f680155 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -6,7 +6,7 @@ mydir=util
 ##WIN32### configure scripts.  The set of subdirs to use is hard-coded
 ##WIN32### below in the 'all-windows' target anyways, so just hide this.
 ##WIN32##!if 0
-MY_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
+LOCAL_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
        profile pty $(MAYBE_DB_@DB_VERSION@) send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..

diff --git a/src/util/send-pr/ChangeLog b/src/util/send-pr/ChangeLog
index 2be0b368d440d4163c8beade9c4fe8e28b7a0a04..4ae543edfe4e70631c4a825d260b17228ef3db0c 100644 (file)
--- a/src/util/send-pr/ChangeLog
+++ b/src/util/send-pr/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index bee786f580c06d35f845ad171d609320af835a7a..5a27fcbf0b630298a651008b1c4133c1f7c1349c 100644 (file)
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,7 +1,6 @@
 thisconfigdir=./../..
 myfulldir=util/send-pr
 mydir=util/send-pr
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 #
 # Makefile for building a standalone send-pr.

diff --git a/src/windows/ms2mit/ChangeLog b/src/windows/ms2mit/ChangeLog
index d7ac6af443aa9f542f30c1ca94b884f1f81fc94d..992ba4f4ff66b0dd2fb10264cd49e6f6a9ab3a42 100644 (file)
--- a/src/windows/ms2mit/ChangeLog
+++ b/src/windows/ms2mit/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (MY_SUBDIRS): Deleted.
+
 2004-01-31  Jeffrey Altman <jaltman@mit.edu>
 
     * ms2mit.c: Do not allow ticket importing of the Initial TGT cannot

diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in
index 45004e14a44ebbcb5e9b9be35af1ef3e4ba43f5a..7314b987b7c8f45c42a16fc1891562b00b0b0086 100644 (file)
--- a/src/windows/ms2mit/Makefile.in
+++ b/src/windows/ms2mit/Makefile.in
@@ -5,7 +5,6 @@
 thisconfigdir=./..
 myfulldir=windows/ms2mit
 mydir=.
-MY_SUBDIRS=.
 BUILDTOP=$(REL)..$(S)..
 DEFINES = 
 PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)