From: Tom Yu <tlyu@mit.edu>
Date: Tue, 29 Aug 2000 20:39:26 +0000 (+0000)
Subject: 	* configure.in: Don't generate keytab/db/Makefile, since it isn't
X-Git-Tag: krb5-1.3-alpha1~1905
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9dfb3cd26c5b55b80c781cd10cacad8427d2bf6;p=krb5.git

	* 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 30d0c89ed..da56b02cc 100644
--- 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 47199309b..e1ccbedfd 100644
--- 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 9b089f6be..cf3226baa 100644
--- 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)