Merge of libhack_branch

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

3 files changed, 34 insertions, 23 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 6dc1653678..7d26c1c8c9 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 4e493d7260..276417c77f 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 f6953b9077..f879d41f07 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