Library directory reorganization; there are now crypto and krb5 directories,

for the libcrypto.a and libkrb5.a files, respectively.  The directories
which contained files making up those libraries have been moved under those
directories.

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

19 files changed, 196 insertions, 73 deletions

diff --git a/src/lib/crypto/Imakefile b/src/lib/crypto/Imakefile
new file mode 100644
index 000000000..2ac9b8ab8
--- /dev/null
+++ b/src/lib/crypto/Imakefile
@@ -0,0 +1,51 @@
+#	$Source$
+#	$Author$
+#	$Id$
+#
+#  Copyright 1990,1991 by the Massachusetts Institute of Technology.
+#  All Rights Reserved.
+# 
+# Export of this software from the United States of America is assumed
+#   to require a specific license from the United States Government.
+#   It is the responsibility of any person or organization contemplating
+#   export to obtain such a license before exporting.
+# 
+# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+# distribute this software and its documentation for any purpose and
+# without fee is hereby granted, provided that the above copyright
+# notice appear in all copies and that both that copyright notice and
+# this permission notice appear in supporting documentation, and that
+# the name of M.I.T. not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission.  M.I.T. makes no representations about the suitability of
+# this software for any purpose.  It is provided "as is" without express
+# or implied warranty.
+# 
+# 
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+SUBDIRS = des crc32 md4 md5 os
+
+MakeSubdirs($(SUBDIRS))
+
+NormalLibraryObjectRule()
+
+OBJS=	cryptoconf.o
+SRCS=	cryptoconf.c
+
+libcrypto.a: des/DONE md4/DONE md5/DONE crc32/DONE os/DONE $(OBJS)
+	(cd des; $(ARADD) ../$@ `cat DONE`)
+	(cd crc32; $(ARADD) ../$@ `cat DONE`)
+	(cd md4; $(ARADD) ../$@ `cat DONE`)
+	(cd md5; $(ARADD) ../$@ `cat DONE`)
+	(cd os; $(ARADD) ../$@ `cat DONE`)
+	$(ARADD) $@ $(OBJS)
+	RanLibrary($@)
+
+all:: libcrypto.a
+
+Krb5InstallLibrary($(DESLIB),$(KRB5_LIBDIR))
+
+clean::
+	$(RM) libcrypto.a
diff --git a/src/lib/crypto/crc32/Imakefile b/src/lib/crypto/crc32/Imakefile
index 5a0cc4de2..0d31726c0 100644
--- a/src/lib/crypto/crc32/Imakefile
+++ b/src/lib/crypto/crc32/Imakefile
@@ -30,7 +30,7 @@ SRCS=	$(SRCDIR)crc.c $(SRCDIR)crctest.c
 
 CRCTESTOBJ = crctest.o
 
