Don't set LOCAL_SUBDIRS in many places and SUBDIRS in a few and

default SUBDIRS to LOCAL_SUBDIRS via pre.in.  Instead, just set
SUBDIRS in each directory, and don't do anything in pre.in.

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

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index abe6c0b26e26d36198e2e9acc3fb3f2237825174..02a1c73c53647fbcf4a8c0125dc3b452eebf0f77 100644 (file)
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -3,6 +3,6 @@ myfulldir=appl
 mydir=appl
 BUILDTOP=$(REL)..
 
-LOCAL_SUBDIRS= sample simple user_user gss-sample \
+SUBDIRS= sample simple user_user gss-sample \
        libpty bsd gssftp telnet
 

diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in
index 4ea8995e8915384361eaf413483ab77ae075cf38..959316fcbde5f7a6b24981ae9a17df9ae7971f3f 100644 (file)
--- a/src/appl/gssftp/Makefile.in
+++ b/src/appl/gssftp/Makefile.in
@@ -2,5 +2,5 @@ thisconfigdir=.
 myfulldir=appl/gssftp
 mydir=.
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=ftp ftpd
+SUBDIRS=ftp ftpd
 LDFLAGS = -g

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

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

diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in
index 32e41551ff72d5b63d6e67b3fdac078542d8bafd..716b4580bc8073435c5a06d3a272c081268b2b1d 100644 (file)
--- a/src/appl/telnet/Makefile.in
+++ b/src/appl/telnet/Makefile.in
@@ -2,4 +2,4 @@ thisconfigdir=.
 myfulldir=appl/telnet
 mydir=.
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=libtelnet telnet telnetd
+SUBDIRS=libtelnet telnet telnetd

diff --git a/src/ccapi/Makefile.in b/src/ccapi/Makefile.in
index 7cf80805524230ccd898760881816a57c05f0854..78e2a47fd3d7fd7f2eada7d8860990d5e083f2cf 100644 (file)
--- a/src/ccapi/Makefile.in
+++ b/src/ccapi/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=ccapi
 mydir=ccapi
 BUILDTOP=$(REL)..
 
-LOCAL_SUBDIRS= lib server test
+SUBDIRS= lib server test
 
 all-windows:: 
        @echo Making in ccapi\lib\win

diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in
index 1872615f3ce0ce221598b79069a99f9c2be77cc1..cc5d5c09cfd704f57126f4729f1edd8b68cec02c 100644 (file)
--- a/src/ccapi/common/Makefile.in
+++ b/src/ccapi/common/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=ccapi/common
 mydir=ccapi/common
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=unix
+SUBDIRS=unix
 
 SRCS= \
        cci_array_internal.c \

diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in
index cdbf74356b83a830f874ca22b583b548a4798608..76df8126f26daeb2d4e5e5fa813741cc6b8f5f83 100644 (file)
--- a/src/ccapi/lib/Makefile.in
+++ b/src/ccapi/lib/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=ccapi/lib
 mydir=ccapi/lib
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=unix
+SUBDIRS=unix
 LOCALINCLUDES=-I$(srcdir)/../common
 
 SHLIB_EXPDEPS= $(COM_ERR_DEPLIB)

diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in
index 149954b2de7f833a110641d3bc3d30c8a9f5476b..d7d9a4d1ed4e36ce9daba4980790af401e0aa4ed 100644 (file)
--- a/src/ccapi/server/Makefile.in
+++ b/src/ccapi/server/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=ccapi/server
 mydir=ccapi/server
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=unix
+SUBDIRS=unix
 
 LOCALINCLUDES= -I$(srcdir)/../common
 

diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index 007e363d693c4b033096003cacc4430b05b3f411..3a6af6ecb34ae0ef65d0c4a67eb9c3b8bc9913e1 100644 (file)
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=clients
 mydir=clients
 BUILDTOP=$(REL)..
 
-LOCAL_SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
+SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
 
 NO_OUTPRE=1
 all-windows::

diff --git a/src/config/pre.in b/src/config/pre.in
index 2f256fd9c9ac0c28498be554b4d60977dad92b7a..5c7e3140978c25057ce8d50159f7f1827ee7e8b9 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -136,7 +136,6 @@ C=./
 # "/" for UNIX, "\" for Windows; *sigh*
 S=/
 
-SUBDIRS = $(LOCAL_SUBDIRS)
 #
 srcdir = @srcdir@
 SRCTOP = @srcdir@/$(BUILDTOP)

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 4978985f0cd19a07561f63cd5e03dbe8b4929f25..61798d008f3124fcc16ab1cf81c305d2681f7bd1 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=..
 myfulldir=include
 mydir=include
-LOCAL_SUBDIRS=@maybe_kerberosIV@
+SUBDIRS=@maybe_kerberosIV@
 BUILDTOP=$(REL)..
 KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 ##DOSBUILDTOP = ..

diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 5c83425bc188d54116cd83407851f52b251f4662..e5b781084348dd932494521dd890cec9b3a29996 100644 (file)
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=..
 myfulldir=kadmin
 mydir=kadmin
 BUILDTOP=$(REL)..
