Merge of libhack_branch

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

9 files changed, 106 insertions, 88 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index e8c524b88..c614ce076 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 b2410633c..9f1180e66 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 f2bb70429..c0fba38b5 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 6dc165367..7d26c1c8c 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 4e493d726..276417c77 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 f6953b907..f879d41f0 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 e067bbd69..54bfce28c 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 45db67345..579edd144 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 7190864ee..8de9aa66f 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