Merge of libhack_branch

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

21 files changed, 115 insertions, 130 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ecdb1d41e..66a2e014a 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 29 21:52:44 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library build procedure.
+
 Sat Nov 23 00:22:20 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* cryptoconf.c: Also zero out the entries in cryptoconf, to make
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 5dafc100c..2482a1961 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -8,12 +8,6 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$
 
 MAC_SUBDIRS = des sha md4 md5 crc32 os
 
-TST=if test -n "`cat DONE`" ; then
-
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
 OBJS=	cryptoconf.$(OBJEXT) \
 	encrypt_data.$(OBJEXT) \
 	decrypt_data.$(OBJEXT) \
@@ -32,9 +26,15 @@ SRCS=	$(srcdir)/cryptoconf.c \
 	$(srcdir)/des3_raw.c \
 	$(srcdir)/raw_des.c 
 
-LIB_SUBDIRS= des md4 md5 sha crc32 os .
-LIBUPDATE= $(BUILDTOP)/util/libupdate
-LIBDONE= ./des/DONE ./md4/DONE ./md5/DONE ./sha/DONE ./crc32/DONE ./os/DONE ./DONE
+LIB=crypto
+LIBMAJOR=1
+LIBMINOR=0
+RELDIR=crypto
+STLIBOBJS=cryptoconf.o encrypt_data.o decrypt_data.o \
+	des_crc.o des_md5.o des3_sha.o des3_raw.o raw_des.o
+
+STOBJLISTS=des/OBJS.ST md4/OBJS.ST md5/OBJS.ST sha/OBJS.ST crc32/OBJS.ST \
+	os/OBJS.ST OBJS.ST
 
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.
@@ -43,13 +43,7 @@ SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
-all-unix:: shared
-
-shared: 
-	mkdir shared
-
 # FIXME, need to build the library too...
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -57,21 +51,13 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
 
-libcrypto.$(STEXT): $(LIBDONE)
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE $(LIB_SUBDIRS)) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE $(LIB_SUBDIRS)) \
-	fi
-	$(RANLIB) $@
-	touch libcrypto.stamp
+all-unix:: all-liblinks
+install-unix:: install-libs
 
 libcrypto.lib:
 	libdir crypto.lib
 
