summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-03-08 07:20:55 +0000
committerKen Raeburn <raeburn@mit.edu>2004-03-08 07:20:55 +0000
commit39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d (patch)
treef90a60b8d27f5cf393d7578f5657b7999b90341d /src/include
parentfdd187e33062e403c0210f7844e7a12b68369023 (diff)
downloadkrb5-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/include')
-rw-r--r--src/include/ChangeLog4
-rw-r--r--src/include/Makefile.in2
-rw-r--r--src/include/kerberosIV/ChangeLog4
-rw-r--r--src/include/kerberosIV/Makefile.in1
-rw-r--r--src/include/krb5/ChangeLog4
-rw-r--r--src/include/krb5/Makefile.in1
6 files changed, 13 insertions, 3 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 0fd2369ab2..6b2ba91abd 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* krb5.hin (krb5_kt_register): Ops table is now const.
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index a7fb55772a..a54505982d 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 226443b38b..d05f70d384 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-09-23 Jeffrey Altman <jaltman@mit.edu>
* 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 9de938f5f2..785484f918 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 09f6dad99c..9edf7e4813 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-08-26 Ken Raeburn <raeburn@mit.edu>
* k5-config.h: Unused file deleted.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 037130a905..bca7cd33fa 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@