diff options
Diffstat (limited to 'src/lib/krb5')
42 files changed, 401 insertions, 244 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index e2e717c35..023d4aaec 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 f9227fa4f..a21e64685 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 64ce1a4a2..266e982ae 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 91afd6fd6..07cba37cb 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 7eff1bc8b..106deb0dd 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 f2b4d65d9..94e514e3f 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 5661182c5..6482ba4c2 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 b5eea4d7d..f38d5062f 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 43f4a7038..247cab2dc 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 1c1c24677..8f6547910 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 72b51d7a1..bbd406da6 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 5237b5aec..cff55099b 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 453659baa..41694a02a 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 7eff1bc8b..106deb0dd 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 7ab2c2f93..4ea166911 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 3ec623fc1..7ae76451e 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 7eff1bc8b..106deb0dd 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 2ac53bdfe..eeb2b8a0f 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 863749bbd..d55ba1c41 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 84fb64bd9..7316b45e1 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 b6b61bee1..899c67ab0 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 327124b52..8a81e898c 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 0384d53e0..593aacf32 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 7eff1bc8b..106deb0dd 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 85fbb79df..d5b1a876c 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 fa7acc83a..2b339b312 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 38aee9762..88579b5b1 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 7109cf7c1..ddd45c509 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 4b27d33cf..d24712cdd 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 7eff1bc8b..106deb0dd 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 356e96521..77036bddb 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 8ee61e8f3..f81d49555 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 4a3ea5ab9..10f5f2e10 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 42241f020..917896b1e 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 236ed80e8..7f0ea13cf 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 419de14f6..e24008d96 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 76d7a62cf..4086a892e 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 f1475edaa..d78337287 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 ba9bd52ba..6d5f03329 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 1a0d6c9f0..409269035 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 078ed1857..470e1a045 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 7ad458117..96c0bbe42 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 |