Convert to new handling of static libraries

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

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 6d39c4fc8d487d700d18df113e4974822a23a246..73ebaa8b6866b958160ea43c604c2b29b82a5582 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 23 12:45:43 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
+
+       * configure.in: New static library targets.
+
+       * Makefile.in : Add new static library target handling.
 
 Fri Jun 16 17:00:04 EDT 1995   Paul Park       (pjpark@mit.edu)
        * k4_glue.c - Add this module with the "req_act_vno" symbol definition

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 67c50cf0dabfa7a9e3605736c09a8c930eaab1d4..bffd1d3841f72591b947453d4b1808f0b8482fb6 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -84,7 +84,7 @@ clean-unix::
 clean-mac::
 clean-windows::
 
-libdes425.a: $(OBJS)
+libdes425.$(STEXT): $(OBJS)
        $(RM) $@
        $(ARADD) $@ $(OBJS)
        $(RANLIB) $@

diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 198313e1bbd35c0ba432d1a5550a7185e5b9f4fd..4663deebbba033d36c680df180ecb81e2f0fa29a 100644 (file)
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -20,9 +20,6 @@ fi
 dnl
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
-LinkFileDir(../libdes425.a, libdes425.a, ./des425)
-AppendRule([all:: libdes425.a])
-AppendRule([all-unix:: ../libdes425.a])
 V5_MAKE_SHARED_LIB(libdes425)
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
@@ -32,4 +29,11 @@ AppendRule([install::        libdes425.[$](SHEXT)
        [$](INSTALL_DATA) libdes425.[$](SHEXT)  \
                [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libdes425.[$](SHEXT)])
 ])dnl
+if test -n "$krb5_cv_staticlibs_enabled" ; then
+       LinkFileDir(../libdes425.[$](STEXT), libdes425.[$](STEXT), ./krb5)
+        AppendRule([install:: 
+       [$](INSTALL_DATA) libdes425.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libdes425.[$](STEXT)
+       [$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libdes425.[$](STEXT)]) 
+       AppendRule([all-unix:: ../libdes425.[$](STEXT)])
+fi
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index d7c584bb200b9ba906ffeae8d565d8e75f986127..46df32e59413c46bcb0b6a74e1be205cfb48a33a 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 23 12:29:39 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
+
+       * configure.in: Handle generation of rules to make static libs.
+
+       * Makefile.in (LIBNAME): Changed to support new handling of static
+        libraries
+
 
 Fri Jun 16 11:15:45 EDT 1995   Paul Park       (pjpark@mit.edu)
        * Makefile.in - Change "./DONE" to "DONE" since we know how to make

diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index 3ca9e19cf6e5e0de5acb6ad20601e66a89c0d908..e16abce019b4a3b5118fc3118bca3555b077dd44 100644 (file)
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -94,8 +94,8 @@ LIBDONE= DONE
 KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
 DEPKRB4_LIBS=@DEPKRB4_CRYPTO_LIB@
 DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT)
-SHLIB_LIBS=$(KRB4_CRYPTO_LIBS) -lcrypto
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ $(LD_UNRESOLVED_PREFIX)_et_list
+SHLIB_LIBS=$(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
+SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ 
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
 #
@@ -152,7 +152,7 @@ NETIO_OBJS=netread.$(OBJEXT) netwrite.$(OBJEXT)
 LIB_KRB_HOSTSRCS=$(srcdir)/unix_glue.c
 LIB_KRB_HOSTOBJS=unix_glue.$(OBJEXT)
 
-LIBNAME=libkrb4.$(LIBEXT)
+LIBNAME=libkrb4.$(STEXT)
 
 ARCHIVEARGS= $@ $(OBJS)
 
@@ -173,7 +173,7 @@ install:: install-$(WHAT)
 # We want *library* compiler options...
 DBG=$(DBG_LIB)
 
-all-unix:: shared $(LIBNAME) krb_err.h includes
+all-unix:: shared  krb_err.h includes
 
 shared:
        mkdir shared

diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 5816d56f44f13bea48ee5499c0fd3f4399d1d19e..218adcf2d6c2c434d29443d43a48c5241fe7e464 100644 (file)
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -46,8 +46,6 @@ V5_SHARED_LIB_OBJS
 SubdirLibraryRule([$(OBJS)])
 V5_MAKE_SHARED_LIB(libkrb4)
 CopyHeader(krb_err.h,$(EHDRDIR))
-LinkFileDir(../libkrb4.a, libkrb4.a, ./krb4)
-AppendRule([all-unix:: ../libkrb4.a])
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
 LinkFileDir(../libkrb4.[$](SHEXT), libkrb4.[$](SHEXT), ./krb4)
@@ -56,4 +54,11 @@ AppendRule([install::        libkrb4.[$](SHEXT)
        [$](INSTALL_DATA) libkrb4.[$](SHEXT)    \
                [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libkrb4.[$](SHEXT)])
 ])dnl
+if test -n "$krb5_cv_staticlibs_enabled" ; then
+       LinkFileDir(../libkrb4.[$](STEXT), libkrb4.[$](STEXT), ./krb5)
+        AppendRule([install:: 
+       [$](INSTALL_DATA) libkrb4.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb4.[$](STEXT)
+       [$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb4.[$](STEXT)]) 
+       AppendRule([all-unix:: ../libkrb4.[$](STEXT)])
+fi
 V5_AC_OUTPUT_MAKEFILE