diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-03-08 07:20:55 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-03-08 07:20:55 +0000 |
| commit | 39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d (patch) | |
| tree | f90a60b8d27f5cf393d7578f5657b7999b90341d /src/appl/simple | |
| parent | fdd187e33062e403c0210f7844e7a12b68369023 (diff) | |
| download | krb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.tar.gz krb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.tar.xz krb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.zip | |
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
Diffstat (limited to 'src/appl/simple')
| -rw-r--r-- | src/appl/simple/ChangeLog | 4 | ||||
| -rw-r--r-- | src/appl/simple/Makefile.in | 2 | ||||
| -rw-r--r-- | src/appl/simple/client/ChangeLog | 4 | ||||
| -rw-r--r-- | src/appl/simple/client/Makefile.in | 1 | ||||
| -rw-r--r-- | src/appl/simple/server/ChangeLog | 4 | ||||
| -rw-r--r-- | src/appl/simple/server/Makefile.in | 1 |
6 files changed, 13 insertions, 3 deletions
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 <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 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 <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 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 <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 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)/.. |