diff options
| author | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
| commit | b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch) | |
| tree | 40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/lib/crypto | |
| parent | 821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff) | |
| download | krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.gz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.xz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.zip | |
Shared library Makefile/configure changes and cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/Makefile.in | 11 | ||||
| -rw-r--r-- | src/lib/crypto/configure.in | 10 |
3 files changed, 24 insertions, 4 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index baf67fbd7..5d0b7a1e6 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ + +Thu Jun 15 17:58:41 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Add definitions for shared library building rules. + Add explicit dependency on "shared" since we probably need it. + * configure.in - Create symlinks for archive and shared library when + we build them. + Fri Jun 9 18:52:19 1995 <tytso@rsx-11.mit.edu> * des_crc.c, des_md5.c: Fix -Wall nits. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 1ac2d8df8..615626d56 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -24,9 +24,14 @@ LIB_SUBDIRS= des md4 md5 crc32 os . LIBUPDATE= $(BUILDTOP)/util/libupdate LIBDONE= ./des/DONE ./md4/DONE ./md5/DONE ./crc32/DONE ./os/DONE ./DONE -all:: all-$(WHAT) - -all-unix:: shared +# No dependencies. Record places to find this shared object if the target +# link editor and loader support it. +DEPLIBS= +SHLIB_LIBS= +SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ +SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ + +all:: shared shared: mkdir shared diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index 387255a48..1ccce9c60 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -8,6 +8,14 @@ AC_PROG_INSTALL V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) DO_SUBDIRS -AppendRule([all:: libcrypto.a]) +LinkFileDir(../libcrypto.a, libcrypto.a, ./crypto) +AppendRule([all-unix:: ../libcrypto.a]) V5_MAKE_SHARED_LIB(libcrypto) +AC_ARG_ENABLE([shared], +[ --enable-shared build shared libraries],[ +LinkFileDir(../libcrypto.[$](SHEXT), libcrypto.[$](SHEXT), ./crypto) +AppendRule([all-unix:: ../libcrypto.$(SHEXT)]) +])dnl +AppendRule([all-unix:: libcrypto.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE |