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

25 files changed, 24 insertions, 25 deletions

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index abe6c0b..02a1c73 100644
--- 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 4ea8995..959316f 100644
--- 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 4047796..8194446 100644
--- 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 11d945f..c6b7baa 100644
--- 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 32e4155..716b458 100644
--- 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 7cf8080..78e2a47 100644
--- 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 1872615..cc5d5c0 100644
--- 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 cdbf743..76df812 100644
--- 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 149954b..d7d9a4d 100644
--- 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 007e363..3a6af6e 100644
--- 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 2f256fd..5c7e314 100644
--- 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 4978985..61798d0 100644
--- 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 5c83425..e5b7810 100644
--- 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 16e892d..6a7aa19 100644
--- 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 9fae207..5b45995 100644
--- 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 b1590df..9d139a7 100644
--- 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 e0cbf8c..c041517 100644
--- 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 01e869c..8391ecd 100644
--- 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 8cc931a..992efd1 100644
--- 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 a19920d..f296c53 100644
--- 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 0ed1608..360b6cf 100644
--- 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 593c15e..b04f521 100644
--- 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 88ca2d9..9dadf64 100644
--- 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 a02346c..1329e80 100644
--- 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 0ded4f3..a7f1704 100644
--- 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)..