Merge of libhack_branch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
author: Tom Yu <tlyu@mit.edu> 1997-02-09 17:43:52 +0000
committer: Tom Yu <tlyu@mit.edu> 1997-02-09 17:43:52 +0000
commit: 561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch)
tree: 4165fe26da185697068044d1fba17cb15d5b19bc /src/lib
parent: 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff)
download: krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip
krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz
krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.bz2
99 files changed, 964 insertions, 870 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ecdb1d4..66a2e01 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 5dafc10..2482a19 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 53f9fcc..04d628e 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 eaf0e85..2317b41 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 34255de..7ba33e7 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 7eff1bc..106deb0 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 84bf43d..9eef6c1 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 bae2b14..cac503a 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 10592aa..20cc437 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 9197f11..a82e57b 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 b4619aa..c7ce9c0 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 51d99cb..e4941ce 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 f39b36c..65f4dc0 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 82263d1..35104ef 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 51d99cb..e4941ce 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 97f7910..b0b44f1 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 134e5c9..97790f0 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 ed9eedf..edea3c8 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 fbb5f0b..1d0aa94 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 e45646a..a64757f 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 d270e01..9bdd732 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
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 2acf19b..f36bf82 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -6,6 +6,14 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	read_passwd.c, unix_time.c:
 		DLL export various functions (mostly for wintel)
 
+Wed Jan  8 01:31:22 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in (clean-unix, install-unix): Properly install and clean.
+
+Mon Jan  6 07:47:56 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* configure.in, Makefile.in: Update to new library building procedure.
+
 Mon Nov 18 20:39:02 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index c8e5139..2e370d1 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -8,9 +8,35 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/k
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+LIB=des425
+LIBMAJOR=1
+LIBMINOR=0
+RELDIR=des425
+# Depends on libcrypto and libkrb5
+SHLIB_EXPDEPS = \
+	$(TOPLIBD)/libcrypto$(SHLIBEXT) \
+	$(TOPLIBD)/libkrb5$(SHLIBEXT)
+SHLIB_EXPLIBS=-lkrb5 -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
+STOBJLISTS=OBJS.ST
+STLIBOBJS=cksum.o	\
+	des.o		\
+	enc_dec.o	\
+	key_parity.o	\
+	key_sched.o	\
+	new_rnd_key.o	\
+	pcbc_encrypt.o	\
+	quad_cksum.o	\
+	random_key.o	\
+	read_passwd.o  \
+	str_to_key.o	\
+	unix_time.o     \
+	util.o		\
+	weak_key.o	\
+	k4_glue.o
+
 
 OBJS=	cksum.$(OBJEXT)		\
 	des.$(OBJEXT)		\
@@ -44,22 +70,11 @@ SRCS=	$(srcdir)/cksum.c	\
 	$(srcdir)/weak_key.c	\
 	$(srcdir)/k4_glue.c
 
