From f31c8b13535216496fc4946888b9535d4f7d03f2 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 20 Jul 2008 21:07:41 +0000 Subject: [PATCH] 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 --- src/appl/Makefile.in | 2 +- src/appl/gssftp/Makefile.in | 2 +- src/appl/sample/Makefile.in | 2 +- src/appl/simple/Makefile.in | 2 +- src/appl/telnet/Makefile.in | 2 +- src/ccapi/Makefile.in | 2 +- src/ccapi/common/Makefile.in | 2 +- src/ccapi/lib/Makefile.in | 2 +- src/ccapi/server/Makefile.in | 2 +- src/clients/Makefile.in | 2 +- src/config/pre.in | 1 - src/include/Makefile.in | 2 +- src/kadmin/Makefile.in | 2 +- src/kadmin/passwd/Makefile.in | 2 +- src/kadmin/testing/Makefile.in | 2 +- src/lib/Makefile.in | 2 +- src/lib/crypto/Makefile.in | 2 +- src/lib/gssapi/Makefile.in | 2 +- src/lib/kadm5/Makefile.in | 2 +- src/lib/krb5/Makefile.in | 2 +- src/lib/krb5/ccache/Makefile.in | 2 +- src/plugins/kdb/db2/libdb2/Makefile.in | 2 +- src/plugins/kdb/ldap/Makefile.in | 2 +- src/tests/Makefile.in | 2 +- src/util/Makefile.in | 2 +- 25 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index abe6c0b26..02a1c73c5 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 4ea8995e8..959316fcb 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 404779611..819444636 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 11d945f52..c6b7baae7 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 32e41551f..716b4580b 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 7cf808055..78e2a47fd 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 1872615f3..cc5d5c09c 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 cdbf74356..76df8126f 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 149954b2d..d7d9a4d1e 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 007e363d6..3a6af6ecb 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 2f256fd9c..5c7e31409 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 4978985f0..61798d008 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 5c83425bc..e5b781084 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 16e892d3d..6a7aa1966 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 9fae207bc..5b459950c 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 b1590df71..9d139a744 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 e0cbf8c34..c04151721 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 01e869c40..8391ecd79 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 8cc931aca..992efd1c3 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 a19920d13..f296c539a 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 0ed1608a0..360b6cf44 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 593c15e54..b04f52133 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 88ca2d91b..9dadf64ad 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 a02346c48..1329e8063 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 0ded4f35d..a7f1704fc 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).. -- 2.26.2