-clean-unix::
-	$(RM) libcrypto.a libcrypto.stamp shared/*
-
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 clean-windows::
 	$(RM) crypto.lib crypto.bak $(OBJFILE)
 
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 53f9fcc39..04d628e18 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -119,8 +119,7 @@ dnl else
 dnl 	AC_MSG_RESULT(Disabling NIST_SHA)
 dnl fi
 
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
 DO_SUBDIRS
-V5_MAKE_SHARED_LIB(libcrypto,1.0,.., ./crypto)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index eaf0e8591..2317b415c 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -6,6 +6,11 @@ Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
 
 	* Makefile.in: Win32 build
 
+Sun Dec 29 21:53:25 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library building procedure.
+
 Tue May 14 19:33:27 1996  Richard Basch  <basch@lehman.com>
 
 	* crc.c: ensure the cksum content length is sufficient
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 34255defb..7ba33e7ca 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -5,16 +5,12 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE=..\crc32.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS=crc.o
 
 OBJS=	crc.$(OBJEXT)
 
 SRCS=	$(srcdir)/crc.c
 
-all-unix:: shared $(OBJS) 
-all-mac:: shared $(OBJS) 
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -22,8 +18,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 crctest: crctest.$(OBJEXT) $(OBJS)
 	$(RM) crctest
@@ -38,9 +33,6 @@ check:: crctest$(EXEEXT)
 clean:: 
 	$(RM) crctest$(EXEEXT) crctest.$(OBJEXT)
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in
index 7eff1bc8b..106deb0dd 100644
--- a/src/lib/crypto/crc32/configure.in
+++ b/src/lib/crypto/crc32/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 84bf43d0c..9eef6c1f2 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -12,6 +12,16 @@ Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: Win32 build
 
+Sat Feb  8 18:49:39 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
+Sun Dec 29 21:53:49 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library building procedure.
+
 Sat Jun 15 03:51:19 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (clean): Add space before \
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index bae2b14ae..cac503afc 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -4,16 +4,35 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSMYNAME=des
 ##DOSOBJFILE=..\des.lst
 ##WIN16##LIBNAME=..\crypto.lib
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
-
-KLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
 RUN_SETUP = @KRB5_RUN_ENV@
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS=\
+	afsstring2key.o \
+	cbc_cksum.o	\
+	finish_key.o	\
+	fin_rndkey.o	\
+	init_rkey.o	\
+	process_ky.o	\
+	random_key.o	\
+	string2key.o	\
+	key_sched.o	\
+	weak_key.o	\
+	f_cbc.o 	\
+	f_cksum.o 	\
+	f_sched.o 	\
+	f_ecb.o 	\
+	f_parity.o 	\
+	f_tables.o	\
+	d3_cbc.o 	\
+	d3_ecb.o	\
+	d3_kysched.o	\
+	d3_procky.o 	\
+	d3_str2ky.o	\
+	u_nfold.o	\
+	u_rn_key.o
 
 OBJS=	afsstring2key.$(OBJEXT) \
 	cbc_cksum.$(OBJEXT)	\
@@ -63,9 +82,6 @@ SRCS=	$(srcdir)/afsstring2key.c \
 	$(srcdir)/u_nfold.c \
 	$(srcdir)/u_rn_key.c
 
-
-all-unix:: shared $(OBJS)
-all-mac:: shared $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -73,8 +89,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 includes:: depend
 
@@ -84,18 +99,16 @@ depend:: $(SRCS)
 clean::
 	$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
 
-verify$(EXEEXT): t_verify.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ t_verify.$(OBJEXT) process_ky.o  key_sched.o \
-	../cryptoconf.o ../des_crc.o $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+verify$(EXEEXT): t_verify.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ t_verify.$(OBJEXT) process_ky.o  key_sched.o \
+	../cryptoconf.o ../des_crc.o $(KRB5_BASE_LIBS)
 
-destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ destest.$(OBJEXT) process_ky.o key_sched.o \
-	../cryptoconf.o ../des_crc.o  $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+destest$(EXEEXT): destest.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ destest.$(OBJEXT) process_ky.o key_sched.o \
+	../cryptoconf.o ../des_crc.o $(KRB5_BASE_LIBS)
 
-t_random$(EXEEXT): t_random.$(OBJEXT) $(DEPKLIB)
-	$(LD) -o $@ t_random.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
-
-check-mac: check-unix
+t_random$(EXEEXT): t_random.$(OBJEXT) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ t_random.$(OBJEXT) $(KRB5_BASE_LIBS)
 
 check-unix:: destest verify
 	$(RUN_SETUP) ./verify -z
@@ -109,9 +122,7 @@ clean::
 	$(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) \
 	t_verify.$(OBJEXT) t_random.$(OBJEXT) t_random$(EXEEXT)
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
 clean-windows::
 	$(RM) $(OBJFILE)
+
+clean-unix:: clean-libobjs
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index 10592aab2..20cc4376c 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-V5_SHARED_LIB_OBJS
 KRB5_RUN_FLAGS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 9197f1157..a82e57b4a 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -11,6 +11,11 @@ Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: Win32 build
 
+Sun Dec 29 21:54:09 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library building procedure.
+
 Wed Jun 12 00:10:42 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* md4.c
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index b4619aa66..c7ce9c042 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -8,16 +8,12 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)"
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS=md4.o md4glue.o md4crypto.o
 
 OBJS=	md4.$(OBJEXT) md4glue.$(OBJEXT) md4crypto.$(OBJEXT)
 
 SRCS=	$(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
 
-all-unix:: shared $(OBJS) 
-all-mac:: shared $(OBJS) 
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -25,8 +21,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 t_mddriver.c: $(srcdir)/../md5/t_mddriver.c
 	$(CP) $(srcdir)/../md5/t_mddriver.c t_mddriver.c
@@ -62,9 +57,6 @@ clean::
 	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT) t_mddriver.c
 	$(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT) t_cksum.c
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in
index 51d99cb2d..e4941ce39 100644
--- a/src/lib/crypto/md4/configure.in
+++ b/src/lib/crypto/md4/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 KRB5_RUN_FLAGS
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index f39b36ced..65f4dc0de 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -11,6 +11,11 @@ Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: Win32 build
 
+Sun Dec 29 21:54:24 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library building procedure.
+
 Wed Jun 12 00:11:34 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* rsa-md5.h:
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 82263d17b..35104ef9a 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -6,16 +6,13 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 ##WIN16##LIBNAME=..\crypto.lib
 
 RUN_SETUP = @KRB5_RUN_ENV@
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+
+STLIBOBJS=md5.o md5glue.o md5crypto.o
 
 OBJS=	md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT)
 
 SRCS=	$(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
 
-all-unix:: shared $(OBJS) 
-all-mac:: shared $(OBJS) 
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -23,8 +20,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 t_mddriver: t_mddriver.o md5.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o
@@ -46,9 +42,6 @@ clean::
 	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT)
 	$(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT)
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in
index 51d99cb2d..e4941ce39 100644
--- a/src/lib/crypto/md5/configure.in
+++ b/src/lib/crypto/md5/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 KRB5_RUN_FLAGS
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index 97f79106d..b0b44f160 100644
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -8,6 +8,11 @@ Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
 
 	* rnd_confoun.c: Fix function declaration (win32)
 
+Sun Dec 29 21:54:42 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library building procedure.
+
 Wed Jun 12 00:12:52 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* c_ustime.c: Fix WIN32 to be _WIN32
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 134e5c918..97790f048 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -5,19 +5,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE=..\os.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
-LIBOBJS = @LIBOBJS@
-
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = rnd_confoun.o c_localaddr.o c_ustime.o @LIBOBJS@
 
 COBJS=	rnd_confoun.$(OBJEXT) c_localaddr.$(OBJEXT) c_ustime.$(OBJEXT) 
 OBJS= $(COBJS) $(LIBOBJS)
 
 SRCS=	rnd_confoun.c c_localaddr.c c_ustime.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(COBJS)
@@ -25,23 +19,16 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
-	
+all-unix:: all-libobjs
+
 memmove.c: $(SRCTOP)$(S)lib$(S)krb5$(S)posix$(S)memmove.c
 	-$(LN) $(SRCTOP)$(S)lib$(S)krb5$(S)posix$(S)memmove.c $@
 
 memmove.o: memmove.c
-	$(CC) $(CFLAGS) -c $*.c
-@SHARED_RULE_LOCAL@
-	
 
+clean-unix:: clean-libobjs
 clean:: 
 	$(RM) memmove.c
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in
index ed9eedf4c..edea3c8fb 100644
--- a/src/lib/crypto/os/configure.in
+++ b/src/lib/crypto/os/configure.in
@@ -1,9 +1,7 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
-AC_LN_S
 AC_REPLACE_FUNCS(memmove)
 AC_HAVE_FUNCS(srand48 srand srandom getpid)
 KRB5_SOCKADDR_SA_LEN
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
index fbb5f0ba8..1d0aa949e 100644
--- a/src/lib/crypto/sha/ChangeLog
+++ b/src/lib/crypto/sha/ChangeLog
@@ -10,6 +10,11 @@ Thu Nov 21 00:58:04 EST 1996	Richard Basch	<basch@lehman.com>
 
 	* Makefile.in: Win32 build fixed
 
+Sun Dec 29 21:56:35 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library build procedure.
+
 Wed Aug 28 17:40:53 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* shs.c: Only include sys/types.h if present.
diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in
index e45646aed..a64757f57 100644
--- a/src/lib/crypto/sha/Makefile.in
+++ b/src/lib/crypto/sha/Makefile.in
@@ -5,9 +5,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 ##DOSOBJFILE=..\sha.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS=shs.o hmac_sha.o sha_crypto.o sha_glue.o
 
 OBJS=	shs.$(OBJEXT)		\
 	hmac_sha.$(OBJEXT)	\
@@ -20,8 +18,6 @@ SRCS=	$(srcdir)/shs.c		\
 	$(srcdir)/sha_glue.c
 
 
-all-unix:: shared $(OBJS) 
-all-mac:: shared $(OBJS) 
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -29,8 +25,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 t_shs: t_shs.o shs.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o
@@ -47,9 +42,6 @@ check-windows:: t_shs$(EXEEXT)
 clean:: 
 	$(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT)
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/sha/configure.in b/src/lib/crypto/sha/configure.in
index d270e01f3..9bdd7321e 100644
--- a/src/lib/crypto/sha/configure.in
+++ b/src/lib/crypto/sha/configure.in
@@ -1,7 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-dnl AC_DEFINE(NEW_SHS)
-V5_SHARED_LIB_OBJS
 AC_CHECK_HEADERS(sys/types.h)
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE