Merge of libhack_branch

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

12 files changed, 100 insertions, 136 deletions

diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog
index 2505d5b394..8c79ffefdf 100644
--- a/src/util/dyn/ChangeLog
+++ b/src/util/dyn/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 31 13:02:06 1996  Ezra Peisach  <epeisach@mit.edu>
+
+	* configure.in, Makefile.in: Update to new library build procedure.
+
 Mon Jul 22 21:37:52 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* dyn.h: If __STDC__ is not defined, generate prototypes implying
diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in
index e2c4255bd8..293e9b4f2b 100644
--- a/src/util/dyn/Makefile.in
+++ b/src/util/dyn/Makefile.in
@@ -1,12 +1,9 @@
+RELDIR=../util/dyn
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=libdyn.lib
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
-
 SRCS = $(srcdir)/dyn_create.c \
 	$(srcdir)/dyn_put.c \
 	$(srcdir)/dyn_debug.c \
@@ -29,37 +26,22 @@ OBJS = dyn_create.$(OBJEXT) \
 	dyn_insert.$(OBJEXT) \
 	dyn_initzero.$(OBJEXT)
 
-LIB_SUBDIRS= .
-LIBDONE= DONE
+STLIBOBJS=$(OBJS)
+STOBJLISTS=OBJS.ST
+LIB=dyn
+LIBMAJOR=1
+LIBMINOR=0
+
 
-all-unix:: shared includes $(OBJS)
+all-unix:: all-liblinks
+clean-unix:: clean-liblinks clean-libs clean-libobjs
+install-unix:: install-libs
 all-mac:: $(OBJS)
 all-windows:: $(OBJS)
 
-shared:
-	mkdir shared
+all-unix:: includes
 
 check-windows::