-LOCAL_SUBDIRS = cli dbutil passwd ktutil server testing
+SUBDIRS = cli dbutil passwd ktutil server testing
 
 all::
 

diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index 16e892d3dd9f2060915a180e589615b7487d84dd..6a7aa1966c36cb1fe5efd5f76f920a2e41cf99cc 100644 (file)
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -7,7 +7,7 @@ DEFINES = -DUSE_KADM5_API_VERSION=1
 DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-LOCAL_SUBDIRS = unit-test
+SUBDIRS = unit-test
 
 PROG = kpasswd
 OBJS = tty_kpasswd.o kpasswd.o kpasswd_strings.o

diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index 9fae207bc30626af94f0c92c47309d6026223082..5b459950ca2dd3c7f7cf202f41aa96e873a3b45e 100644 (file)
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=kadmin/testing
 mydir=kadmin/testing
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS = scripts util
+SUBDIRS = scripts util
 
 all::
 

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index b1590df71fc060e8b1bb3c622bded5b027f9c287..9d139a744ede08c69a915aa2e99d105b3ea9733b 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib
 mydir=lib
-LOCAL_SUBDIRS=crypto krb5 des425 @KRB4@ gssapi rpc kdb kadm5 apputils
+SUBDIRS=crypto krb5 des425 @KRB4@ gssapi rpc kdb kadm5 apputils
 BUILDTOP=$(REL)..
 
 all-unix::

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index e0cbf8c34eb757bb0bbe5bc423c5373a33845126..c0415172107a1fb28f0fefe9e67db025d0f379e5 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=lib/crypto
 mydir=lib/crypto
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
+SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
        md4 md5 old raw sha1 arcfour yarrow aes
 LOCALINCLUDES = -I$(srcdir)/enc_provider \
        -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \

diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 01e869c402725692bb7108eaae002a86857d1f89..8391ecd794c7a55162212cbfba7765608392d641 100644 (file)
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=lib/gssapi
 mydir=lib/gssapi
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS= generic mechglue krb5 spnego
+SUBDIRS= generic mechglue krb5 spnego
 DEFS=
 
 ##DOSLIBNAME=$(OUTPRE)gssapi.lib

diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 8cc931acaccdfcdf6ff4f346b08bc8425a49adea..992efd1c3276bbedda6f4b4c4e4cd3d5f643f1b0 100644 (file)
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=lib/kadm5
 mydir=lib/kadm5
 BUILDTOP=$(REL)..$(S)..
-LOCAL_SUBDIRS = clnt srv unit-test
+SUBDIRS = clnt srv unit-test
 DEFS=
 
 ##DOSBUILDTOP = ..\..

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index a19920d13931969f7d43e1009f38557f56451b06..f296c539a518f96e09a50d63ea4a96727d3d7fd3 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=lib/krb5
 mydir=lib/krb5
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os
-LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache
+SUBDIRS= error_tables asn.1 ccache keytab krb os rcache
 DEFS=
 
 ##DOSBUILDTOP = ..\..

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 0ed1608a06f9d25b31e5467d09a0de82e92ecba5..360b6cf444fda05c0c83d059ea6aaeac6c264ee1 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../../..
 myfulldir=lib/krb5/ccache
 mydir=lib/krb5/ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
-LOCAL_SUBDIRS =
+SUBDIRS =
 DEFS=
 
 RUN_SETUP = @KRB5_RUN_ENV@

diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index 593c15e54ae7f51379b87339ff7081f8b67954aa..b04f52133e6ae6692aa0438607dd65d0d1a6870b 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../../../..
 myfulldir=plugins/kdb/db2/libdb2
 mydir=plugins/kdb/db2/libdb2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCAL_SUBDIRS=hash btree db mpool recno test
+SUBDIRS=hash btree db mpool recno test
 
 LIBBASE=db
 LIBMAJOR=1

diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in
index 88ca2d91b36bada11cb0f5c66ce00c575ec6989c..9dadf64ad0b3c60cebe7eddec70e8bdbea7b6cd0 100644 (file)
--- a/src/plugins/kdb/ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/Makefile.in
@@ -9,7 +9,7 @@ PROG_RPATH=$(KRB5_LIBDIR)
 DEFS =
 MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
 
-LOCAL_SUBDIRS= libkdb_ldap ldap_util
+SUBDIRS= libkdb_ldap ldap_util
 
 LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb \
        -I$(srcdir)/libkdb_ldap

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index a02346c4815eee56e52950b7c1aef43f6f1c7708..1329e8063b8afc27b949feb1dca7a38490afec93 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=..
 mydir=tests
 myfulldir=tests
 BUILDTOP=$(REL)..
-LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
+SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
        gss-threads misc
 
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0ded4f35d4c6a23df52c9bd3334332789ede4f85..a7f1704fc5b2dd522b2073990a349dff08c589ab 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
-LOCAL_SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
+SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
        profile send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..