util: Add base64 from Heimdal's roken

[openafs.git] / src / util / Makefile.in

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0226e8f..aea0225 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -19,9 +19,10 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
         hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
         dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
         afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o strnlen.o \
-        pthread_glock.o daemon.o rxkstats.o ${REGEX_OBJ}
+        pthread_glock.o daemon.o ${REGEX_OBJ}
 
 includes = \
+       ${TOP_INCDIR}/util/base64.h \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
        ${TOP_INCDIR}/afs/assert.h \
@@ -38,6 +39,10 @@ includes = \
        ${TOP_INCDIR}/afs/afs_atomlist.h \
        ${TOP_INCDIR}/afs/afs_lhash.h \
        ${TOP_INCDIR}/afs/softsig.h \
+       ${TOP_INCDIR}/afs/work_queue.h \
+       ${TOP_INCDIR}/afs/work_queue_types.h \
+       ${TOP_INCDIR}/afs/thread_pool.h \
+       ${TOP_INCDIR}/afs/thread_pool_types.h \
        ${TOP_INCDIR}/potpourri.h 
 
 all: ${includes} \
@@ -50,6 +55,9 @@ buildtools_clean: clean
 
 depinstall: ${includes}
 
+${TOP_INCDIR}/util/base64.h: ${TOP_SRCDIR}/external/heimdal/roken/base64.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
        ${INSTALL_DATA} $? $@
 
@@ -98,6 +106,18 @@ ${TOP_INCDIR}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
 ${TOP_INCDIR}/afs/softsig.h: ${srcdir}/softsig.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/work_queue.h: ${srcdir}/work_queue.h
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/work_queue_types.h: ${srcdir}/work_queue_types.h
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/thread_pool.h: ${srcdir}/thread_pool.h
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/thread_pool_types.h: ${srcdir}/thread_pool_types.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL_DATA} $? $@
 
@@ -132,6 +152,9 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
+base64.o: ${TOP_SRCDIR}/external/heimdal/roken/base64.c
+       ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/roken/base64.c
+
 pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
        ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 
@@ -219,9 +242,6 @@ strnlen.o: ${srcdir}/strnlen.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
 #
@@ -248,6 +268,10 @@ install: dirpath.h util.a sys
        ${INSTALL_DATA} ${srcdir}/afs_atomlist.h ${DESTDIR}${includedir}/afs/afs_atomlist.h
        ${INSTALL_DATA} ${srcdir}/afs_lhash.h ${DESTDIR}${includedir}/afs/afs_lhash.h
        ${INSTALL_DATA} ${srcdir}/softsig.h ${DESTDIR}${includedir}/afs/softsig.h
+       ${INSTALL_DATA} ${srcdir}/work_queue.h ${DESTDIR}${includedir}/afs/work_queue.h
+       ${INSTALL_DATA} ${srcdir}/work_queue_types.h ${DESTDIR}${includedir}/afs/work_queue_types.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool.h ${DESTDIR}${includedir}/afs/thread_pool.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool_types.h ${DESTDIR}${includedir}/afs/thread_pool_types.h
        ${INSTALL_DATA} ${srcdir}/potpourri.h ${DESTDIR}${includedir}/potpourri.h
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/util.a
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/libafsutil.a
@@ -273,6 +297,10 @@ dest: dirpath.h util.a sys
        ${INSTALL_DATA} ${srcdir}/afs_atomlist.h ${DEST}/include/afs/afs_atomlist.h
        ${INSTALL_DATA} ${srcdir}/afs_lhash.h ${DEST}/include/afs/afs_lhash.h
        ${INSTALL_DATA} ${srcdir}/softsig.h ${DEST}/include/afs/softsig.h
+       ${INSTALL_DATA} ${srcdir}/work_queue.h ${DEST}/include/afs/work_queue.h
+       ${INSTALL_DATA} ${srcdir}/work_queue_types.h ${DEST}/include/afs/work_queue_types.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool.h ${DEST}/include/afs/thread_pool.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool_types.h ${DEST}/include/afs/thread_pool_types.h
        ${INSTALL_DATA} ${srcdir}/potpourri.h ${DEST}/include/potpourri.h
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/util.a
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/libafsutil.a