-
-clean-unix::
-	$(RM) shared/*
-
 clean-mac::
 clean-windows::
 
-DONE:: $(OBJS)
-	 $(RM) DONE
-	 echo $(OBJS) >DONE
-
-libdyn.$(STEXT): $(OBJS)
-	$(RM) $@
-	$(ARADD) $@ $(OBJS)
-	$(RANLIB) $@
-
-install:: libdyn.a
-	$(INSTALL_DATA) libdyn.a $(DESTDIR)$(KRB5_LIBDIR)/libdyn.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdyn.a
-
-clean::
-	$(RM) libdyn.$(LIBEXT) libdyn.bak DONE
-
diff --git a/src/util/dyn/configure.in b/src/util/dyn/configure.in
index 6ba8e6d24a..e4db7dbfec 100644
--- a/src/util/dyn/configure.in
+++ b/src/util/dyn/configure.in
@@ -5,10 +5,7 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_FUNCS(memmove)
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libdyn,1.0,../../lib, ../util/dyn)
-dnl DEPLIBS is normally set by KRB5_LIBRARIES, but that makes assumptions
-dnl which fail for libdyn.
-AC_SUBST(DEPLIBS)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY
 CopySrcHeader(dyn.h,[$](BUILDTOP)/include)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 46fc71e5a7..ed1f46de57 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -46,6 +46,15 @@ Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 	* com_err.h error_table.h init_et.c internal.h
 		Win32 support
 
+Tue Dec 31 12:54:54 1996  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in (RELDIR): Add for new procedure.
+
+Mon Dec 30 17:30:43 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to use new library build procedure.
+
 Mon Nov 18 20:37:19 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 2f3b1567a4..74c5605e53 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -1,3 +1,4 @@
+RELDIR=../util/et
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 SED = sed
 
@@ -6,13 +7,15 @@ SED = sed
 ##DOSXTRA=
 ##DOSOBJFILE=comerr.lst
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS=error_message.o et_name.o init_et.o com_err.o
+STOBJLISTS=OBJS.ST
+LIB=com_err
+LIBMAJOR=1
+LIBMINOR=0
 
-LIBDONE=DONE
-LIB_SUBDIRS=.
-INSTALLFILE = cp
+all-unix:: all-liblinks
+clean-unix:: clean-liblinks clean-libs clean-libobjs
+install-unix:: install-libs
 
 LINTFLAGS=-uhvb 
 LINTFILES= error_message.c et_name.c init_et.c com_err.c
@@ -94,10 +97,7 @@ com_err.o: com_err.c
 # real entries...
 #
 
-all-unix:: compile_et includes shared
-all-mac:: libcom_err.a
-shared:
-	 mkdir shared
+all-unix:: compile_et includes
 
 # The real compile_et just isn't portable.  (But then again, anything using 
 # lex and yacc isn't portable by definition.  :-(  )
@@ -120,10 +120,7 @@ et_h.awk: $(srcdir)/et_h.awk
 	$(CP) $(srcdir)/et_h.awk et_h.awk
 
 clean-unix::
-	$(RM) compile_et compile_et.o error_table.o
-	$(RM) shared/*
-
-clean-mac:: clean-unix
+	$(RM) compile_et
 
 depend:: 
 
@@ -140,33 +137,8 @@ install:: mit-sipb-copyright.h
 
 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
 
-
-all-mac:: libcom_err.$(STEXT)
-
-libcom_err.$(STEXT): $(LIBOBJS)
-	$(ARCHIVE) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-DONE:: $(LIBOBJS)
-	 $(RM) DONE
-	 echo $(LIBOBJS) >DONE
-
-clean-unix::
-	$(RM) $(LIBOBJS) DONE
-
-clean-mac::
-	$(RM) libcom_err.a
-	$(RM) $(LIBOBJS)
-
-install::
-	$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(KRB5_LIBDIR)/libcom_err.a
-	$(RANLIB)    $(DESTDIR)$(KRB5_LIBDIR)/libcom_err.a
-## 
-
 clean-unix:: clean-files
 
-clean-mac:: clean-files
-
 clean-files::
 	rm -f *~ \#* *.bak \
 		*.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
@@ -188,7 +160,6 @@ libcom_err.o:	$(LIBOBJS)
 	ld -r -s -o libcom_err.o $(LIBOBJS)
 	chmod -x libcom_err.o
 
-
 archive:	et.tar
 
 TAGS:	et_name.c error_message.c compile_et.c error_table.c \
diff --git a/src/util/et/configure.in b/src/util/et/configure.in
index 15fd8d84df..427d1adc0a 100644
--- a/src/util/et/configure.in
+++ b/src/util/et/configure.in
@@ -24,6 +24,6 @@ AC_CHECK_FUNCS(strerror)
 AC_HEADER_STDARG
 AC_HAVE_HEADERS(stdlib.h)
 CopySrcHeader(com_err.h,$(BUILDTOP)/include)
-V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libcom_err,1.0,[$](TOPLIBD), ../util/et)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 274bb8a50d..366ddf9734 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -16,6 +16,11 @@ Wed Feb  5 20:18:33 1997  Richard Basch  <basch@lehman.com>
 		Fixed typo (all-max -> all-mac)
 		Inconsistent colon usage; all-windows needed :: not :
 
+Thu Jan  2 17:36:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new library build procedure.
+
 Mon Nov  4 17:04:51 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* prof_parse.c (parse_std_line): Accept either ';' or '#' on the
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index d59d240d88..f7979f3593 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -6,9 +6,12 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DOSDEFS)
 
 LOCALINCLUDE=-I. -I$(srcdir)/../et
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = \
+	prof_tree.o \
+	prof_file.o \
+	prof_parse.o \
+	prof_err.o \
+	prof_init.o
 
 OBJS = prof_tree.$(OBJEXT) \
 	prof_file.$(OBJEXT) \
@@ -24,13 +27,13 @@ SRCS = $(srcdir)/prof_tree.c \
 
 LIBS = ../et/libcom_err.$(LIBEXT)
 
-install::
+LIB=profile
+LIBMAJOR=1
+LIBMINOR=0
+STOBJLISTS=OBJS.ST
 
-all-mac:: all-unix
-all-unix:: shared includes libprofile.a test_parse test_profile
-
-shared:
-	mkdir shared
+all-unix:: includes test_parse test_profile
+all-unix:: all-libs
 
 all-windows:: $(OBJS)
 
@@ -40,10 +43,6 @@ awk-windows:
 	if exist prof_err.h copy profile.hin+prof_err.h profile.h
 	if exist profile.h copy profile.h $(BUILDTOP)\include\profile.h
 
-libprofile.a: $(OBJS)
-	$(ARCHIVE) $@ $(OBJS)
-	$(RANLIB) $@
-
 test_parse: test_parse.$(OBJEXT) $(OBJS) $(LIBS)
 	$(CC) -o test_parse test_parse.$(OBJEXT) $(OBJS) $(LIBS)
 
@@ -66,19 +65,14 @@ prof_err.h: $(srcdir)/prof_err.et
 prof_err.c: $(srcdir)/prof_err.et
 
 prof_err.o: prof_err.c
-	$(CC) $(CFLAGS) -c prof_err.c
-@SHARED_RULE_LOCAL@
 
-clean-mac:: clean-unix
-clean-unix::
-	rm -f $(PROGS) *.o *~ test_parse core libprofile.a prof_err.h \
-		prof_err.c test_profile profile.h shared/*
+clean-unix:: clean-libs clean-libobjs
+	$(RM) $(PROGS) *.o *~ test_parse core prof_err.h \
+		prof_err.c test_profile profile.h
 
 clean-windows::
 	$(RM) profile.lib profile.bak test_parse.exe test_profile.exe
 
-check-mac::
-check-unix::
 check-windows:: test_profile.exe test_parse.exe
 	$(RM) *.obj
 	test_parse test.ini
diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
index df69396b51..8b27253c8b 100644
--- a/src/util/profile/configure.in
+++ b/src/util/profile/configure.in
@@ -1,16 +1,13 @@
 AC_INIT(prof_parse.c)
 CONFIG_RULES
 AC_CONST
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_HEADERS(unistd.h stdlib.h)
 AC_HAVE_FUNCS(stat)
 AC_PROG_AWK
-V5_SHARED_LIB_OBJS
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY
 CopyHeader(profile.h,$(BUILDTOP)/include)
-SubdirLibraryRule([$(OBJS)])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 6482c6c233..e6f2084add 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,21 @@
+Thu Jan 16 18:47:12 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in: Cause "clean" to dtrt.
+	
+	* configure.in: Punt spurious call to KRB5_LIB_PARAMS.
+
+Sun Dec 29 21:32:41 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in: Update to set STLIBOBJS instead of LIBSRCS; also
+	clean up a little bit.
+
+Fri Dec 27 17:09:46 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in: Fix to use OBJS.ST rather than ./OBJS.ST.
+
+	* Makefile.in:
+	* configure.in: Changes to use new library build system.
+
 Thu Dec  5 22:43:35 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* update_utmp.c (pty_update_utmp): Apply platform specific patch
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 080964d510..71f55b7101 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -1,16 +1,18 @@
+RELDIR=../util/pty
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+
 SED = sed
 
+LIB=pty
+LIBMAJOR=1
+LIBMINOR=0
 
-.c.o:
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
+STLIBOBJS= cleanup.o getpty.o init_slave.o open_ctty.o open_slave.o \
+	update_utmp.o update_wtmp.o vhangup.o void_assoc.o pty_err.o \
+	logwtmp.o init.o
 
+STOBJLISTS=OBJS.ST
 
-LIBOBJS= cleanup.o getpty.o init_slave.o open_ctty.o open_slave.o \
-   update_utmp.o update_wtmp.o vhangup.o void_assoc.o pty_err.o logwtmp.o init.o
-LIBUPDATE= $(BUILDTOP)/util/libupdate
-LIBDONE=DONE
-LIB_SUBDIRS=.
 INSTALLFILE = cp
 
 # for pty-int.h
@@ -28,41 +30,28 @@ SRCS=pty_err.h $(CFILES)
 DEPLIBS=
 
 #
-all-unix:: includes pty_err.h libpty.a $(TOPLIBD)/libpty.a
+all-unix:: includes pty_err.h
+
+all-unix:: all-liblinks
+
+install-unix:: install-libs
 
 clean-unix::
 	$(RM) libpty.a $(BUILDTOP)/include/libpty.h pty_err.c pty_err.h
-
+clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 depend:: 
 
 install:: libpty.h
 	$(INSTALL_DATA) $(srcdir)/libpty.h  $(DESTDIR)$(KRB5_INCDIR)/libpty.h
 
-
-
-libpty.a: DONE
-	@if test -f $@ ; then \
-		(set -x; $(LIBUPDATE) $@ DONE .) \
-	else \
-		(set -x; $(LIBUPDATE) --force $@ DONE .) \
-	fi
-	$(RANLIB) $@
-	touch libpty.stamp
-
-clean-unix::
-	$(RM) $(LIBOBJS) libpty.stamp
-
 clean-mac::
 	$(RM) libpty.a
 	$(RM) $(LIBOBJS)
 
-install::
-	$(INSTALL_DATA) libpty.a $(DESTDIR)$(KRB5_LIBDIR)/libpty.a
-	$(RANLIB)    $(DESTDIR)$(KRB5_LIBDIR)/libpty.a
 ## 
 
-clean-unix:: clean-files
+clean-unix:: clean-liblinks clean-libs clean-libobjs clean-files
 
 clean-mac:: clean-files
 
@@ -78,7 +67,5 @@ clean-files::
 		eddep makedep *.ln
 
 pty_err.o: pty_err.c
-	$(CC) $(CFLAGS) -c $*.c
-
-pty_err.h:: pty_err.et
-pty_err.c:: pty_err.et
+pty_err.h: pty_err.et
+pty_err.c: pty_err.et
diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index 3c6386af73..db2837698d 100644
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -2,7 +2,7 @@ AC_INIT(getpty.c)
 CONFIG_RULES
 AC_PROG_AWK
 CopySrcHeader(libpty.h,[$](BUILDTOP)/include)
-LinkFileDir([$](TOPLIBD)/libpty.a,libpty.a,../util/pty)
+dnl LinkFileDir([$](TOPLIBD)/libpty.a,libpty.a,../util/pty)
 AC_PROG_INSTALL
 AC_PROG_ARCHIVE
 AC_PROG_RANLIB
@@ -150,6 +150,6 @@ fi
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
-V5_USE_SHARED_LIB
-SubdirLibraryRule([$(LIBOBJS)])
+KRB5_BUILD_LIBRARY
+KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE