diff options
| 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/des425 | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
| download | krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.xz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/des425')
| -rw-r--r-- | src/lib/des425/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/des425/Makefile.in | 52 | ||||
| -rw-r--r-- | src/lib/des425/configure.in | 9 |
3 files changed, 43 insertions, 26 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 2acf19bac..f36bf8219 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 c8e513996..2e370d1a7 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 07072c9f2..01d64e58c 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 |