From: Simon Wilkinson <sxw@your-file-system.com>
Date: Mon, 6 Sep 2010 08:39:59 +0000 (+0100)
Subject: aklog: Build a pthreaded, rather than lwp, version
X-Git-Tag: openafs-devel-1_7_1~1196
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=0aa5cdd72f4dd9ec7edba177efde3fb9aaedf58a;hp=1e03a0fa74cef95a557dc03da20413ee7236d34a

aklog: Build a pthreaded, rather than lwp, version

Make aklog (and friends) use pthreads, rather than lwp.

Change-Id: I49114caa74357b3b35626db6a7439128aec0acb6
Reviewed-on: http://gerrit.openafs.org/3356
Tested-by: Chaz Chandler <clc31@inbox.com>
Reviewed-by: Chaz Chandler <clc31@inbox.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index 6876a09..6d7c5b9 100644
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -4,7 +4,7 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.lwp
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -12,13 +12,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 XCFLAGS=@XCFLAGS@ @KRB5_CPPFLAGS@ -DALLOW_REGISTER
-AKLIBS = ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@
-AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libauth.a \
-	  ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/librxkad.a \
-	  ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \
-	  ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/liblwp.a \
-	  ${TOP_LIBDIR}/libafshcrypto_lwp.a ${TOP_LIBDIR}/libcom_err.a \
-	  ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a
+AKLIBS= ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@
+AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
+         ${TOP_LIBDIR}/libafsrpc.a \
+	 ${TOP_LIBDIR}/libafshcrypto.a \
+	 ${TOP_LIBDIR}/libcmd.a \
+         ${TOP_LIBDIR}/util.a
 
 SRCS=	aklog.c krb_util.c linked_list.c
 OBJS=   aklog.o krb_util.o linked_list.o
@@ -26,14 +25,14 @@ OBJS=   aklog.o krb_util.o linked_list.o
 all: aklog asetkey klog
 
 aklog:	${OBJS} ${AFSLIBS}
-	$(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS}
+	$(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 asetkey: asetkey.o ${AFSLIBS}
-	$(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS}
+	$(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 klog:	klog.o skipwrap.o ${AFSLIBS}
 	$(AFS_LDRULE) klog.o skipwrap.o \
-		${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS}
+		${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 #
 # Installation targets