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

6 files changed, 101 insertions, 8 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 $@
+