* configure.in: Don't generate keytab/db/Makefile, since it isn't

	used.

	* Makefile.in: Garbage collect a little.  Don't include keytab/*
	directories directly on $(LOCAL_SUBDIRS), as keytab/Makefile.in
	lists them itself.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12635 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 30d0c89ed6d1a7d945fcbb0c531564b70deb3e43..da56b02ccd794e56be2084a15d72c13bc58bdba5 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-29  Tom Yu  <tlyu@mit.edu>
+
+       * configure.in: Don't generate keytab/db/Makefile, since it isn't
+       used.
+
+       * Makefile.in: Garbage collect a little.  Don't include keytab/*
+       directories directly on $(LOCAL_SUBDIRS), as keytab/Makefile.in
+       lists them itself.
+
 2000-07-14  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Don't generate Makefile in ccache/file,

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 47199309bf81d536faa04c96250c23e37ddda322..e1ccbedfd20ee7a545d3c890b061b41233793916 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -2,8 +2,7 @@ thisconfigdir=.
 myfulldir=lib/krb5
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-LOCAL_SUBDIRS= error_tables asn.1 ccache keytab keytab/file keytab/srvtab krb \
-       os rcache posix
+LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache posix
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=$(OUTPRE)krb5.lib
@@ -14,21 +13,6 @@ TST=if test -n "`cat DONE`" ; then
 
 MAC_SUBDIRS = error_tables asn.1 ccache keytab krb rcache os posix 
 
-LIB_SUBDIRS= error_tables asn.1 ccache \
-       keytab keytab/file keytab/srvtab krb rcache os posix \
-        $(BUILDTOP)/util/profile
-LIBUPDATE= $(BUILDTOP)/util/libupdate
-LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE \
-               keytab/DONE \
-               keytab/file/DONE keytab/srvtab/DONE krb/DONE rcache/DONE \
-               os/DONE posix/DONE $(BUILDTOP)/util/profile/DONE
-
-#
-#SHLIB_LIBS=-lcrypto -lcom_err @SHLIB_GEN@
-#SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@  
-#      $(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message
-#SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-
 STLIBOBJS=krb5_libinit.o
 
 LIB=krb5

diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 9b089f6beeb8442186adef41775a11fa0f67755d..cf3226baa844dc44d91fcdecda6efe3109cbb211 100644 (file)
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -25,7 +25,6 @@ K5_GEN_MAKEFILE(ccache, libobj)
 K5_GEN_MAKEFILE(keytab, libobj)
 K5_GEN_MAKEFILE(keytab/file, libobj)
 K5_GEN_MAKEFILE(keytab/srvtab, libobj)
-K5_GEN_MAKEFILE(keytab/db, libobj)
 K5_GEN_MAKEFILE(krb, libobj)
 K5_GEN_MAKEFILE(rcache, libobj)
 K5_GEN_MAKEFILE(os, libobj)