-OtherdirLibraryTarget(..,$(DESLIB),$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 NormalProgramTarget(crctest,$(CRCTESTOBJ),$(OBJS),$(OBJS),)
 
diff --git a/src/lib/crypto/des/Imakefile b/src/lib/crypto/des/Imakefile
index 7f0831d4a..9fb64f82d 100644
--- a/src/lib/crypto/des/Imakefile
+++ b/src/lib/crypto/des/Imakefile
@@ -69,7 +69,7 @@ DESTESTOBJ = destest.o
 all::
 depend:: des.c $(SRCS)
 
-OtherdirLibraryTarget(..,$(DESLIB),$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
 
@@ -78,10 +78,10 @@ $(SRCS): fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
 clean::
 	$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
 
-EXT_LIB = $(TOP)/error_tables/krb5_err.o \
-                  $(TOP)/error_tables/isode_err.o \
-                  $(TOP)/lib/cryptoconf.o \
-                  $(TOP)/lib/crc-32/libcrc32.a \
+EXT_LIB = $(TOP)/lib/krb5/error_tables/krb5_err.o \
+                  $(TOP)/lib/krb5/error_tables/isode_err.o \
+                  $(TOP)/lib/crypto/cryptoconf.o \
+                  $(TOP)/lib/crypto/crc-32/libcrc32.a \
                   libdes.a $(OSLIB) $(COMERRLIB)
 
 NormalProgramTarget(verify,$(VERIFYOBJ),libdes.a,$(EXT_LIB),)
diff --git a/src/lib/crypto/md4/Imakefile b/src/lib/crypto/md4/Imakefile
index f697c8dd4..6d7b5f938 100644
--- a/src/lib/crypto/md4/Imakefile
+++ b/src/lib/crypto/md4/Imakefile
@@ -30,6 +30,6 @@ SRCS=	$(SRCDIR)md4.c $(SRCDIR)md4glue.c $(SRCDIR)md4crypto.c
 
 DEFINES= $(DESDEFINES)
 
-OtherdirLibraryTarget(..,$(DESLIB),$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/crypto/md5/Imakefile b/src/lib/crypto/md5/Imakefile
index 3d7d0b52a..832258495 100644
--- a/src/lib/crypto/md5/Imakefile
+++ b/src/lib/crypto/md5/Imakefile
@@ -6,6 +6,6 @@ SRCS=	$(SRCDIR)md5.c $(SRCDIR)md5glue.c $(SRCDIR)md5crypto.c
 
 DEFINES= $(DESDEFINES)
 
-OtherdirLibraryTarget(..,$(DESLIB),$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/crypto/os/Imakefile b/src/lib/crypto/os/Imakefile
new file mode 100644
index 000000000..04d70cd3c
--- /dev/null
+++ b/src/lib/crypto/os/Imakefile
@@ -0,0 +1,42 @@
+#	$Source$
+#	$Author$
+#	$Id$
+#
+#  Copyright 1990,1991 by the Massachusetts Institute of Technology.
+#  All Rights Reserved.
+# 
+# Export of this software from the United States of America is assumed
+#   to require a specific license from the United States Government.
+#   It is the responsibility of any person or organization contemplating
+#   export to obtain such a license before exporting.
+# 
+# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+# distribute this software and its documentation for any purpose and
+# without fee is hereby granted, provided that the above copyright
+# notice appear in all copies and that both that copyright notice and
+# this permission notice appear in supporting documentation, and that
+# the name of M.I.T. not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission.  M.I.T. makes no representations about the suitability of
+# this software for any purpose.  It is provided "as is" without express
+# or implied warranty.
+# 
+# 
+NormalLibraryObjectRule()
+
+OBJS=	rnd_confoun.o localaddr.o ustime.o
+
+SRCS=	rnd_confoun.c localaddr.c ustime.c
+
+SubdirLibraryRule($(OBJS))
+
+depend:: localaddr.c ustime.c
+
+DependTarget()
+
+localaddr.c: ../../krb5/os/localaddr.c
+	$(LN) ../../krb5/os/localaddr.c $@
+
+ustime.c: ../../krb5/os/ustime.c
+	$(LN) ../../krb5/os/ustime.c $@
+
diff --git a/src/lib/krb5/Imakefile b/src/lib/krb5/Imakefile
index a879c75f5..8f65d08b7 100644
--- a/src/lib/krb5/Imakefile
+++ b/src/lib/krb5/Imakefile
@@ -24,49 +24,11 @@
 # 
 #define IHaveSubdirs
 #define PassCDebugFlags
-NormalLibraryObjectRule()
 
 SUBDIRS1 = error_tables
-SUBDIRS2 = ccache keytab krb rcache free os kdb des \
-	des425 crc32 krb425 md4 md5 gssapi
+SUBDIRS2 = ccache keytab krb rcache free os posix
 SUBDIRS = $(SUBDIRS1) asn.1 $(SUBDIRS2)
 
-#ifdef HasVfprintf
-VPOBJS=
-VPSRCS=
-#else
-VPOBJS=vfprintf.o vsprintf.o
-VPSRCS=$(SRCDIR)vfprintf.c $(SRCDIR)vsprintf.c
-#endif
-#ifdef HasVsyslog
-VSOBJS=
-VSSRCS=
-#else
-VSOBJS=syslog.o
-VSSRCS=$(SRCDIR)syslog.c
-#endif
-#ifdef HasStrdup
-STOBJS=
-STSRCS=
-#else
-STOBJS=strdup.o
-STSRCS=$(SRCDIR)strdup.c
-#endif
-#ifndef HasStrerror
-PEOBJS=perror.o
-PESRCS=$(SRCDIR)perror.c
-#endif
-
-INCLUDES=$(STDC_TOP_INCLUDES)
-
-OBJS =	\
-	cryptoconf.o \
-	$(PEOBJS) $(VSOBJS) $(VPOBJS) $(STOBJS)
-
-SRCS =	\
-	$(SRCDIR)cryptoconf.c \
-	$(PESRCS) $(VSSRCS) $(VPSRCS) $(STSRCS)
-
 MakeSubdirs($(SUBDIRS))
 
 #ifdef UseSedHack
@@ -115,12 +77,27 @@ asn.1/Makefile::
 
 #endif	/* UseSedHack */
 
-AdditiveLibraryTarget(krb5,$(OBJS),-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -l$(DESLIB) $(ISODELIB) -lcom_err)
-
-RanlibLibraryTarget($(DESLIB),)
+libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
+		ccache/file/DONE keytab/DONE keytab/file/DONE krb/DONE \
+		rcache/DONE free/DONE os/DONE posix/DONE
+	(cd error_tables; $(ARADD) ../$@ `cat DONE`)
+	(cd asn.1; $(ARADD) ../$@ `cat DONE`)
+	(cd ccache; $(ARADD) ../$@ `cat DONE`)
+	(cd ccache/stdio; $(ARADD) ../../$@ `cat DONE`)
+	(cd ccache/file; $(ARADD) ../../$@ `cat DONE`)
+	(cd keytab; $(ARADD) ../$@ `cat DONE`)
+	(cd keytab/file; $(ARADD) ../../$@ `cat DONE`)
+	(cd krb; $(ARADD) ../$@ `cat DONE`)
+	(cd rcache; $(ARADD) ../$@ `cat DONE`)
+	(cd free; $(ARADD) ../$@ `cat DONE`)
+	(cd os; $(ARADD) ../$@ `cat DONE`)
+	(cd posix; $(ARADD) ../$@ `cat DONE`)
+	RanLibrary($@)
+
+all:: libkrb5.a
 
-Krb5InstallLibrary(krb5,$(KRB5_LIBDIR))
 Krb5InstallLibrary($(DESLIB),$(KRB5_LIBDIR))
+Krb5InstallLibrary(krb5,$(KRB5_LIBDIR))
 
-SharedLibraryTarget(kdb5,-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -lkrb5 -l$(DESLIB) $(ISODELIB) -lcom_err)
+# SharedLibraryTarget(kdb5,-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -lkrb5 -l$(DESLIB) $(ISODELIB) -lcom_err)
 /* SharedLibraryTarget(des425,-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -l$(DESLIB)) */
diff --git a/src/lib/krb5/asn.1/Imakefile b/src/lib/krb5/asn.1/Imakefile
index 2f20fded0..3156fbc62 100644
--- a/src/lib/krb5/asn.1/Imakefile
+++ b/src/lib/krb5/asn.1/Imakefile
@@ -159,7 +159,7 @@ all:: includes
 
 includes:: KRB5-types.h
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 PepsyTarget(KRB5)
 
diff --git a/src/lib/krb5/ccache/Imakefile b/src/lib/krb5/ccache/Imakefile
index d97efeeaf..aa53073b1 100644
--- a/src/lib/krb5/ccache/Imakefile
+++ b/src/lib/krb5/ccache/Imakefile
@@ -39,4 +39,4 @@ SRCS=	$(SRCDIR)ccbase.c \
 	$(SRCDIR)ccdefault.c \
 	$(SRCDIR)ccdefops.c
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
diff --git a/src/lib/krb5/ccache/file/Imakefile b/src/lib/krb5/ccache/file/Imakefile
index f46d1eeae..bcce9847d 100644
--- a/src/lib/krb5/ccache/file/Imakefile
+++ b/src/lib/krb5/ccache/file/Imakefile
@@ -40,6 +40,6 @@ SRCS 	= $(SRCDIR)fcc_close.c $(SRCDIR)fcc_destry.c $(SRCDIR)fcc_eseq.c \
 
 all:: ${OBJS}
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/ccache/stdio/Imakefile b/src/lib/krb5/ccache/stdio/Imakefile
index f0309bf9f..30bef852b 100644
--- a/src/lib/krb5/ccache/stdio/Imakefile
+++ b/src/lib/krb5/ccache/stdio/Imakefile
@@ -40,7 +40,7 @@ SRCS 	= $(SRCDIR)scc_close.c $(SRCDIR)scc_destry.c $(SRCDIR)scc_eseq.c \
 
 all:: ${OBJS}
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
 
diff --git a/src/lib/krb5/error_tables/Imakefile b/src/lib/krb5/error_tables/Imakefile
index d4e32d9c9..aa107dbdc 100644
--- a/src/lib/krb5/error_tables/Imakefile
+++ b/src/lib/krb5/error_tables/Imakefile
@@ -48,7 +48,7 @@ CopyHeader(kdb5_err.h,$(EHDRDIR))
 CopyHeader(adm_err.h,$(EHDRDIR))
 
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 depend:: $(ETSRCS)
 
diff --git a/src/lib/krb5/free/Imakefile b/src/lib/krb5/free/Imakefile
index e7f6a51f4..552eb1569 100644
--- a/src/lib/krb5/free/Imakefile
+++ b/src/lib/krb5/free/Imakefile
@@ -88,6 +88,6 @@ SRCS=	\
 	$(SRCDIR)f_cred.c	\
 	$(SRCDIR)f_cred_enc.c
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/keytab/Imakefile b/src/lib/krb5/keytab/Imakefile
index 98b16b7c8..f421ff98a 100644
--- a/src/lib/krb5/keytab/Imakefile
+++ b/src/lib/krb5/keytab/Imakefile
@@ -46,6 +46,6 @@ SRCS=	\
 	$(SRCDIR)ktremove.c	\
 	$(SRCDIR)read_servi.c
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/keytab/file/Imakefile b/src/lib/krb5/keytab/file/Imakefile
index df19fa28b..3f90c9bab 100644
--- a/src/lib/krb5/keytab/file/Imakefile
+++ b/src/lib/krb5/keytab/file/Imakefile
@@ -56,6 +56,6 @@ OBJS = \
 	ktf_wreslv.o	\
 	ktf_defops.o
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/krb/Imakefile b/src/lib/krb5/krb/Imakefile
index 728d35e82..f09a9ff06 100644
--- a/src/lib/krb5/krb/Imakefile
+++ b/src/lib/krb5/krb/Imakefile
@@ -140,6 +140,6 @@ SRCS=	$(SRCDIR)addr_comp.c	\
 	$(SRCDIR)unparse.c	\
 	$(SRCDIR)walk_rtree.c
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/os/Imakefile b/src/lib/krb5/os/Imakefile
index 554631526..ac029ffc6 100644
--- a/src/lib/krb5/os/Imakefile
+++ b/src/lib/krb5/os/Imakefile
@@ -24,7 +24,7 @@
 # 
 NormalLibraryObjectRule()
 
-KRBOBJS= \
+OBJS= \
 	an_to_ln.o	\
 	def_realm.o	\
 	ccdefname.o	\
@@ -54,12 +54,6 @@ KRBOBJS= \
 	ustime.o	\
 	write_msg.o
 
-DESOBJS= \
-	rnd_confoun.o
-
-OBJS = $(KRBOBJS) $(DESOBJS)
-
-
 SRCS= \
 	$(SRCDIR)an_to_ln.c	\
 	$(SRCDIR)def_realm.c	\
@@ -83,7 +77,6 @@ SRCS= \
 	$(SRCDIR)read_msg.c	\
 	$(SRCDIR)read_pwd.c	\
 	$(SRCDIR)port2ip.c	\
-	$(SRCDIR)rnd_confoun.c	\
 	$(SRCDIR)sendto_kdc.c	\
 	$(SRCDIR)sn2princ.c	\
 	$(SRCDIR)timeofday.c	\
@@ -91,8 +84,6 @@ SRCS= \
 	$(SRCDIR)ustime.c	\
 	$(SRCDIR)write_msg.c
 
-OtherdirLibraryTarget(..,$(DESLIB),localaddr.o ustime.o $(DESOBJS))
-
-OtherdirLibraryTarget(..,krb5,$(KRBOBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/src/lib/krb5/posix/Imakefile b/src/lib/krb5/posix/Imakefile
new file mode 100644
index 000000000..f0384d387
--- /dev/null
+++ b/src/lib/krb5/posix/Imakefile
@@ -0,0 +1,62 @@
+#	$Source$
+#	$Author$
+#	$Id$
+#
+#  Copyright 1990,1991 by the Massachusetts Institute of Technology.
+#  All Rights Reserved.
+# 
+# Export of this software from the United States of America is assumed
+#   to require a specific license from the United States Government.
+#   It is the responsibility of any person or organization contemplating
+#   export to obtain such a license before exporting.
+# 
+# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+# distribute this software and its documentation for any purpose and
+# without fee is hereby granted, provided that the above copyright
+# notice appear in all copies and that both that copyright notice and
+# this permission notice appear in supporting documentation, and that
+# the name of M.I.T. not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission.  M.I.T. makes no representations about the suitability of
+# this software for any purpose.  It is provided "as is" without express
+# or implied warranty.
+# 
+# 
+#define PassCDebugFlags
+NormalLibraryObjectRule()
+
+#ifdef HasVfprintf
+VPOBJS=
+VPSRCS=
+#else
+VPOBJS=vfprintf.o vsprintf.o
+VPSRCS=$(SRCDIR)vfprintf.c $(SRCDIR)vsprintf.c
+#endif
+#ifdef HasVsyslog
+VSOBJS=
+VSSRCS=
+#else
+VSOBJS=syslog.o
+VSSRCS=$(SRCDIR)syslog.c
+#endif
+#ifdef HasStrdup
+STOBJS=
+STSRCS=
+#else
+STOBJS=strdup.o
+STSRCS=$(SRCDIR)strdup.c
+#endif
+#ifndef HasStrerror
+PEOBJS=perror.o
+PESRCS=$(SRCDIR)perror.c
+#endif
+
+INCLUDES=$(STDC_TOP_INCLUDES)
+
+OBJS =	$(PEOBJS) $(VSOBJS) $(VPOBJS) $(STOBJS)
+
+SRCS =	$(PESRCS) $(VSSRCS) $(VPSRCS) $(STSRCS)
+
+SubdirLibraryRule($(OBJS))
+
+DependTarget()
diff --git a/src/lib/krb5/rcache/Imakefile b/src/lib/krb5/rcache/Imakefile
index 13d74d8b3..67dbb1035 100644
--- a/src/lib/krb5/rcache/Imakefile
+++ b/src/lib/krb5/rcache/Imakefile
@@ -40,6 +40,6 @@ SRCS=	\
 	$(SRCDIR)rcdef.c	\
 	$(SRCDIR)rc_conv.c
 
-OtherdirLibraryTarget($(TOP)/lib,krb5,$(OBJS))
+SubdirLibraryRule($(OBJS))
 
 DependTarget()