From c4c11566986877903ac5bdf73e6c2241ef72de9d Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Sun, 19 Jun 2005 01:14:14 +0000
Subject: [PATCH] rxkad-stats-do-it-right-20050618

fine, let's just do this right
---
 Makefile.in                    | 2 +-
 src/des/util.c                 | 5 -----
 src/libuafs/Makefile.common.in | 2 +-
 src/util/Makefile.in           | 5 ++++-
 src/util/rxkstats.c            | 9 +++++++++
 5 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 src/util/rxkstats.c

diff --git a/Makefile.in b/Makefile.in
index 1b74593..7c45912 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,7 +118,7 @@ pinstall: config
 procmgmt: pinstall
 	${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt
+util: procmgmt des
 	${COMPILE_PART1} util ${COMPILE_PART2}
 
 audit: util rx rxkad
diff --git a/src/des/util.c b/src/des/util.c
index 5d38495..520ca1a 100644
--- a/src/des/util.c
+++ b/src/des/util.c
@@ -20,11 +20,6 @@ RCSID
 #include <sys/types.h>
 #include <des.h>
 #include "des_prototypes.h"
-#include "stats.h"
-
-#ifndef AFS_PTHREAD_ENV 
-struct rxkad_stats rxkad_stats = { { 0 } }; 
-#endif
 
 int
 des_cblock_print_file(des_cblock * x, FILE * fp)
diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index 8b9c37d..74411de 100644
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -62,7 +62,7 @@ webinstall: all \
 	${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
 
 linktest: UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a
-	$(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a $(TEST_LIBS) $(XLIBS)
+	$(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a $(TEST_LIBS) $(XLIBS)
 
 install: \
 	${DESTDIR}${libdir}/$(LIBUAFS) \
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index d4f3a58..22c6228 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -14,7 +14,7 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
 	 hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
 	 dirpath.o fileutil.o netutils.o flipbase64.o \
 	 afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \
-	 daemon.o ${REGEX_OBJ}
+	 daemon.o rxkstats.o ${REGEX_OBJ}
 
 includes = \
 	${TOP_INCDIR}/afs/dirpath.h \
@@ -134,6 +134,9 @@ strlcpy.o: ${srcdir}/strlcpy.c ${includes}
 daemon.o: ${srcdir}/daemon.c ${includes}
 	${CCOBJ} ${CFLAGS} -c ${srcdir}/daemon.c
 
+rxkstats.o: ${srcdir}/rxkstats.c ${includes}
+	${CCOBJ} ${CFLAGS} -c ${srcdir}/rxkstats.c
+
 #
 # Install targets
 #
diff --git a/src/util/rxkstats.c b/src/util/rxkstats.c
new file mode 100644
index 0000000..fd181b1
--- /dev/null
+++ b/src/util/rxkstats.c
@@ -0,0 +1,9 @@
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <des.h>
+#include <des/stats.h>
+
+#ifndef AFS_PTHREAD_ENV 
+struct rxkad_stats rxkad_stats = { { 0 } }; 
+#endif
-- 
1.9.4