summaryrefslogtreecommitdiffstats
path: root/src/lib/des425
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-06-15 22:34:56 +0000
committerPaul Park <pjpark@mit.edu>1995-06-15 22:34:56 +0000
commitb3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch)
tree40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/lib/des425
parent821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff)
downloadkrb5-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/des425')
-rw-r--r--src/lib/des425/ChangeLog8
-rw-r--r--src/lib/des425/Makefile.in10
-rw-r--r--src/lib/des425/configure.in7
3 files changed, 23 insertions, 2 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 12257053f2..bcced223bb 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,11 @@
+
+Thu Jun 15 18:00:45 EDT 1995 Paul Park (pjpark@mit.edu)
+ * Makefile.in - Change "./DONE" target to "DONE" since we have a rule
+ for how to build it. Also add definitions for shared library
+ building rules.
+ * configure.in - Create symlinks for archive and shared library when
+ we build them.
+
Wed Jun 14 07:37:26 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
* Makefile.in (libdes425.a): Don't copy library up a level. Let
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 7b75cf9e10..3da8c049db 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -40,8 +40,14 @@ SRCS= $(srcdir)/cksum.c \
$(srcdir)/weak_key.c
LIB_SUBDIRS= .
-LIBDONE= ./DONE
-
+LIBDONE= DONE
+#
+# Depends on libcrypto.
+#
+DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT)
+SHLIB_LIBS=-lcrypto
+SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
+SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a
DEPKLIB= $(TOPLIBD)/libcrypto.a
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 75fa651e35..75a4c8e70b 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -6,6 +6,13 @@ AC_PROG_RANLIB
AC_PROG_INSTALL
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],[
+LinkFileDir(../libdes425.[$](SHEXT), libdes425.[$](SHEXT), ./des425)
+AppendRule([all-unix:: ../libdes425.$(SHEXT)])
+])dnl
V5_AC_OUTPUT_MAKEFILE