From 39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Mon, 8 Mar 2004 07:20:55 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 4 ++++ src/Makefile.in | 2 +- src/appl/ChangeLog | 4 ++++ src/appl/Makefile.in | 2 +- src/appl/gss-sample/ChangeLog | 4 ++++ src/appl/gss-sample/Makefile.in | 1 - src/appl/sample/ChangeLog | 4 ++++ src/appl/sample/Makefile.in | 2 +- src/appl/sample/sclient/ChangeLog | 4 ++++ src/appl/sample/sclient/Makefile.in | 1 - src/appl/sample/sserver/ChangeLog | 4 ++++ src/appl/sample/sserver/Makefile.in | 1 - src/appl/simple/ChangeLog | 4 ++++ src/appl/simple/Makefile.in | 2 +- src/appl/simple/client/ChangeLog | 4 ++++ src/appl/simple/client/Makefile.in | 1 - src/appl/simple/server/ChangeLog | 4 ++++ src/appl/simple/server/Makefile.in | 1 - src/appl/user_user/ChangeLog | 4 ++++ src/appl/user_user/Makefile.in | 1 - src/config-files/ChangeLog | 4 ++++ src/config-files/Makefile.in | 1 - src/config/ChangeLog | 8 ++++++++ src/config/post.in | 6 +----- src/config/pre.in | 5 ++++- src/gen-manpages/ChangeLog | 4 ++++ src/gen-manpages/Makefile.in | 1 - src/include/ChangeLog | 4 ++++ src/include/Makefile.in | 2 +- src/include/kerberosIV/ChangeLog | 4 ++++ src/include/kerberosIV/Makefile.in | 1 - src/include/krb5/ChangeLog | 4 ++++ src/include/krb5/Makefile.in | 1 - src/kdc/ChangeLog | 4 ++++ src/kdc/Makefile.in | 1 - src/krb524/ChangeLog | 4 ++++ src/krb524/Makefile.in | 1 - src/lib/ChangeLog | 4 ++++ src/lib/Makefile.in | 2 +- src/slave/ChangeLog | 4 ++++ src/slave/Makefile.in | 1 - src/util/ChangeLog | 4 ++++ src/util/Makefile.in | 2 +- src/util/send-pr/ChangeLog | 4 ++++ src/util/send-pr/Makefile.in | 1 - src/windows/ms2mit/ChangeLog | 4 ++++ src/windows/ms2mit/Makefile.in | 1 - 47 files changed, 108 insertions(+), 28 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index add07d89f..22ee3073d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (SUBDIRS): Renamed from MY_SUBDIRS. + 2004-03-07 Ken Raeburn * aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Look for tclConfig.sh in diff --git a/src/Makefile.in b/src/Makefile.in index fa8983410..1918d0b03 100644 --- 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 265179e78..fb9776a92 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2004-02-09 Ken Raeburn * configure.in: Check for sys/time.h and time.h. diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index 9c8df958b..2a7d80aea 100644 --- 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 d3bf69982..b641880db 100644 --- a/src/appl/gss-sample/ChangeLog +++ b/src/appl/gss-sample/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2003-02-26 Jeffrey Altman * 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 e3d71af0f..7ef17fde6 100644 --- 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 5ba334d29..404dce130 100644 --- a/src/appl/sample/ChangeLog +++ b/src/appl/sample/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2002-08-29 Ken Raeburn * Makefile.in: Revert $(S)=>/ change, for Windows support. diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in index b26fff264..a580359e4 100644 --- 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 9263c7a53..51a10942b 100644 --- a/src/appl/sample/sclient/ChangeLog +++ b/src/appl/sample/sclient/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-29 Ken Raeburn * 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 6906bbf12..868f678eb 100644 --- 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 838c0a33a..902f203e3 100644 --- a/src/appl/sample/sserver/ChangeLog +++ b/src/appl/sample/sserver/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-29 Ken Raeburn * 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 0f59b0af9..32e8864ef 100644 --- 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 80bba459b..9c9da9569 100644 --- a/src/appl/simple/ChangeLog +++ b/src/appl/simple/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2002-08-29 Ken Raeburn * Makefile.in: Revert $(S)=>/ change, for Windows support. diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in index fb3375491..9e6f16da2 100644 --- 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 76c08d559..29b95a64f 100644 --- a/src/appl/simple/client/ChangeLog +++ b/src/appl/simple/client/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-29 Ken Raeburn * 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 e97c5fe10..c7023ca1d 100644 --- 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 d6431aa33..67d2769e4 100644 --- a/src/appl/simple/server/ChangeLog +++ b/src/appl/simple/server/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-29 Ken Raeburn * 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 1c405371f..d670edaa7 100644 --- 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 147d9c293..308df58d1 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2003-01-10 Ken Raeburn * server.c: Include port-sockets.h. diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 782311b44..e55eda8a2 100644 --- 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 502fc4b7d..80d6a9b7f 100644 --- a/src/config-files/ChangeLog +++ b/src/config-files/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2003-06-27 Jen Selby * kdc.conf.M: replaced the @LOCALSTATEDIR typos with diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in index f25789da8..378438e13 100644 --- 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 20a11c330..d93a54538 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,11 @@ +2004-03-08 Ken Raeburn + + * 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 * pre.in (APPUTILS_DEPLIB, APPUTILS_LIB): New vars. diff --git a/src/config/post.in b/src/config/post.in index 85f6bb982..26d5aa176 100644 --- 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 6b20fc769..67930b240 100644 --- 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 48ccebcd4..7c7cb1a1c 100644 --- a/src/gen-manpages/ChangeLog +++ b/src/gen-manpages/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in index ab99fcdb5..a005278b5 100644 --- 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 0fd2369ab..6b2ba91ab 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2004-03-05 Ken Raeburn * krb5.hin (krb5_kt_register): Ops table is now const. diff --git a/src/include/Makefile.in b/src/include/Makefile.in index a7fb55772..a54505982 100644 --- 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 226443b38..d05f70d38 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2003-09-23 Jeffrey Altman * 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 9de938f5f..785484f91 100644 --- 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 09f6dad99..9edf7e481 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2003-08-26 Ken Raeburn * k5-config.h: Unused file deleted. diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 037130a90..bca7cd33f 100644 --- 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 96af4b12a..617f06c9c 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2004-03-05 Ken Raeburn * configure.in: Removed. Directory configured from top level diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index d288b4fae..3a44b0fea 100644 --- 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 0e621f2d6..f1f2548b0 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2004-03-05 Ken Raeburn * configure.in: Removed. Directory configured from top level diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index 3f17f8926..68e7b3613 100644 --- 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 f27894cdd..80e49d9fc 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2004-02-26 Ken Raeburn * Makefile.in (MY_SUBDIRS): Add apputils. diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 54e20c2bf..04659d08a 100644 --- 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 41cae76aa..4b5678634 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2004-03-05 Ken Raeburn * configure.in: Removed. Directory configured from top level diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 1f97c8d7c..bca4663a7 100644 --- 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 5639956fa..d86f53b7e 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS. + 2004-03-05 Ken Raeburn * reconf: Delete autom4te.cache directories after running diff --git a/src/util/Makefile.in b/src/util/Makefile.in index dc5d9ddce..f5207181c 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 -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 2be0b368d..4ae543edf 100644 --- a/src/util/send-pr/ChangeLog +++ b/src/util/send-pr/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2002-08-29 Ken Raeburn * 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 bee786f58..5a27fcbf0 100644 --- 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 d7ac6af44..992ba4f4f 100644 --- a/src/windows/ms2mit/ChangeLog +++ b/src/windows/ms2mit/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Deleted. + 2004-01-31 Jeffrey Altman * 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 45004e14a..7314b987b 100644 --- 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) -- 2.26.2