-LIB_SUBDIRS= .
-LIBDONE= DONE
-#
-# Depends on libcrypto.
-#
-CRYPTO_VER=@CRYPTO_SH_VERS@
-KRB5_VER=@KRB5_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) $(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
-SHLIB_LIBS=-lkrb5 -lcrypto
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-
+# For test programs
 EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a
 DEPKLIB= $(TOPLIBD)/libcrypto.a
 
-all-unix:: shared $(OBJS)
+all-unix:: all-liblinks
 all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
@@ -84,9 +99,7 @@ check-windows::
 clean:: 
 	$(RM) verify$(EXEEXT) verify.$(OBJEXT)
 
-clean-unix::
-	$(RM) shared/*
-
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 clean-mac::
 clean-windows::
 	$(RM) des425.lib des425.bak $(OBJFILE)
@@ -103,3 +116,4 @@ install:: libdes425.a
 clean::
 	$(RM) libdes425.$(LIBEXT) libdes425.bak
 
+install-unix:: install-libs
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 07072c9..01d64e5 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -22,12 +22,7 @@ if test $krb5_cv_pragma_weak = yes; then
 AC_DEFINE(HAVE_PRAGMA_WEAK)
 fi
 dnl
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
 KRB5_RUN_FLAGS
-V5_MAKE_SHARED_LIB(libdes425,1.0,.., ./des425)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index e8c524b..c614ce0 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -2,6 +2,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build
 
+Tue Jan 14 20:07:50 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Nov 18 20:39:41 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index b241063..9f1180e 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,5 +1,3 @@
-TST=if test -n "`cat DONE`" ; then
-
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=gssapi.lib
 ##DOSOBJFILELIST=@generic.lst @krb5.lst
@@ -7,41 +5,24 @@ TST=if test -n "`cat DONE`" ; then
 
 MAC_SUBDIRS = generic krb5
 
-CRYPTO_VER=@CRYPTO_SH_VERS@
-COMERR_VER=@COMERR_SH_VERS@
-KRB5_VER=@KRB5_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-	$(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER) \
-	$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER)
-LIB_SUBDIRS= generic krb5
-LIBDONE= generic/DONE krb5/DONE # mechglue/DONE
-LIBUPDATE= $(BUILDTOP)/util/libupdate
-
-SHLIB_LIBS=-lkrb5 -lcrypto -lcom_err
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-
-all-unix::
-all-mac::
-
-libgssapi_krb5.$(STEXT): $(LIBDONE)
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE $(LIB_SUBDIRS)) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE $(LIB_SUBDIRS)) \
-	fi
-	$(RANLIB) libgssapi_krb5.$(STEXT)
-	touch libgssapi_krb5.stamp
+LIB=gssapi_krb5
+LIBMAJOR=1
+LIBMINOR=0
+STOBJLISTS=generic/OBJS.ST krb5/OBJS.ST
+SHLIB_EXPDEPS=\
+	$(TOPLIBD)/libkrb5.so \
+	$(TOPLIBD)/libcrypto.so \
+	$(TOPLIBD)/libcom_err.so
+SHLIB_EXPLIBS=-lkrb5 -lcrypto -lcom_err
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+RELDIR=gssapi
 
-install:: libgssapi_krb5.a
-	$(INSTALL_DATA) libgssapi_krb5.a $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
+all-unix:: all-liblinks
 
-clean-unix::
-	$(RM) libgssapi_krb5.a libgssapi_krb5.stamp
+install-unix:: install-libs
 
-clean-mac::
-	$(RM) libgssapi_krb5.a
+clean-unix:: clean-liblinks clean-libs
 
 clean-windows::
 	$(RM) gssapi.lib gssapi.bak
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index f2bb704..c0fba38 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -7,14 +7,5 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
-V5_MAKE_SHARED_LIB(libgssapi_krb5,1.0,.., ./gssapi)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-AC_SUBST(COMERR_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
-AppendRule([all:: libgssapi_krb5.a])
-AppendRule([all-unix:: ../libgssapi_krb5.a])
-AppendRule([all::	all-$(WHAT)])
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 6dc1653..7d26c1c 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 11:41:08 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in: Fix includes generation for unix after
+	libhack_branch merge.
+
 Thu Feb  6 11:11:17 1997  Ezra Peisach  (epeisach@mit.edu)
 
 	* configure.in: Remove the CopyHeader and CopySrcHeader rules as
@@ -23,6 +28,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	DLL export all public gssapi functions; move windows/mac stuff to
 	win-mac.h
 
+Tue Jan 14 20:16:46 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Wed Nov 20 13:59:58 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (install): Install gssapi.h from the build tree.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 4e493d7..276417c 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -5,15 +5,8 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 ##DOSOBJFILE=..\generic.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
 all-windows:: $(OBJS)
 
-shared:
-	mkdir shared
-
 ETSRCS= gssapi_err_generic.c
 ETOBJS= gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
@@ -28,11 +21,6 @@ $(EHDRDIR)$(S)gssapi.h: gssapi.h
 $(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
 	$(CP) $(srcdir)$(S)gssapi_generic.h $@
 
-gssapi_err_generic.o: gssapi_err_generic.c
-	$(CC) $(CFLAGS) -c $*.c
-
-@SHARED_RULE_LOCAL@
-
 gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
 gssapi_err_generic.c: gssapi_err_generic.et
@@ -89,13 +77,32 @@ OBJS = \
 	util_validate.$(OBJEXT) \
 	gssapi_err_generic.$(OBJEXT)
 
+STLIBOBJS = \
+	disp_com_err_status.o \
+	disp_major_status.o \
+	gssapi_generic.o \
+	oid_ops.o \
+	rel_buffer.o \
+	rel_oid_set.o \
+	util_buffer.o \
+	util_canonhost.o \
+	util_dup.o \
+	util_oid.o \
+	util_ordering.o \
+	util_set.o \
+	util_token.o \
+	util_validate.o \
+	gssapi_err_generic.o
+
 EXPORTED_HEADERS= gssapi_generic.h
 EXPORTED_BUILT_HEADERS= gssapi.h
 
 $(OBJS): $(EXPORTED_HEADERS) $(ETHDRS)
 
-all-unix:: shared includes-unix $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
-all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
+all-unix:: includes-unix
+all-unix:: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS)
+all-unix:: all-libobjs
+
 all-windows:: win-include $(HDRS) $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -108,11 +115,8 @@ win-include::
 
 unixmac: $(SRCS) $(ETHDRS)
 
-clean-unix::
-	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/* $(EXPORTED_BUILT_HEADERS) 
-
-clean-mac::
-	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
+clean-unix:: clean-libobjs
+	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS)
 
 clean-windows::
 	$(RM) $(HDRS) $(OBJFILE)
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index f6953b9..f879d41 100644
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -2,13 +2,10 @@ AC_INIT(configure.in)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_PROG_AWK
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
 AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h)
 AC_SIZE_T
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
-dnl CopyHeader(gssapi.h,[$(EHDRDIR)])
-dnl CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index e067bbd..54bfce2 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -10,6 +10,11 @@ Tue Feb  4 15:56:01 1997  Richard Basch  <basch@lehman.com>
 	* Makefile.in: Only override the object build of the error table
 		under Unix
 
+Tue Jan 14 20:20:10 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Wed Dec  4 13:06:13 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* acquire_cred.c (acquire_accept_cred): use krb5_kt_get_entry
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 45db673..579edd1 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -5,22 +5,10 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 ##DOSOBJFILE = ..\krb5.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
-shared:
-	mkdir shared
-
 ETSRCS= gssapi_err_krb5.c
 ETOBJS= gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.o: gssapi_err_krb5.c
-	$(CC) $(CFLAGS) -c $*.c
-
-@SHARED_RULE_LOCAL@
-
 gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 gssapi_err_krb5.h: gssapi_err_krb5.et
 gssapi_err_krb5.c: gssapi_err_krb5.et
@@ -105,6 +93,46 @@ OBJS = \
 #	k5mech.$(OBJEXT) \
 #	pname_to_uid.$(OBJEXT)
 
+STLIBOBJS = \
+	accept_sec_context.o \
+	acquire_cred.o \
+	compare_name.o \
+	context_time.o \
+	delete_sec_context.o \
+	disp_name.o \
+	disp_status.o \
+	export_sec_context.o \
+	get_tkt_flags.o \
+	gssapi_krb5.o \
+	import_name.o \
+	import_sec_context.o \
+	indicate_mechs.o \
+	init_sec_context.o \
+	inq_context.o \
+	inq_cred.o \
+	inq_names.o \
+	k5seal.o \
+	k5unseal.o \
+	krb5_gss_glue.o \
+	process_context_token.o \
+	rel_cred.o \
+	rel_oid.o \
+	rel_name.o \
+	seal.o \
+	ser_sctx.o \
+	sign.o \
+	unseal.o \
+	util_cksum.o \
+	util_crypt.o \
+	util_seed.o \
+	util_seqnum.o \
+	verify.o \
+	wrap_size_limit.o \
+	gssapi_err_krb5.o
+
+#	k5mech.o \
+#	pname_to_uid.o
+
 HDRS= $(ETHDRS)
 
 EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
@@ -115,19 +143,17 @@ EXPORTED_HEADERS= gssapi_krb5.h
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj >$(OBJFILE)
 
-all-unix:: shared $(SRCS) $(HDRS) includes $(OBJS)
-all-mac:: shared $(SRCS) $(HDRS) includes $(OBJS)
 all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) $(OBJFILE)
 
+all-unix:: $(SRCS) $(HDRS) includes
+all-unix:: all-libobjs
+
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
 	copy gssapi_krb5.h $(EHDRDIR)
 
-clean-unix::
-	$(RM) $(ETHDRS) $(ETSRCS) shared/*
-
-clean-mac::
-	$(RM) $(ETHDRS) $(ETSRCS) shared/*
+clean-unix:: clean-libobjs
+	$(RM) $(ETHDRS) $(ETSRCS)
 
 clean-windows::
 	$(RM) $(EHDRDIR)\gssapi_krb5.h $(OBJFILE)
diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in
index 7190864..8de9aa6 100644
--- a/src/lib/gssapi/krb5/configure.in
+++ b/src/lib/gssapi/krb5/configure.in
@@ -3,7 +3,6 @@ CONFIG_RULES
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_CHECK_HEADERS(stdlib.h)
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 CopySrcHeader(gssapi_krb5.h,[$](BUILDTOP)/include/gssapi)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index fd0d19e..2aa7cc9 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 16 19:01:00 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (all-prerecurse): Update to use double-colon rules.
+
+Wed Jan 15 20:43:01 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new libarary build procedure.
+
 Mon Nov 11 17:01:40 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* kadm_rpc_xdr.c: fix memory leak handling key_data and tl_data
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index c91f7b5..8fbb06e 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -2,21 +2,9 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
 kadm_err.$(OBJEXT): kadm_err.c
-	$(CC) $(CFLAGS) -c $*.c
-@SHARED_RULE_LOCAL@
-
 adb_err.$(OBJEXT): adb_err.c
-	$(CC) $(CFLAGS) -c $*.c
-@SHARED_RULE_LOCAL@
-
 chpass_util_strings.$(OBJEXT): chpass_util_strings.c
-	$(CC) $(CFLAGS) -c $*.c
-@SHARED_RULE_LOCAL@
 
 kadm_err.c kadm_err.h: $(srcdir)/kadm_err.et
 adb_err.c adb_err.h: $(srcdir)/adb_err.et
@@ -49,6 +37,18 @@ OBJS =	kadm_err.$(OBJEXT) \
 	str_conv.$(OBJEXT) \
 	logger.$(OBJEXT)
 
+STLIBOBJS = \
+	kadm_err.o \
+	adb_err.o \
+	chpass_util_strings.o \
+	ovsec_glue.o \
+	misc_free.o \
+	kadm_rpc_xdr.o \
+	chpass_util.o \
+	alt_prof.o \
+	str_conv.o \
+	logger.o
+
 HDRDIR=$(BUILDTOP)/include/kadm5
 HDRS =	$(HDRDIR)/adb.h \
 	$(HDRDIR)/admin.h \
@@ -60,21 +60,14 @@ HDRS =	$(HDRDIR)/adb.h \
 	$(HDRDIR)/chpass_util_strings.h \
 	$(HDRDIR)/kadm_err.h
 
-$(OBJS): $(HDRS)
-all-unix:: shared
-all-unix:: $(OBJS) DONE
-all-unix:: all-recurse
-all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-prerecurse:: includes
+all-prerecurse:: all-libobjs
 
-shared:
-	mkdir shared
+all-windows:: $(OBJS)
 
 check-windows::
 
-clean-unix::
-	$(RM) shared/*
-	-rmdir shared
+clean-unix:: clean-libobjs
 
 clean-mac::
 clean-windows::
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 4b737d5..2ee7195 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 15 20:49:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Wed Nov 13 19:20:11 1996  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (clean-unix): Remove shared/*.
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 234dd35..65b25bf 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -1,12 +1,25 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5
 
+LIB=kadm5clnt
+LIBMAJOR=1
+LIBMINOR=0
+STOBJLISTS=../OBJS.ST OBJS.ST
+SHLIB_EXPDEPS=\
+	$(TOPLIBD)/libgssrpc.so \
+	$(TOPLIBD)/libgssapi_krb5.so \
+	$(TOPLIBD)/libkdb5.so \
+	$(TOPLIBD)/libkrb5.so \
+	$(TOPLIBD)/libcrypto.so \
+	$(TOPLIBD)/libcom_err.so \
+	$(TOPLIBD)/libdyn.so
+SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkdb5 -lkrb5 -lcrypto -lcom_err -ldyn
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+RELDIR=kadm5/clnt
+
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME = libkadm5clnt.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
 SRCS =	$(srcdir)/clnt_policy.c \
 	$(srcdir)/client_rpc.c \
 	$(srcdir)/client_principal.c \
@@ -22,59 +35,22 @@ OBJS =	\
 	clnt_privs.$(OBJEXT) \
 	clnt_chpass_util.$(OBJEXT)
 
-LIBUPDATE=$(BUILDTOP)/util/libupdate
-
-#
-# Depends on libgssrpc, libgssapi_krb5, libkdb5, libkrb5, libcrypto,
-# libcom_err, libdyn
-#
-GSSRPC_VER=@GSSRPC_SH_VERS@
-GSSAPI_KRB5_VER=@GSSAPI_KRB5_SH_VERS@
-KDB5_VER=@KDB5_SH_VERS@
-KRB5_VER=@KRB5_SH_VERS@
-CRYPTO_VER=@CRYPTO_SH_VERS@
-COMERR_VER=@COMERR_SH_VERS@
-DYN_VER=@DYN_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libgssrpc.$(SHEXT).$(GSSRPC_VER) \
-	$(TOPLIBD)/libgssapi_krb5.$(SHEXT).$(GSSAPI_KRB5_VER) \
-	$(TOPLIBD)/libkdb5.$(SHEXT).$(KDB5_VER) \
-	$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
-	$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-	$(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER) \
-	$(TOPLIBD)/libdyn.$(SHEXT).$(DYN_VER)
-
-SHLIB_LIBS=-lgssrpc -lgssapi_krb5 -lkdb5 -lkrb5 -lcrypto -lcom_err -ldyn
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
+STLIBOBJS = \
+	clnt_policy.o \
+	client_rpc.o \
+	client_principal.o \
+	client_init.o \
+	clnt_privs.o \
+	clnt_chpass_util.o
 
-all-unix:: shared includes $(OBJS)
-all-mac:: $(OBJS)
+all-unix:: includes
+all-unix:: all-liblinks
 all-windows:: $(OBJS)
 
-LIBDONE=../DONE DONE
-LIB_SUBDIRS=.. .
-
-shared:
-	mkdir shared
-
-libkadm5clnt.$(STEXT): $(LIBDONE)
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE $(LIB_SUBDIRS)) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE $(LIB_SUBDIRS)) \
-	fi
-	$(RANLIB) $@
-	touch libkadm5clnt.stamp
-
 check-windows::
 
-clean-mac::
 clean-windows::
 
-clean-unix::
-	$(RM) libkadm5clnt.$(STEXT) libkadm5clnt.stamp
-	$(RM) shared/*
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-install:: libkadm5clnt.a
-	$(INSTALL_DATA) libkadm5clnt.a $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt.a
+install:: install-libs
diff --git a/src/lib/kadm5/clnt/configure.in b/src/lib/kadm5/clnt/configure.in
index a25e4e7..d4e9736 100644
--- a/src/lib/kadm5/clnt/configure.in
+++ b/src/lib/kadm5/clnt/configure.in
@@ -4,25 +4,7 @@ AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libkadm5clnt, 1.0, ../.., ./kadm5/clnt)
-
-GSSRPC_SH_VERS=$krb5_cv_shlib_version_libgssrpc
-AC_SUBST(GSSRPC_SH_VERS)
-GSSAPI_KRB5_SH_VERS=$krb5_cv_shlib_version_libgssapi_krb5
-AC_SUBST(GSSAPI_KRB5_SH_VERS)
-KDB5_SH_VERS=$krb5_cv_shlib_version_libkdb5
-AC_SUBST(KDB5_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-AC_SUBST(COMERR_SH_VERS)
-DYN_SH_VERS=$krb5_cv_shlib_version_libdyn
-AC_SUBST(DYN_SH_VERS)
-
-SubdirLibraryRule([$(OBJS)])
-
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 CopySrcHeader(client_internal.h,[$](BUILDTOP)/include/kadm5)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
index b118b82..f228eeb 100644
--- a/src/lib/kadm5/configure.in
+++ b/src/lib/kadm5/configure.in
@@ -10,27 +10,6 @@ AC_PROG_LEX
 AC_PROG_AWK
 AC_CHECK_HEADERS(syslog.h)
 AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
-V5_SHARED_LIB_OBJS
-
-dnl V5_MAKE_SHARED_LIB(libkadm5srv,1.0,.., ./kadm5,srv)
-dnl V5_MAKE_SHARED_LIB(libkadm5clnt,1.0,.., ./kadm5,clnt)
-dnl GSSRPC_SH_VERS=$krb5_cv_shlib_version_libgssrpc
-dnl AC_SUBST(GSSRPC_SH_VERS)
-dnl GSSAPI_KRB5_SH_VERS=$krb5_cv_shlib_version_libgssapi_krb5
-dnl AC_SUBST(GSSAPI_KRB5_SH_VERS)
-dnl KDB5_SH_VERS=$krb5_cv_shlib_version_libkdb5
-dnl AC_SUBST(KDB5_SH_VERS)
-dnl KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-dnl AC_SUBST(KRB5_SH_VERS)
-dnl CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-dnl AC_SUBST(CRYPTO_SH_VERS)
-dnl COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-dnl AC_SUBST(COMERR_SH_VERS)
-dnl DYN_SH_VERS=$krb5_cv_shlib_version_libdyn
-dnl AC_SUBST(DYN_SH_VERS)
-
-SubdirLibraryRule([$(OBJS)])
-
 CopySrcHeader(adb.h,[$](BUILDTOP)/include/kadm5)
 CopySrcHeader(admin.h,[$](BUILDTOP)/include/kadm5)
 CopySrcHeader(admin_internal.h,[$](BUILDTOP)/include/kadm5)
@@ -42,6 +21,5 @@ CopySrcHeader(server_internal.h,[$](BUILDTOP)/include/kadm5)
 CopyHeader(adb_err.h,[$](BUILDTOP)/include/kadm5)
 CopyHeader(chpass_util_strings.h,[$](BUILDTOP)/include/kadm5)
 CopyHeader(kadm_err.h,[$](BUILDTOP)/include/kadm5)
-AppendRule([all:: all-$(WHAT)])
-ALL_RECURSE=
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 0a65eff..2da7c92 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 15 20:59:11 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Tue Dec  3 15:14:29 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* server_acl.c (acl_load_acl_file): log errors via
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index fe94d2b..999c18b 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -3,9 +3,22 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME = libkadm5srv.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+LIB=kadm5srv
+LIBMAJOR=1
+LIBMINOR=0
+STOBJLISTS=../OBJS.ST OBJS.ST
+SHLIB_EXPDEPS=\
+	$(TOPLIBD)/libgssrpc.so \
+	$(TOPLIBD)/libgssapi_krb5.so \
+	$(TOPLIBD)/libkdb5.so \
+	$(TOPLIBD)/libkrb5.so \
+	$(TOPLIBD)/libcrypto.so \
+	$(TOPLIBD)/libcom_err.so \
+	$(TOPLIBD)/libdyn.so
+SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkdb5  -lkrb5 -lcrypto -lcom_err -ldyn @LIBS@
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+RELDIR=kadm5/srv
 
 SRCS =	$(srcdir)/svr_policy.c \
 	$(srcdir)/svr_principal.c \
@@ -35,59 +48,30 @@ OBJS =	svr_policy.$(OBJEXT) \
 	adb_free.$(OBJEXT) \
 	adb_openclose.$(OBJEXT)
 
-LIBUPDATE=$(BUILDTOP)/util/libupdate
+STLIBOBJS = \
+	svr_policy.o \
+	svr_principal.o \
+	server_acl.o \
+	server_kdb.o \
+	server_misc.o \
+	server_init.o \
+	server_dict.o \
+	svr_iters.o \
+	svr_chpass_util.o \
+	adb_xdr.o \
+	adb_policy.o \
+	adb_free.o \
+	adb_openclose.o
 
-#
-# Depends on libgssrpc, libgssapi_krb5, libkdb5, libkrb5, libcrypto,
-# libcom_err, libdyn
-#
-GSSRPC_VER=@GSSRPC_SH_VERS@
-GSSAPI_KRB5_VER=@GSSAPI_KRB5_SH_VERS@
-KDB5_VER=@KDB5_SH_VERS@
-KRB5_VER=@KRB5_SH_VERS@
-CRYPTO_VER=@CRYPTO_SH_VERS@
-COMERR_VER=@COMERR_SH_VERS@
-DYN_VER=@DYN_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libgssrpc.$(SHEXT).$(GSSRPC_VER) \
-	$(TOPLIBD)/libgssapi_krb5.$(SHEXT).$(GSSAPI_KRB5_VER) \
-	$(TOPLIBD)/libkdb5.$(SHEXT).$(KDB5_VER) \
-	$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
-	$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-	$(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER) \
-	$(TOPLIBD)/libdyn.$(SHEXT).$(DYN_VER)
-
-SHLIB_LIBS=-lgssrpc -lgssapi_krb5 -lkdb5  -lkrb5 -lcrypto -lcom_err -ldyn @LIBS@
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-
-all-unix:: shared includes $(OBJS)
-all-mac:: $(OBJS)
+all-unix:: includes
+all-unix:: all-liblinks
 all-windows:: $(OBJS)
 
-LIBDONE=../DONE DONE
-LIB_SUBDIRS=.. .
-
-shared:
-	mkdir shared
-
-libkadm5srv.$(STEXT): $(LIBDONE)
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE $(LIB_SUBDIRS)) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE $(LIB_SUBDIRS)) \
-	fi
-	$(RANLIB) $@
-	touch libkadm5srv.stamp
-
 check-windows::
 
 clean-mac::
 clean-windows::
 
-clean-unix::
-	$(RM) libkadm5srv.$(STEXT) libkadm5srv.stamp
-	$(RM) shared/*
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-install:: libkadm5srv.a
-	$(INSTALL_DATA) libkadm5srv.a $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv.a
+install:: install-libs
diff --git a/src/lib/kadm5/srv/configure.in b/src/lib/kadm5/srv/configure.in
index 0e625c4..b0c69dd 100644
--- a/src/lib/kadm5/srv/configure.in
+++ b/src/lib/kadm5/srv/configure.in
@@ -26,25 +26,8 @@ case $krb5_cv_host in
 	;;
 esac
 
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libkadm5srv, 1.0, ../.., ./kadm5/srv)
-
-GSSRPC_SH_VERS=$krb5_cv_shlib_version_libgssrpc
-AC_SUBST(GSSRPC_SH_VERS)
-GSSAPI_KRB5_SH_VERS=$krb5_cv_shlib_version_libgssapi_krb5
-AC_SUBST(GSSAPI_KRB5_SH_VERS)
-KDB5_SH_VERS=$krb5_cv_shlib_version_libkdb5
-AC_SUBST(KDB5_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-AC_SUBST(COMERR_SH_VERS)
-DYN_SH_VERS=$krb5_cv_shlib_version_libdyn
-AC_SUBST(DYN_SH_VERS)
-
-SubdirLibraryRule([$(OBJS)])
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 
 CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 2fe5fb9..b77f864 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 23:10:56 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Mon Dec  9 15:57:55 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* api.0/init.exp, api.2/init.exp: use spawn/expect instead of exec
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index 333c663..71803fe 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS  =	$(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: init-test destroy-test client-handle-test client-iter-test
 all:: randkey-test server-handle-test lock-test server-iter-test 
@@ -7,40 +9,44 @@ all:: randkey-test server-handle-test lock-test server-iter-test
 # The client-side test programs.
 #
 
-init-test: init-test.o client_init.o $(CLNTDEPLIPS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o init-test init-test.o client_init.o \
-		$(CLNTLIBS)
+init-test: init-test.o client_init.o $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o init-test init-test.o client_init.o \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 client_init.o: $(SRCTOP)/lib/kadm5/clnt/client_init.c
 	$(CC) $(CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I$(SRCTOP)/lib/kadm5 $(SRCTOP)/lib/kadm5/clnt/client_init.c
 
-destroy-test: destroy-test.o $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o destroy-test destroy-test.o $(CLNTLIBS)
+destroy-test: destroy-test.o $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o destroy-test destroy-test.o \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
-client-handle-test: handle-test.o $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o client-handle-test handle-test.o \
-		$(CLNTLIBS)
+client-handle-test: handle-test.o $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o client-handle-test handle-test.o \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
-client-iter-test: iter-test.o $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o client-iter-test iter-test.o \
-		$(CLNTLIBS)
+client-iter-test: iter-test.o $(KADMLCNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o client-iter-test iter-test.o \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 #
 # The server-side test programs.
 #
 
-randkey-test: randkey-test.o $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o randkey-test randkey-test.o $(SRVLIBS)
+randkey-test: randkey-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o randkey-test randkey-test.o \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
-server-handle-test: handle-test.o $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o server-handle-test handle-test.o \
-		$(SRVLIBS)
+server-handle-test: handle-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o server-handle-test handle-test.o \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
-lock-test: lock-test.o $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o lock-test lock-test.o $(SRVLIBS)
+lock-test: lock-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o lock-test lock-test.o \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
-server-iter-test: iter-test.o $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o server-iter-test iter-test.o $(SRVLIBS)
+server-iter-test: iter-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o server-iter-test iter-test.o \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
 #
 # The unit-test targets
diff --git a/src/lib/kadm5/unit-test/configure.in b/src/lib/kadm5/unit-test/configure.in
index dbf656b..fb32f91 100644
--- a/src/lib/kadm5/unit-test/configure.in
+++ b/src/lib/kadm5/unit-test/configure.in
@@ -5,18 +5,10 @@ dnl The following are tests for the presence of programs required for testing
 AC_CHECK_PROG(RUNTEST,runtest,runtest)
 AC_CHECK_PROG(PERL,perl,perl)
 AC_KRB5_TCL	
-if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then
+if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
  	DO_TEST=ok
 fi
 AC_SUBST(DO_TEST) 
 dnl
-USE_KADMCLNT_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-USE_SS_LIBRARY
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index ca9b830..dac33ff 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb  6 15:33:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
+Wed Jan  8 01:59:15 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in, configure.in: Convert to new build procedure for libs.
+
 Mon Nov 18 20:40:12 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index fad8268..2480bf8 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,22 +1,22 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-KRB5_VER=@KRB5_SH_VERS@
-CRYPTO_VER=@CRYPTO_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
-	$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
+LIB=kdb5
+LIBMAJOR=1
+LIBMINOR=0
+RELDIR=kdb
+# Depends on libcrypto and libkrb5
+SHLIB_EXPDEPS = \
+	$(TOPLIBD)/libcrypto$(SHLIBEXT) \
+	$(TOPLIBD)/libkrb5$(SHLIBEXT)
+SHLIB_EXPLIBS=-lkrb5 -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-SHLIB_LIBS=$(LIBS)
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ 
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
-
-
-all:: $(OBJS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+all:: 
 
 SRCS= \
 	$(srcdir)/keytab.c \
@@ -30,7 +30,8 @@ SRCS= \
 	$(srcdir)/setup_mkey.c \
 	$(srcdir)/store_mkey.c
 
-OBJS= \
+STOBJLISTS=OBJS.ST
+STLIBOBJS= \
 	keytab.o \
 	encrypt_key.o \
 	decrypt_key.o \
@@ -42,33 +43,12 @@ OBJS= \
 	setup_mkey.o \
 	store_mkey.o
 
-LIB_SUBDIRS= .
-LIBDONE = DONE
-
-all-unix:: shared
-
-shared:
-	mkdir shared
-
-clean-unix::
-	$(RM) shared/*
-	-rmdir shared
-
-DONE: $(OBJS)
-	$(RM) DONE
-	echo $(OBJS) > DONE
-
-libkdb5.$(STEXT): $(OBJS)
-	$(RM) $@
-	$(ARADD) $@ $(OBJS)
-	$(RANLIB) $@
-
-
-clean::
-	$(RM) libkdb5.a DONE
+all-unix:: all-liblinks
+install-unix:: install-libs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-t_kdb:	t_kdb.o $(OBJS) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(TOPLIBD)/libcom_err.a $(TOPLIBD)/libdb.a
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_kdb t_kdb.o $(OBJS) $(LIBS) $(TOPLIBD)/libdb.a
+t_kdb:	t_kdb.o $(OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_kdb t_kdb.o $(OBJS) $(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
 check::	t_kdb
 	KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 8f04d98..9b63c49 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -17,13 +17,8 @@ case $krb5_cv_host in
 	;;
 esac
 KRB5_RUN_FLAGS
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libkdb5,1.0,.., ./kdb)
-AppendRule([all-unix:: ../libkdb5.a])
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
+dnl The following is for check...
+KRB5_BUILD_PROGRAM
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 1c7296b..3d6fc38 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,11 @@
+Sat Feb  1 08:44:00 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in (STOBJLISTS): Fix up des425 reference.
+
+Wed Jan  8 01:34:30 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in, configure.in: Convert to new build procedure.
+
 Mon Nov 18 20:40:39 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index f0ea3ba..e22da54 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -4,11 +4,19 @@ DEFINES=-I$(srcdir)/../../include/kerberosIV
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
 
-EHDRDIR=$(BUILDTOP)$(S)include
+LIB=krb4
+LIBMAJOR=1
+LIBMINOR=0
+RELDIR=krb4
+# Depends on libcrypto and libkrb5
+SHLIB_EXPDEPS = \
+	$(TOPLIBD)/libcrypto$(SHLIBEXT) \
+	$(TOPLIBD)/libkrb5$(SHLIBEXT)
+SHLIB_EXPLIBS=-lkrb5 -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+EHDRDIR=$(BUILDTOP)$(S)include
 
 OBJS	= \
 	cr_auth_repl.$(OBJEXT) \
@@ -82,24 +90,23 @@ SRCS = \
 	$(CACHESRCS) $(SETENVSRCS) $(STRCASESRCS) $(SHMSRCS) \
 	$(LIB_KRB_HOSTSRCS) $(SERVER_KRB_SRCS) $(NETIO_SRCS) $(REALMDBSRCS)
 
+STLIBOBJS  = $(OBJS)
+STOBJLISTS=OBJS.ST
 
-LIB_SUBDIRS= .
-LIBDONE= DONE
-#
-# Depends on libcrypto and KRB4_CRYPTO_LIB,
-#	_et_list.
+
+# Depends on libcrypto, libkrb5, KRB4_CRYPTO_LIB and _et_list...
 # Depends on libkrb5, expect to find
 #	krb5_init_context, krb5_free_context, profile_get_values
 #
-KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
-DEPKRB4_LIBS=@DEPKRB4_CRYPTO_LIB@
-KRB5_VER=@KRB5_SH_VERS@
-CRYPTO_VER=@CRYPTO_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
-	$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
-SHLIB_LIBS=-lkrb5 $(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ 
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
+KRB4_CRYPTO_LIBS=-ldes425
+DEPKRB4_LIBS=	$(TOPLIBD)/libdes425$(SHLIBEXT) 
+SHLIB_EXPDEPS = $(DEPKRB4_LIBS) \
+	$(TOPLIBD)/libcrypto$(SHLIBEXT) \
+	$(TOPLIBD)/libkrb5$(SHLIBEXT)
+SHLIB_EXPLIBS=-lkrb5 $(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
 
 #
 # These objects implement ticket cacheing for Unix.  They are
@@ -175,19 +182,12 @@ all-really:: all-$(WHAT)
 # We want *library* compiler options...
 DBG=$(DBG_LIB)
 
-all-unix:: shared  krb_err.h includes
-
-shared:
-	mkdir shared
+all-unix:: krb_err.h includes all-liblinks
 
 # comp_et_depend(krb_err)
 krb_err.h:: krb_err.et
 krb_err.c: krb_err.et
 
-krb_err.o: krb_err.c
-	$(CC) $(CFLAGS) -c krb_err.c
-@SHARED_RULE_LOCAL@
-
 depend:: krb_err.h
 #
 
@@ -199,11 +199,6 @@ depend:: $(CODE)
 
 DEFINES=$(FALLBACK) $(OLD_SRVTAB) $(OLD_KLOGIN) -I$(srcdir)/../../include/kerberosIV
 
-$(LIBNAME): $(OBJS)
-	$(RM) $@
-	$(ARCHIVE) $(ARCHIVEARGS)
-	$(RANLIB) $@
-
 #
 # What we build for `all' and `install' targets on Windows
 #
@@ -252,7 +247,8 @@ clean-unix::
 	-$(RM) krb_err.c
 	-$(RM) krb_err.h
 	-$(RM) ../../include/krb_err.h
-	-$(RM) shared/*
+
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 clean-windows::
 	-$(RM) kerberos.lib
@@ -276,3 +272,4 @@ check-mac:: $(TEST_PROGS)
 
 check-windows::
 
+install-unix:: install-libs
diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 2a4c8b3..d9da67f 100644
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -42,12 +42,8 @@ fi
 AC_DEFINE(KRB4_USE_KEYTAB)
 AC_HAVE_FUNCS(strsave seteuid setreuid setresuid)
 AC_PROG_AWK
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([$(OBJS)])
-V5_MAKE_SHARED_LIB(libkrb4,1.0,.., ./krb4)
 CopyHeader(krb_err.h,$(EHDRDIR))
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
+
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index e2e717c..023d4aa 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -2,6 +2,19 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build
 
+Fri Feb  7 21:48:10 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in: Add rule to install libraries.
+
+Fri Jan  3 16:47:59 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new KRB5_BUILD_LIBRARY_WITH_DEPS
+ 	macro.
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Nov 18 20:42:39 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index f9227fa..a21e646 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -20,30 +20,41 @@ LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 		posix/DONE $(BUILDTOP)/util/profile/DONE
 
 #
-CRYPTO_VER=@CRYPTO_SH_VERS@
-COMERR_VER=@COMERR_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-	$(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER) \
-	$(ANAME_DBDEP)
-SHLIB_LIBS=-lcrypto -lcom_err $(ANAME_DBLIB) @SHLIB_GEN@
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	
+#SHLIB_LIBS=-lcrypto -lcom_err $(ANAME_DBLIB) @SHLIB_GEN@
+#SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	
 #	$(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
+#SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
-all-unix::
-all-windows::
+LIB=krb5
+LIBMAJOR=1
+LIBMINOR=0
+
+STOBJLISTS= \
+	error_tables/OBJS.ST \
+	asn.1/OBJS.ST \
+	ccache/OBJS.ST ccache/stdio/OBJS.ST ccache/file/OBJS.ST \
+	ccache/memory/OBJS.ST \
+	keytab/OBJS.ST keytab/file/OBJS.ST \
+	krb/OBJS.ST \
+	rcache/OBJS.ST \
+	free/OBJS.ST \
+	os/OBJS.ST \
+	posix/OBJS.ST \
+	$(BUILDTOP)/util/profile/OBJS.ST
+
+RELDIR=krb5
+SHLIB_EXPDEPS = \
+	$(TOPLIBD)/libcrypto$(SHLIBEXT) \
+	$(TOPLIBD)/libcom_err$(SHLIBEXT)
+SHLIB_EXPLIBS=-lcrypto -lcom_err @SHLIB_GEN@
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-libkrb5.$(STEXT): $(LIBDONE)
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE $(LIB_SUBDIRS)) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE $(LIB_SUBDIRS)) \
-	fi
-	$(RANLIB) libkrb5.$(STEXT)
-	touch libkrb5.stamp
+all-unix:: all-liblinks
+
+all-windows::
 
-clean-unix::
-	$(RM) libkrb5.$(LIBEXT) libkrb5.stamp
+clean-unix:: clean-liblinks clean-libs
 
 clean-windows::
 	$(RM) krb5.lib krb5.bak
@@ -109,3 +120,4 @@ clean-windows::
 	cd ..
 	@echo Making clean locally
 
+install-unix:: install-libs
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 64ce1a4..266e982 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -2,6 +2,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build
 
+Thu Jan  2 16:56:10 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Thu Nov 14 20:57:55 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* asn1_k_encode.c (asn1_encode_principal_name): Be liberal about
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 91afd6f..07cba37 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -7,9 +7,17 @@ CFLAGS=$(CCOPTS) $(DEFS)
 
 EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	asn1_decode.o\
+	asn1_k_decode.o\
+	asn1_encode.o\
+	asn1_get.o\
+	asn1_make.o\
+	asn1buf.o\
+	krb5_decode.o\
+	krb5_encode.o\
+	asn1_k_encode.o\
+	asn1_misc.o
 
 SRCS= \
 	$(srcdir)asn1_decode.c\
@@ -35,23 +43,15 @@ OBJS= \
 	asn1_k_encode.$(OBJEXT)\
 	asn1_misc.$(OBJEXT)
 
-all-unix:: shared $(OBJS)
-all-mac::  $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
 ##DOS	$(RM) $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
+all-unix:: all-libobjs
 
-shared:
-	mkdir shared
-
-clean-unix::
-	$(RM) shared/* $(OBJS)
-
-clean-mac::
-	$(RM) $(OBJS)
+clean-unix:: clean-libobjs
 
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 7eff1bc..106deb0 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/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/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index f2b4d65..94e514e 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -5,6 +5,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	* ccbase.c, ccdefault.c:
 	DLL export basic ccache functions
 
+Thu Jan  2 16:57:35 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new lib build procedure.
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 5661182..6482ba4 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -7,9 +7,11 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio
 
 MAC_SUBDIRS = file stdio
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	ccbase.o \
+	ccdefault.o \
+	ccdefops.o \
+	ser_cc.o
 
 OBJS=	ccbase.$(OBJEXT) \
 	ccdefault.$(OBJEXT) \
@@ -21,9 +23,8 @@ SRCS=	$(srcdir)/ccbase.c \
 	$(srcdir)/ccdefops.c \
 	$(srcdir)/ser_cc.c
 
-all-unix:: shared $(OBJS) 
+all-unix:: all-libobjs
 
-all-mac:: $(OBJS) 
 all-windows:: subdirs $(OBJFILE) 
 
 ##DOSsubdirs:: file\file.lst
@@ -38,13 +39,8 @@ all-windows:: subdirs $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
-shared: 
-	mkdir shared
+clean-unix:: clean-libobjs
 
-clean-unix::
-	$(RM) shared/*
-
-clean-mac:
 clean-windows::
 	cd file
 	@echo Making clean in krb5\ccache\file
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
index b5eea4d..f38d506 100644
--- a/src/lib/krb5/ccache/configure.in
+++ b/src/lib/krb5/ccache/configure.in
@@ -1,10 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 CONFIG_DIRS(stdio file memory)
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 DO_SUBDIRS
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([$(OBJS)])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 43f4a70..247cab2 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -11,6 +11,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 		functions to comply with the new function calling
 		conventions of the ccache dispatch functions (win16/win32)
 
+Thu Jan  2 16:59:19 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new lib build procedure.
+
 Thu Aug 15 16:46:00 1996  Tom Yu  <tlyu@mit.edu>
 
 	* fcc_retrv.c (flags_match): Add parens to def'n of flags_match to
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 1c1c246..8f65479 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -5,9 +5,14 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE = file.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	fcc_close.o fcc_destry.o fcc_eseq.o \
+	fcc_gennew.o fcc_getnam.o fcc_gprin.o \
+	fcc_init.o fcc_nseq.o fcc_read.o \
+	fcc_reslv.o fcc_retrv.o fcc_sseq.o \
+	fcc_store.o fcc_skip.o fcc_ops.o \
+	fcc_write.o fcc_sflags.o fcc_defops.o \
+	fcc_errs.o fcc_maybe.o
 
 OBJS 	= fcc_close.$(OBJEXT) fcc_destry.$(OBJEXT) fcc_eseq.$(OBJEXT) \
 	fcc_gennew.$(OBJEXT) fcc_getnam.$(OBJEXT) fcc_gprin.$(OBJEXT) \
@@ -25,8 +30,6 @@ SRCS 	= $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \
 	$(srcdir)/fcc_write.c $(srcdir)/fcc_sflags.c $(srcdir)/fcc_defops.c \
 	$(srcdir)/fcc_errs.c $(srcdir)/fcc_maybe.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -34,12 +37,10 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared: 
-	mkdir shared
+all-unix:: all-libobjs
+all-windows:: $(OBJS)
 
-clean-unix::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 
-clean-mac::
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index 72b51d7..bbd406d 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -3,6 +3,5 @@ CONFIG_RULES
 AC_HAVE_HEADERS(unistd.h)
 AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK))
 AC_HAVE_FUNCS(fchmod chmod)
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog
index 5237b5a..cff5509 100644
--- a/src/lib/krb5/ccache/memory/ChangeLog
+++ b/src/lib/krb5/ccache/memory/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  2 17:02:00 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Thu Aug 15 16:48:22 1996  Tom Yu  <tlyu@mit.edu>
 
 	* mcc_retrv.c: Add parens to def'n of flags_match because == has
diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in
index 453659b..41694a0 100644
--- a/src/lib/krb5/ccache/memory/Makefile.in
+++ b/src/lib/krb5/ccache/memory/Makefile.in
@@ -3,9 +3,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSBUILDTOP = ..\..\..\..
 ##DOSLIBNAME=..\..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	mcc_close.o mcc_destry.o mcc_eseq.o \
+	mcc_gennew.o mcc_getnam.o mcc_gprin.o \
+	mcc_init.o mcc_nseq.o \
+	mcc_reslv.o mcc_retrv.o mcc_sseq.o \
+	mcc_store.o mcc_ops.o \
+	mcc_sflags.o
 
 OBJS    = mcc_close.$(OBJEXT) mcc_destry.$(OBJEXT) mcc_eseq.$(OBJEXT) \
 	mcc_gennew.$(OBJEXT) mcc_getnam.$(OBJEXT) mcc_gprin.$(OBJEXT) \
@@ -21,15 +25,9 @@ SRCS    = $(srcdir)/mcc_close.c $(srcdir)/mcc_destry.c $(srcdir)/mcc_eseq.c \
 	$(srcdir)/mcc_store.c $(srcdir)/mcc_ops.c \
 	$(srcdir)/mcc_sflags.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
+all-unix:: all-libobjs
 all-windows:: $(OBJS)
 
-shared: 
-	mkdir shared
+clean-unix:: clean-libobjs
 
-clean-unix::
-	$(RM) shared/*
-
-clean-mac::
 clean-windows::
diff --git a/src/lib/krb5/ccache/memory/configure.in b/src/lib/krb5/ccache/memory/configure.in
index 7eff1bc..106deb0 100644
--- a/src/lib/krb5/ccache/memory/configure.in
+++ b/src/lib/krb5/ccache/memory/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/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog
index 7ab2c2f..4ea1669 100644
--- a/src/lib/krb5/ccache/stdio/ChangeLog
+++ b/src/lib/krb5/ccache/stdio/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  2 17:03:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Thu Aug 15 16:44:32 1996  Tom Yu  <tlyu@mit.edu>
 
 	* scc_retrv.c: Fix def'n of flags_match to be properly
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index 3ec623f..7ae7645 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -1,8 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	scc_close.o scc_destry.o scc_eseq.o \
+	scc_gennew.o scc_getnam.o scc_gprin.o scc_init.o \
+	scc_nseq.o scc_read.o scc_reslv.o scc_retrv.o \
+	scc_sseq.o scc_store.o scc_skip.o scc_ops.o scc_write.o \
+	scc_sflags.o scc_defops.o scc_errs.o scc_maybe.o
 
 OBJS 	= scc_close.o scc_destry.o scc_eseq.o \
 	scc_gennew.o scc_getnam.o scc_gprin.o scc_init.o \
@@ -19,20 +22,13 @@ SRCS 	= $(srcdir)/scc_close.c $(srcdir)/scc_destry.c $(srcdir)/scc_eseq.c \
 	$(srcdir)/scc_errs.c $(srcdir)/scc_maybe.c
 
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
+all-unix:: all-libobjs
 all-windows:: $(OBJS)
 
 test: ${OBJS} scc_test.o
 	${CC} -o test ${OBJS} scc_test.o
 
-shared: 
-	mkdir shared
-
-clean-unix::
-	$(RM) shared/*
-
-clean-mac::
+clean-unix:: clean-libobjs
 clean-windows::
 
 
diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in
index 7eff1bc..106deb0 100644
--- a/src/lib/krb5/ccache/stdio/configure.in
+++ b/src/lib/krb5/ccache/stdio/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/krb5/configure.in b/src/lib/krb5/configure.in
index 2ac53bd..eeb2b8a 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -1,9 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix)
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
 dnl
@@ -16,10 +13,5 @@ dnl
 AC_CHECK_LIB(gen,compile,SHLIB_GEN=-lgen,SHLIB_GEN='')
 AC_SUBST(SHLIB_GEN)
 dnl
-V5_MAKE_SHARED_LIB(libkrb5,1.0,.., ./krb5)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-AC_SUBST(COMERR_SH_VERS)
-AppendRule([all::	all-$(WHAT)])
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index 863749b..d55ba1c 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -4,6 +4,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
 	* init_ets.c: dll export krb5_init_ets()
 
+Thu Jan  2 17:07:07 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Fri Dec 13 14:55:43 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* krb5_err.et: Added the error codes KRB5_APPL_EXPIRED and
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 84fb64b..7316b45 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -19,9 +19,8 @@ EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
 #SRCTOP2 = $(BUILDTOP2)
 #EHDRDIR2=$(BUILDTOP2)/include/krb5
 
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-@SHARED_RULE_LOCAL@
+STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \
+      kv5m_err.o adm_err.o init_ets.o
 
 HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h
 OBJS= asn1_err.$(OBJEXT) kdb5_err.$(OBJEXT) krb5_err.$(OBJEXT) \
@@ -30,8 +29,6 @@ ETSRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c
 SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \
 	$(srcdir)/init_ets.c
 
-all-unix:: $(HDRS) shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -39,8 +36,8 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
+all-libobjs: $(HDRS)
 
 unixmac: $(HDRS) $(SRCS)
 
@@ -71,26 +68,6 @@ krb5_err.$(OBJEXT): krb5_err.c
 adm_err.$(OBJEXT): adm_err.c
 kv5m_err.$(OBJEXT): kv5m_err.c
 
-clean-unix::
-	$(RM) $(HDRS) $(ETSRCS) shared/*
-clean-mac::
+clean-unix:: clean-libobjs
 	$(RM) $(HDRS) $(ETSRCS)
 clean-windows::
-
-init_ets.o: $(srcdir)/init_ets.c
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
-# 
-# This stuff is already dropped in by the autoconf generated configure scripts.
-# (Blame Mark, not me for that; this was before we had pre.in and post.in, 
-# we should probably move the error table rules from aclocal.m4 to pre.in)
-#
-#.SUFFIXES:  .h .c .et .ct
-#
-#.et.h:
-#	awk -f $(SRCTOP2)/util/et/et_h.awk outfile=$*.h $<
-#
-#.et.c:
-#	awk -f $(SRCTOP2)/util/et/et_c.awk outfile=$*.c $<
-#
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index b6b61be..899c67a 100644
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 AC_PROG_AWK
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog
index 327124b..8a81e89 100644
--- a/src/lib/krb5/free/ChangeLog
+++ b/src/lib/krb5/free/ChangeLog
@@ -10,6 +10,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	f_pwd_seq.c f_safe.c f_tckt.c f_tckts.c f_tkt_auth.c
 		DLL export free routines in krb5.h
 
+Thu Jan  2 17:10:16 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure
+
 Fri Aug  2 14:03:44 1996  Barry Jaspan  <bjaspan@DUN-DUN-NOODLES>
 
 	* f_keyblock.c (krb5_free_keyblock_contents): added
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 0384d53..593aacf 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -5,9 +5,39 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	f_addr.o	\
+	f_address.o	\
+	f_ap_rep.o	\
+	f_ap_req.o	\
+	f_arep_enc.o	\
+	f_authdata.o	\
+	f_authent.o	\
+	f_auth_cnt.o	\
+	f_chksum.o	\
+	f_creds.o	\
+	f_cred_cnt.o	\
+	f_enc_kdc.o	\
+	f_enc_tkt.o	\
+	f_einfo.o	\
+	f_error.o	\
+	f_kdc_rp.o	\
+	f_kdc_rq.o	\
+	f_keyblock.o	\
+	f_last_req.o	\
+	f_padata.o	\
+	f_princ.o	\
+	f_priv.o	\
+	f_priv_enc.o	\
+	f_safe.o	\
+	f_tckt.o	\
+	f_tckts.o	\
+	f_tgt_cred.o	\
+	f_tkt_auth.o	\
+	f_pwd_data.o	\
+	f_pwd_seq.o	\
+	f_cred.o	\
+	f_cred_enc.o
 
 OBJS=	\
 	f_addr.$(OBJEXT)	\
@@ -77,8 +107,6 @@ SRCS=	\
 	$(srcdir)/f_cred.c	\
 	$(srcdir)/f_cred_enc.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -86,13 +114,9 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
-clean-unix::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 
-clean-mac::
 clean-windows::
 	$(RM) $(OBJFILE)
-
diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in
index 7eff1bc..106deb0 100644
--- a/src/lib/krb5/free/configure.in
+++ b/src/lib/krb5/free/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/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 85fbb79..d5b1a87 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -5,6 +5,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	* ktadd.c,ktbase.c,ktdefault.c,ktfr_entry.c,ktremove.c,read_servi.c:
 	DLL export the keytab dispatch functions
 
+Thu Jan  2 17:11:59 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index fa7acc8..2b339b3 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -7,9 +7,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 MAC_SUBDIRS = file
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	ktadd.o		\
+	ktbase.o	\
+	ktdefault.o	\
+	ktfr_entry.o	\
+	ktremove.o	\
+	read_servi.o
 
 OBJS=	\
 	ktadd.$(OBJEXT)		\
@@ -27,11 +31,6 @@ SRCS=	\
 	$(srcdir)/ktremove.c	\
 	$(srcdir)/read_servi.c
 
-shared:
-	mkdir shared
-
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: subdirs $(OBJFILE)
 
 ##DOSsubdirs:: file\file.lst
@@ -46,10 +45,10 @@ all-windows:: subdirs $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
-clean-unix::
-	$(RM) shared/*
+all-unix:: all-libobjs
+
+clean-unix:: clean-libobjs
 
-clean-mac::
 clean-windows::
 	cd file
 	@echo Making clean in krb5\keytab\file
diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in
index 38aee97..88579b5 100644
--- a/src/lib/krb5/keytab/configure.in
+++ b/src/lib/krb5/keytab/configure.in
@@ -1,10 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 CONFIG_DIRS(file)
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 DO_SUBDIRS
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([$(OBJS)])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 7109cf7..ddd45c5 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -7,6 +7,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 		Change the functions declarations to include FAR pointers
 		and KRB5_CALLCONV so that they can be utilized by a DLL.
 	
+Thu Jan  2 17:13:26 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Tue Nov 19 17:06:59 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* ktf_g_ent.c (krb5_ktfile_get_entry): return KRB5_KT_KVNONOTFOUND
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 4b27d33..d24712c 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -5,9 +5,22 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE= file.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	ktf_add.o	\
+	ktf_close.o	\
+	ktf_endget.o	\
+	ktf_g_ent.o	\
+	ktf_g_name.o	\
+	ktf_next.o	\
+	ktf_resolv.o	\
+	ktf_remove.o	\
+	ktf_ssget.o	\
+	ktf_util.o	\
+	ktf_ops.o	\
+	ktf_wops.o	\
+	ktf_wreslv.o	\
+	ktf_defops.o	\
+	ser_ktf.o
 
 SRCS= \
 	$(srcdir)/ktf_add.c \
@@ -43,8 +56,6 @@ OBJS = \
 	ktf_defops.$(OBJEXT)	\
 	ser_ktf.$(OBJEXT)
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -52,12 +63,8 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
 
-clean-unix::
-	$(RM) shared/*
-
-clean-mac::
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in
index 7eff1bc..106deb0 100644
--- a/src/lib/krb5/keytab/file/configure.in
+++ b/src/lib/krb5/keytab/file/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/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 356e965..77036bd 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -23,6 +23,16 @@ Thu Jan 30 21:44:37 1997  Richard Basch  <basch@lehman.com>
 		krb5_process_key, krb5_finish_key, krb5_string_to_key,
 		krb5_init_random_key, krb5_finish_random_key, krb5_random_key
 
+Sat Feb  8 18:41:42 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
+Thu Jan  2 17:16:18 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Dec 23 17:20:03 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (SRCS): Add brand.c to the SRCS line so that the
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 8ee61e8..f81d495 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,14 +1,87 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 RUN_SETUP = @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSMYNAME=krb
 ##DOSOBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	addr_comp.o	\
+	addr_order.o	\
+	addr_srch.o	\
+	auth_con.o	\
+	bld_pr_ext.o	\
+	bld_princ.o	\
+	chk_trans.o	\
+	conv_princ.o	\
+	copy_addrs.o	\
+	copy_auth.o	\
+	copy_athctr.o	\
+	copy_cksum.o    \
+	copy_creds.o	\
+	copy_data.o	\
+	copy_key.o	\
+	copy_princ.o	\
+	copy_tick.o	\
+	cp_key_cnt.o	\
+	crypto_glue.o	\
+	decode_kdc.o	\
+	decrypt_tk.o	\
+	encode_kdc.o	\
+	encrypt_tk.o	\
+	free_rtree.o	\
+	fwd_tgt.o	\
+	gc_frm_kdc.o	\
+	gc_via_tkt.o	\
+	gen_seqnum.o	\
+	gen_subkey.o	\
+	get_creds.o	\
+	get_in_tkt.o	\
+	in_tkt_ktb.o	\
+	in_tkt_pwd.o	\
+	in_tkt_sky.o	\
+	init_ctx.o	\
+	kdc_rep_dc.o	\
+	mk_cred.o	\
+	mk_error.o	\
+	mk_priv.o	\
+	mk_rep.o	\
+	mk_req.o	\
+	mk_req_ext.o	\
+	mk_safe.o	\
+	parse.o		\
+	pr_to_salt.o	\
+	preauth.o	\
+	princ_comp.o	\
+	rd_cred.o	\
+	rd_error.o	\
+	rd_priv.o	\
+	rd_rep.o	\
+	rd_req.o	\
+	rd_req_dec.o	\
+	rd_safe.o	\
+	recvauth.o	\
+	sendauth.o	\
+	send_tgs.o	\
+	ser_actx.o	\
+	ser_adata.o	\
+	ser_addr.o	\
+	ser_auth.o	\
+	ser_cksum.o	\
+	ser_ctx.o	\
+	ser_eblk.o	\
+	ser_key.o	\
+	ser_princ.o	\
+	serialize.o	\
+	srv_rcache.o	\
+	str_conv.o	\
+	tgtname.o	\
+	unparse.o	\
+	valid_times.o	\
+	walk_rtree.o
 
 OBJS=	addr_comp.$(OBJEXT)	\
 	addr_order.$(OBJEXT)	\
@@ -159,8 +232,6 @@ SRCS=	$(srcdir)/addr_comp.c	\
 	$(srcdir)/valid_times.c	\
 	$(srcdir)/walk_rtree.c
 
-all-unix:: shared $(OBJS)
-all-mac:: shared $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -168,8 +239,7 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
 COMERRLIB=$(TOPLIBD)/libcom_err.a
 
@@ -181,14 +251,17 @@ T_KERB_OBJS= t_kerb.o conv_princ.o unparse.o
 T_SER_OBJS= t_ser.o ser_actx.o ser_adata.o ser_addr.o ser_auth.o ser_cksum.o \
 	ser_ctx.o ser_eblk.o ser_key.o ser_princ.o serialize.o 
 
-t_walk_rtree: $(T_WALK_RTREE_OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_walk_rtree $(T_WALK_RTREE_OBJS) $(LIBS)
+t_walk_rtree: $(T_WALK_RTREE_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_walk_rtree $(T_WALK_RTREE_OBJS) \
+		$(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
-t_kerb: $(T_KERB_OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_kerb $(T_KERB_OBJS) $(LIBS)
+t_kerb: $(T_KERB_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_kerb $(T_KERB_OBJS) \
+		$(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
-t_ser: $(T_SER_OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_ser $(T_SER_OBJS) $(LIBS)
+t_ser: $(T_SER_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_ser $(T_SER_OBJS) \
+		$(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
 TEST_PROGS= t_walk_rtree t_kerb t_ser
 
@@ -217,18 +290,13 @@ check-unix:: $(TEST_PROGS)
 	KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\
 		$(RUN_SETUP) ./t_ser
 
-check-mac:: $(TEST_PROGS)
-
 check-windows::
 
-clean:: 
+clean::
 	$(RM) t_walk_rtree$(EXEEXT) t_walk_rtree.$(OBJEXT)
 	$(RM) t_kerb$(EXEEXT) t_kerb.$(OBJEXT)
 	$(RM) t_ser$(EXEEXT) t_ser.$(OBJEXT)
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
-	$(RM) shared/*
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index 4a3ea5a..10f5f2e 100644
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -1,14 +1,8 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 AC_HEADER_STDARG
-V5_SHARED_LIB_OBJS
 AC_HAVE_FUNCS(strftime strptime geteuid)
 KRB5_RUN_FLAGS
-SubdirLibraryRule([$(OBJS)])
-USE_ANAME
-USE_KDB5_LIBRARY
-KRB5_LIBRARIES
+KRB5_BUILD_PROGRAM
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 42241f0..917896b 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -12,6 +12,15 @@ Thu Nov 21 11:55:16 EST 1996	Richard Basch	<basch@lehman.com>
 		DLL export several more common functions (see lib/krb5.def
 		for the full list of functions exported)
 
+Thu Feb  6 15:46:24 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
+Thu Jan  2 17:19:11 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Update to new library build procedure.
+
 Wed Nov 13 02:53:31 1996  Tom Yu  <tlyu@mit.edu>
 
 	* osconfig.c: Add warning re: global variables.
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 236ed80..7f0ea13 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,5 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSDBFLAGS=
@@ -7,9 +9,45 @@ KRB5_RUN_ENV = @KRB5_RUN_ENV@
 ##DOSOBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS= \
+	an_to_ln.o	\
+	def_realm.o	\
+	DNR.o	\
+	ccdefname.o	\
+	free_krbhs.o	\
+	free_hstrl.o	\
+	full_ipadr.o	\
+	get_krbhst.o	\
+	gen_port.o	\
+	genaddrs.o	\
+	gen_rname.o	\
+	gmt_mktime.o	\
+	hostaddr.o	\
+	hst_realm.o	\
+	init_os_ctx.o	\
+	krbfileio.o	\
+	ktdefname.o	\
+	kuserok.o	\
+	mk_faddr.o	\
+	localaddr.o	\
+	locate_kdc.o	\
+	lock_file.o	\
+	macsock.o	\
+	net_read.o	\
+	net_write.o	\
+	osconfig.o	\
+	port2ip.o	\
+	promptusr.o	\
+	read_msg.o	\
+	read_pwd.o	\
+	realm_dom.o	\
+	sendto_kdc.o	\
+	sn2princ.o	\
+	timeofday.o	\
+	toffset.o	\
+	unlck_file.o	\
+	ustime.o	\
+	write_msg.o
 
 OBJS= \
 	an_to_ln.$(OBJEXT)	\
@@ -91,8 +129,6 @@ SRCS= \
 	$(srcdir)/ustime.c	\
 	$(srcdir)/write_msg.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -100,6 +136,8 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
+all-unix:: all-libobjs
+
 shared:
 	mkdir shared
 
@@ -110,11 +148,11 @@ T_STD_CONF_OBJS= t_std_conf.o def_realm.o get_krbhst.o realm_dom.o \
 
 T_AN_TO_LN_OBJS = t_an_to_ln.o an_to_ln.o 
 
-t_std_conf: $(T_STD_CONF_OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_std_conf $(T_STD_CONF_OBJS) $(LIBS)
+t_std_conf: $(T_STD_CONF_OBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_std_conf $(T_STD_CONF_OBJS) $(KRB5_BASE_LIBS)
 
-t_an_to_ln: $(T_AN_TO_LN_OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_an_to_ln $(T_AN_TO_LN_OBJS) $(LIBS)
+t_an_to_ln: $(T_AN_TO_LN_OBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_an_to_ln $(T_AN_TO_LN_OBJS) $(KRB5_BASE_LIBS)
 
 check-unix:: $(TEST_PROGS)
 	KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
@@ -156,8 +194,6 @@ check-unix::
 clean:: 
 	$(RM) $(TEST_PROGS) test.out t_std_conf.o t_an_to_ln.o
 
-clean-unix::
-	$(RM) shared/*
-clean-mac::
+clean-unix:: clean-libobjs
 clean-windows::
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index 419de14..e24008d 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -27,10 +27,7 @@ AC_HAVE_FUNCS(re_comp)
 AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
 AC_DEFINE(AN_TO_LN_RULES)
-USE_ANAME
-V5_SHARED_LIB_OBJS
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
+KRB5_BUILD_PROGRAM
 KRB5_RUN_FLAGS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 76d7a62..4086a89 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -7,6 +7,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build
 
+Thu Jan  2 17:20:30 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Jun 10 21:51:35 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* syslog.c: Change _WINDOWS to _MSDOS, and add check for _WIN32.
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index f1475ed..d783372 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -5,33 +5,23 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
+STLIBOBJS=setenv.o @LIBOBJS@
 MACSRCS = getuid.c strcasecmp.c strdup.c
 
 OBJS = setenv.$(OBJEXT)	@LIBOBJS@
 
-all-unix:: shared $(OBJS)
-all-mac: $(OBJS)
 all-windows:: $(OBJFILE)
+all-unix:: all-libobjs
 
 ##WIN16##$(OBJFILE): syslog.obj sscanf.obj
 ##WIN16##	$(RM) $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 
+clean-unix:: clean-libobjs
+
 ##WIN32##$(OBJFILE): syslog.obj
 ##WIN32##	$(RM) $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
-
-clean-unix::
-	$(RM) shared/*
-
-clean-mac::
 clean-windows::
 	$(RM) $(OBJFILE)
-
diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in
index ba9bd52..6d5f033 100644
--- a/src/lib/krb5/posix/configure.in
+++ b/src/lib/krb5/posix/configure.in
@@ -1,10 +1,9 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-SubdirLibraryRule([${OBJS}])
-V5_SHARED_LIB_OBJS
 AC_CONST
 AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
 AC_HAVE_FUNCS(setenv unsetenv getenv)
 AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
 AC_FUNC_CHECK(setsid,AC_DEFINE(HAS_SETSID))
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 1a0d6c9..4092690 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -6,6 +6,11 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 		functions.  (Most rcache routines are still not exported
 		pending an API review).
 
+Thu Jan  2 17:21:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Nov 18 15:25:51 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* rc_dfl.c: Apply jik's fix to allow the expunging of the replay
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 078ed18..470e1a0 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -5,9 +5,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSOBJFILE=..\$(MYNAME).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	rc_base.o	\
+	rc_dfl.o 	\
+	rc_io.o		\
+	rcdef.o		\
+	rc_conv.o	\
+	ser_rc.o
 
 OBJS=	\
 	rc_base.$(OBJEXT)	\
@@ -25,8 +29,6 @@ SRCS=	\
 	$(srcdir)/rc_conv.c	\
 	$(srcdir)/ser_rc.c
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJFILE)
 
 ##DOS$(OBJFILE): $(OBJS)
@@ -34,11 +36,9 @@ all-windows:: $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
-shared:
-	mkdir shared
+all-unix:: all-libobjs
 
-clean-mac::
 clean-windows::
 	$(RM) $(OBJFILE)
-clean-unix::
-	$(RM) shared/*
+
+clean-unix:: clean-libobjs
diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in
index 7ad4581..96c0bbe 100644
--- a/src/lib/krb5/rcache/configure.in
+++ b/src/lib/krb5/rcache/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
+KRB5_BUILD_LIBOBJS
 AC_TYPE_UID_T
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index 904ca16..3d2245d 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 16 19:02:22 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (all-prerecurse): Update to use double-colon rules.
+
+Tue Jan 14 19:22:42 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Wed Dec  4 12:42:49 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* Various changes to allow channel bindings to work with both UDP
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index d52fca6..c8fc17b 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -3,9 +3,20 @@ CFLAGS = $(CCOPTS) $(DEFS) -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=libgssrpc.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+LIB=gssrpc
+LIBMAJOR=1
+LIBMINOR=0
+STOBJLISTS=OBJS.ST
+SHLIB_EXPDEPS= \
+	$(TOPLIBD)/libgssapi_krb5.so \
+	$(TOPLIBD)/libkrb5.so \
+	$(TOPLIBD)/libcrypto.so \
+	$(TOPLIBD)/libcom_err.so \
+	$(TOPLIBD)/libdyn.so
+SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -ldyn
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+RELDIR=rpc
 
 SRCS = $(srcdir)/auth_none.c \
 	$(srcdir)/auth_unix.c \
@@ -97,6 +108,52 @@ OBJS = auth_none.$(OBJEXT) \
 	xdr_stdio.$(OBJEXT) \
 	xdr_alloc.$(OBJEXT)
 
+STLIBOBJS = \
+	auth_none.o \
+	auth_unix.o \
+	auth_any.o \
+	authunix_prot.o \
+	auth_gssapi.o \
+	auth_gssapi_misc.o \
+	bindresvport.o \
+	clnt_generic.o \
+	clnt_perror.o \
+	clnt_raw.o \
+	clnt_simple.o \
+	clnt_tcp.o \
+	clnt_udp.o \
+	rpc_dtablesize.o \
+	get_myaddress.o \
+	getrpcent.o \
+	getrpcport.o \
+	pmap_clnt.o \
+	pmap_getmaps.o \
+	pmap_getport.o \
+	pmap_prot.o \
+	pmap_prot2.o \
+	pmap_rmt.o \
+	rpc_prot.o \
+	rpc_commondata.o \
+	rpc_callmsg.o \
+	svc.o \
+	svc_auth.o \
+	svc_auth_unix.o \
+	svc_auth_any.o \
+	svc_auth_gssapi.o \
+	svc_raw.o \
+	svc_run.o \
+	svc_simple.o \
+	svc_tcp.o \
+	svc_udp.o \
+	xdr.o \
+	xdr_array.o \
+	xdr_float.o \
+	xdr_mem.o \
+	xdr_rec.o \
+	xdr_reference.o \
+	xdr_stdio.o \
+	xdr_alloc.o
+
 HDRDIR=$(BUILDTOP)/include/rpc
 
 HDRS=	$(HDRDIR)/auth.h \
@@ -114,57 +171,15 @@ HDRS=	$(HDRDIR)/auth.h \
 	$(HDRDIR)/types.h \
 	$(HDRDIR)/xdr.h
 
-$(OBJS): $(HDRS)
-
-LIB_SUBDIRS= .
-LIBDONE= DONE
-#
-# Depends on libgssapi_krb5, libkrb5, libcrypto, libcom_err
-#
-GSSAPI_KRB5_VER=@GSSAPI_KRB5_SH_VERS@
-KRB5_VER=@KRB5_SH_VERS@
-CRYPTO_VER=@CRYPTO_SH_VERS@
-COMERR_VER=@COMERR_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libgssapi_krb5.$(SHEXT).$(GSSAPI_KRB5_VER) \
-	$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
-	$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-	$(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER)
+all-prerecurse:: includes
+all-prerecurse:: all-liblinks
 
-SHLIB_LIBS=-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -ldyn
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-
-all-unix:: shared
-all-unix:: $(OBJS)
-all-mac:: $(OBJS)
 all-windows:: $(OBJS)
 
-shared:
-	mkdir shared
+install-unix:: install-libs
 
 check-windows::
 
-clean-unix::
-	$(RM) shared/* $(HDRS)
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-clean-mac::
 clean-windows::
-
-DONE: $(OBJS)
-	$(RM) DONE
-	echo $(OBJS) > DONE
-
-libgssrpc.$(STEXT): $(OBJS)
-	$(RM) $@
-	$(ARADD) $@ $(OBJS)
-	$(RANLIB) $@
-
-install:: libgssrpc.a
-	$(INSTALL_DATA) libgssrpc.a $(DESTDIR)$(KRB5_LIBDIR)/libgssrpc.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libgssrpc.a
-
-clean::
-	$(RM) libgssrpc.$(LIBEXT) libgssrpc.bak DONE
-
-# hack to force libs to get built before recursing into subdirs
-all-recurse: libgssrpc.$(STEXT)
diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in
index dde9d53..cc8a1b1 100644
--- a/src/lib/rpc/configure.in
+++ b/src/lib/rpc/configure.in
@@ -73,17 +73,6 @@ AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent)
 
 DECLARE_SYS_ERRLIST
 
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libgssrpc,1.0,.., ./rpc)
-GSSAPI_KRB5_SH_VERS=$krb5_cv_shlib_version_libgssapi_krb5
-AC_SUBST(GSSAPI_KRB5_SH_VERS)
-KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
-AC_SUBST(KRB5_SH_VERS)
-CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
-AC_SUBST(CRYPTO_SH_VERS)
-COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
-AC_SUBST(COMERR_SH_VERS)
-
 CopySrcHeader(auth.h,[$](BUILDTOP)/include/rpc)
 CopySrcHeader(auth_gssapi.h,[$](BUILDTOP)/include/rpc)
 CopySrcHeader(auth_unix.h,[$](BUILDTOP)/include/rpc)
@@ -99,9 +88,6 @@ CopySrcHeader(svc_auth.h,[$](BUILDTOP)/include/rpc)
 CopyHeader(types.h,[$](BUILDTOP)/include/rpc)
 CopySrcHeader(xdr.h,[$](BUILDTOP)/include/rpc)
 
-dnl
-dnl This is gross but necessary because of the way we build shared libs
-dnl
-ALL_RECURSE=
-AppendRule([all-unix:: all-recurse])
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE( ,types.h:types.hin)
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index 0303efb..5bc39f2 100644
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  6 15:58:52 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Wed Nov 20 16:00:21 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* Makefile.in (unit-test-): warn more loudly about unrun tests
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 26c10c7..dfccd7e 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,14 +1,18 @@
 CFLAGS	= $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I.
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o
 
 all:: client server
 
-client: client.o rpc_test_clnt.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o client client.o rpc_test_clnt.o $(LIBS)
+client: client.o rpc_test_clnt.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o client client.o rpc_test_clnt.o \
+		$(GSSRPC_LIBS) $(KRB5_BASE_LIBS)
 
-server: server.o rpc_test_svc.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o server server.o rpc_test_svc.o $(LIBS)
+server: server.o rpc_test_svc.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o server server.o rpc_test_svc.o \
+		$(GSSRPC_LIBS) $(KRB5_BASE_LIBS)
 
 client.o server.o: rpc_test.h
 
diff --git a/src/lib/rpc/unit-test/configure.in b/src/lib/rpc/unit-test/configure.in
index 6e100a2..3f55147 100644
--- a/src/lib/rpc/unit-test/configure.in
+++ b/src/lib/rpc/unit-test/configure.in
@@ -6,15 +6,10 @@ dnl The following are tests for the presence of programs required for testing
 AC_CHECK_PROG(RUNTEST,runtest,runtest)
 AC_CHECK_PROG(PERL,perl,perl)
 AC_KRB5_TCL	
-if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then
+if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
  	DO_TEST=ok
 fi
 AC_SUBST(DO_TEST) 
 dnl
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_DYN_LIBRARY
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
-
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
author	Tom Yu <tlyu@mit.edu>	1997-02-09 17:43:52 +0000
committer	Tom Yu <tlyu@mit.edu>	1997-02-09 17:43:52 +0000
commit	561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch)
tree	4165fe26da185697068044d1fba17cb15d5b19bc /src/lib
parent	647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff)
download	krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.bz2