STABLE14-rxkad-stats-do-it-right-20050618

fine, let's just do this right

(cherry picked from commit c4c11566986877903ac5bdf73e6c2241ef72de9d)

diff --git a/Makefile.in b/Makefile.in
index 1b745937e3fc159b9b6b8a2c11cb25d644fd2ceb..7c4591212c88a88d6f5b278c44b9bf0e09737441 100644 (file)
--- 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 5d3849597edf85006bd97a17ca045d4cac6791ea..520ca1ab76aee375d59efe7992694fef343a01fa 100644 (file)
--- 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 8b9c37d36f9d81dc222c418985774ef2d3437428..74411de968c3c76f51e881c8bca9242ab90aae53 100644 (file)
--- 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 d4f3a58b742db867e9294a803ca3443ee0dc9264..22c6228e2cde25bcf5e7cdb9a292470582490c21 100644 (file)
--- 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 (file)
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