summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-16 20:59:50 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-16 20:59:50 +0000
commit91a44bb9cb6475991c051de0b367cee9de923da1 (patch)
treeb1641e031951fa118ad0c39b7c133b289e462e69
parent1f422926b43d2c696e5a96214900cc482567be75 (diff)
libsl is a bad idea
-rw-r--r--kerberosIV/Makefile4
-rw-r--r--kerberosIV/kadmin/Makefile6
-rw-r--r--kerberosIV/kadmin/sl.c (renamed from kerberosIV/sl/sl.c)0
-rw-r--r--kerberosIV/sl/Makefile8
-rw-r--r--kerberosIV/sl/shlib_version2
5 files changed, 5 insertions, 15 deletions
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index 5d5eebf7b71..421c992603c 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1997/12/15 17:56:12 art Exp $
+# $OpenBSD: Makefile,v 1.13 1997/12/16 20:59:43 deraadt Exp $
# from @(#)Makefile 5.1 (Berkeley) 6/25/90
SUBDIR=
@@ -7,7 +7,7 @@ SUBDIR=
SUBDIR+=include
.endif
-SUBDIR+=acl krb kadm kafs kdb sl
+SUBDIR+=acl krb kadm kafs kdb
SUBDIR+=ext_srvtab kadmin kadmind kdb_destroy kdb_edit kdb_init kdb_util \
kdestroy kerberos kinit klist kprop kpropd ksrvtgt ksrvutil \
diff --git a/kerberosIV/kadmin/Makefile b/kerberosIV/kadmin/Makefile
index d750b8a6c32..005a055986e 100644
--- a/kerberosIV/kadmin/Makefile
+++ b/kerberosIV/kadmin/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.5 1997/12/15 17:56:18 art Exp $
+# $Id: Makefile,v 1.6 1997/12/16 20:59:46 deraadt Exp $
.include <bsd.obj.mk>
PROG= kadmin
-SRCS= kadmin.c new_pwd.c
+SRCS= kadmin.c new_pwd.c sl.c
.PATH: ${.CURDIR}/../kdb_edit
.if exists(${.CURDIR}/../kadm/${__objdir})
CFLAGS+=-I${.CURDIR}/../kadm/${__objdir}
@@ -15,7 +15,7 @@ CFLAGS+=-I${.CURDIR}/../krb/${__objdir}
.else
CFLAGS+=-I${.CURDIR}/../krb
.endif
-LDADD+= -lkadm -lkrb -ldes -lcom_err -lsl
+LDADD+= -lkadm -lkrb -ldes -lcom_err
DPADD+= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBSS} ${LIBCOM_ERR}
CLEANFILES+= kadmin_cmds.c
MAN= kadmin.8
diff --git a/kerberosIV/sl/sl.c b/kerberosIV/kadmin/sl.c
index 48e51a2b8c6..48e51a2b8c6 100644
--- a/kerberosIV/sl/sl.c
+++ b/kerberosIV/kadmin/sl.c
diff --git a/kerberosIV/sl/Makefile b/kerberosIV/sl/Makefile
deleted file mode 100644
index 8dc29995b9f..00000000000
--- a/kerberosIV/sl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# from @(#)Makefile 8.1 (Berkeley) 6/1/93
-# $Id: Makefile,v 1.1 1997/12/15 17:56:25 art Exp $
-
-LIB= sl
-CFLAGS+=-I${.CURDIR}
-SRCS= sl.c
-
-.include <bsd.lib.mk>
diff --git a/kerberosIV/sl/shlib_version b/kerberosIV/sl/shlib_version
deleted file mode 100644
index 1edea46de91..00000000000
--- a/kerberosIV/sl/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=1
-minor=0