diff options
| author | Sam Hartman <hartmans@mit.edu> | 1995-06-23 00:59:54 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1995-06-23 00:59:54 +0000 |
| commit | 6cd88aa348286b0535b95b84f54beb95abd29a92 (patch) | |
| tree | d631441a2fd3127093ba06aff89f4cd7acb60d49 /src/lib/crypto | |
| parent | d84d59a45a9203ba179a213f5d2281be4da07b00 (diff) | |
| download | krb5-6cd88aa348286b0535b95b84f54beb95abd29a92.tar.gz krb5-6cd88aa348286b0535b95b84f54beb95abd29a92.tar.xz krb5-6cd88aa348286b0535b95b84f54beb95abd29a92.zip | |
Changes to support AIX shared libraries. The interactions
between configure.in and Makefile.in change significantly for shared
libraries: the static library target is no longer specified in the
Makefile, although a rule to make the static library is specified.
Also, none of the libraries have any more unresolved symbols. As
discussed, libcom_err.a is made shared and symlinks are created in
lib.
These changes sort of work, although I suspect cleanup is
necessary. I don't think it breaks too much on other platforms.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6126 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/Makefile.in | 6 | ||||
| -rw-r--r-- | src/lib/crypto/configure.in | 13 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 580498117..5e183bd99 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 22 18:34:26 1995 Sam Hartman (hartmans@tardis) + + * configure.in: Changed to new scheme for static libs. + + Fri Jun 16 11:14:50 EDT 1995 Paul Park (pjpark@mit.edu) * configure.in - Add install target for shared library. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 615626d56..1fcb041d4 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -41,7 +41,7 @@ all-mac:: $(OBJS) all-windows:: $(OBJS) -libcrypto.a: $(LIBDONE) +libcrypto.$(STEXT): $(LIBDONE) if test -f $@ ; then \ for i in $(LIB_SUBDIRS) ; \ do \ @@ -59,10 +59,6 @@ libcrypto.a: $(LIBDONE) libcrypto.lib: libdir crypto.lib -install:: libcrypto.a - $(INSTALL_DATA) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a - $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a - clean:: clean-$(WHAT) clean-unix:: diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index f75bfd29e..ef8c07953 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -8,8 +8,6 @@ AC_PROG_INSTALL V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) DO_SUBDIRS -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],[ @@ -19,6 +17,13 @@ AppendRule([install:: libcrypto.[$](SHEXT) [$](INSTALL_DATA) libcrypto.[$](SHEXT) \ [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libcrypto.[$](SHEXT)]) ])dnl -AppendRule([all-unix:: libcrypto.a]) -AppendRule([all:: all-$(WHAT)]) +if test -n "$krb5_cv_enable_staticlibs" ; then + AppendRule([all-unix:: libcrypto.a]) + LinkFileDir(../libcrypto.a, libcrypto.a, ./crypto) + AppendRule([all-unix:: ../libcrypto.a]) + AppendRule([install:: libcrypto.a + $(INSTALL_DATA) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a + $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a]) +fi + AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE |