From 5740865dce2219de0826d72fe4f5bff70fadfdf3 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 8 Aug 2005 16:37:28 +0000 Subject: [PATCH] logthreadnum-libafsauthent-20050808 FIXES 20412 export LogThreadNum so hings can link our libraries again --- src/libafsauthent/Makefile.in | 8 ++++++++ src/libafsrpc/Makefile.in | 8 ++++++++ src/shlibafsauthent/Makefile.in | 8 ++++++++ src/shlibafsauthent/mapfile | 2 ++ src/shlibafsrpc/Makefile.in | 10 +++++++++- src/shlibafsrpc/mapfile | 1 + src/tviced/Makefile.in | 5 +---- src/tvolser/Makefile.in | 5 +---- 8 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 083baae..a6b25ed 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -58,6 +58,8 @@ UTILOBJS = \ pthread_glock.o \ get_krbrlm.o \ dirpath.o \ + serverLog.o \ + snprintf.o \ fileutil.o RXKADOBJS = \ @@ -178,6 +180,12 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c dirpath.o: ${UTIL}/dirpath.c ${CCRULE} +serverLog.o: ${UTIL}/serverLog.c + ${CCRULE} + +snprintf.o: ${UTIL}/snprintf.c + ${CCRULE} + fileutil.o: ${UTIL}/fileutil.c ${CCRULE} diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 70a6702..482047c 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -27,6 +27,7 @@ DES = ${srcdir}/../des COMERR = ${srcdir}/../comerr UTIL = ${srcdir}/../util SYS = ${srcdir}/../sys +LWP = ${srcdir}/../lwp SYSOBJS =\ syscall.o @@ -110,6 +111,9 @@ DESOBJS =\ CRYPT_OBJ = crypt.o +LWPOBJS = \ + fasttime.o + LIBOBJS = \ ${RXOBJS} \ ${DESOBJS} \ @@ -120,6 +124,7 @@ LIBOBJS = \ ${SYSOBJS} \ ${CRYPT_OBJ} \ ${RXSTATOBJS} \ + ${LWPOBJS} \ ${FSINTOBJS} all: ${TOP_LIBDIR}/libafsrpc.a @@ -343,6 +348,9 @@ assert.o: ${UTIL}/assert.c base64.o: ${UTIL}/base64.c ${CCRULE} ${UTIL}/base64.c +fasttime.o: ${LWP}/fasttime.c + ${CCRULE} ${LWP}/fasttime.c + syscall.o: ${SYS}/syscall.s case "$(SYS_NAME)" in \ sun4x_5* | sunx86_5*) \ diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index ecc7c74..1a6d4ab 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -63,6 +63,8 @@ UTILOBJS = \ pthread_glock.o \ get_krbrlm.o \ dirpath.o \ + serverLog.o \ + snprintf.o \ fileutil.o RXKADOBJS = \ @@ -193,6 +195,12 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c dirpath.o: ${UTIL}/dirpath.c ${CCRULE} +serverLog.o: ${UTIL}/serverLog.c + ${CCRULE} + +snprintf.o: ${UTIL}/snprintf.c + ${CCRULE} + fileutil.o: ${UTIL}/fileutil.c ${CCRULE} diff --git a/src/shlibafsauthent/mapfile b/src/shlibafsauthent/mapfile index ddf03f0..7bf00c0 100644 --- a/src/shlibafsauthent/mapfile +++ b/src/shlibafsauthent/mapfile @@ -82,6 +82,8 @@ pr_SNameToId; afs_get_pag_from_groups; setpag; + afs_snprintf; + LogThreadNum; local: *; diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index 41e5606..1c65aea 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -31,7 +31,8 @@ FSINT = ../fsint DES = ../des COMERR = ../comerr UTIL = ../util -SYS = ${srcdir}/../sys +SYS = ../sys +LWP = ../lwp SYSOBJS =\ syscall.o @@ -113,6 +114,9 @@ DESOBJS =\ CRYPT_OBJ = crypt.o +LWPOBJS = \ + fasttime.o + LIBOBJS = \ ${RXOBJS} \ ${DESOBJS} \ @@ -123,6 +127,7 @@ LIBOBJS = \ ${SYSOBJS} \ ${CRYPT_OBJ} \ ${RXSTATOBJS} \ + ${LWPOBJS} \ ${FSINTOBJS} LIBAFSRPC = libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}.${LIBAFSRPCMINOR} @@ -350,6 +355,9 @@ assert.o: ${UTIL}/assert.c base64.o: ${UTIL}/base64.c ${CCRULE} +fasttime.o: ${LWP}/fasttime.c + ${CCRULE} ${LWP}/fasttime.c + syscall.o: ${SYS}/syscall.s case "$(SYS_NAME)" in \ sun4x_5* | sunx86_5*) \ diff --git a/src/shlibafsrpc/mapfile b/src/shlibafsrpc/mapfile index 7486e2c..be53a8a 100644 --- a/src/shlibafsrpc/mapfile +++ b/src/shlibafsrpc/mapfile @@ -110,6 +110,7 @@ RXSTATS_QueryRPCStatsVersion; RXSTATS_ClearProcessRPCStats; RXSTATS_ClearPeerRPCStats; + TM_GetTimeOfDay; local: *; diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index eeb7e7a..280c2ad 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -28,7 +28,7 @@ VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o -LWPOBJS=lock.o fasttime.o threadname.o +LWPOBJS=lock.o threadname.o LIBACLOBJS=aclprocs.o netprocs.o @@ -94,9 +94,6 @@ softsig.o: ${UTIL}/softsig.c lock.o: ${LWP}/lock.c ${CCRULE} -fasttime.o: ${LWP}/fasttime.c - ${CCRULE} - threadname.o: ${LWP}/threadname.c ${CCRULE} diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 429e791..8b8b1a7 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -28,7 +28,7 @@ VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstu VLSERVEROBJS=#vldbint.cs.o vldbint.xdr.o -LWPOBJS=lock.o fasttime.o threadname.o +LWPOBJS=lock.o threadname.o LIBACLOBJS=aclprocs.o netprocs.o @@ -99,9 +99,6 @@ softsig.o: ${UTIL}/softsig.c lock.o: ${LWP}/lock.c ${COMPILE} -fasttime.o: ${LWP}/fasttime.c - ${COMPILE} - threadname.o: ${LWP}/threadname.c ${COMPILE} -- 1.9.4