Revert "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 308bb61..4a81136 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -7,14 +7,19 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
 
-objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
+objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
+        hostparse.o exec.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 \
-        daemon.o rxkstats.o ${REGEX_OBJ}
+        pthread_glock.o daemon.o ${REGEX_OBJ}
 
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
@@ -33,6 +38,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} \
@@ -40,6 +49,9 @@ all: ${includes} \
        ${TOP_LIBDIR}/libafsutil.a \
        sys
 
+buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h
+buildtools_clean: clean
+
 depinstall: ${includes}
 
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
@@ -90,6 +102,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} $? $@
 
@@ -99,18 +123,21 @@ ${TOP_LIBDIR}/util.a: util.a
 ${TOP_LIBDIR}/libafsutil.a: util.a
        ${INSTALL_DATA} $? $@
 
+# Use " as the sed boundary character because we lose anyway if that occurs
+# in path names.
 dirpath.h: ${srcdir}/dirpath.hin Makefile
        ( sed \
-               -e "s+@afsconfdir+${afsconfdir}+" \
-               -e "s+@viceetcdir+${viceetcdir}+" \
-               -e "s+@afssrvbindir+${afssrvbindir}+" \
-               -e "s+@afssrvsbindir+${afssrvsbindir}+" \
-               -e "s+@afssrvlibexecdir+${afssrvlibexecdir}+" \
-               -e "s+@afsdbdir+${afsdbdir}+" \
-               -e "s+@afslogsdir+${afslogsdir}+" \
-               -e "s+@afslocaldir+${afslocaldir}+" \
-               -e "s+@afsbackupdir+${afsbackupdir}+" \
-               -e "s+@afsbosconfigdir+${afsbosconfigdir}+" \
+               -e 's"@afsconfdir"${afsconfdir}"' \
+               -e 's"@viceetcdir"${viceetcdir}"' \
+               -e 's"@afssrvbindir"${afssrvbindir}"' \
+               -e 's"@afssrvsbindir"${afssrvsbindir}"' \
+               -e 's"@afssrvlibexecdir"${afssrvlibexecdir}"' \
+               -e 's"@afsdbdir"${afsdbdir}"' \
+               -e 's"@afslogsdir"${afslogsdir}"' \
+               -e 's"@afslocaldir"${afslocaldir}"' \
+               -e 's"@afsbackupdir"${afsbackupdir}"' \
+               -e 's"@afsbosconfigdir"${afsbosconfigdir}"' \
+               -e 's"@afsdatadir"${afsdatadir}"' \
                ${srcdir}/dirpath.hin >dirpath.h.tmp && \
                if cmp dirpath.h.tmp dirpath.h >/dev/null ; then : ; else \
                mv dirpath.h.tmp dirpath.h ; fi)
@@ -121,6 +148,9 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
+pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
+       ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
+
 assert.o: ${srcdir}/assert.c ${includes}
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/assert.c
 
@@ -145,9 +175,15 @@ fstab.o: ${srcdir}/fstab.c ${includes}
 base64.o: ${srcdir}/base64.c ${includes}
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c
 
+config_file.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
+       ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
+
 hostparse.o: ${srcdir}/hostparse.c ${includes}
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/hostparse.c
 
+exec.o: ${srcdir}/exec.c ${includes}
+       ${CCOBJ} ${CFLAGS} -c ${srcdir}/exec.c
+
 ktime.o: ${srcdir}/ktime.c ${includes}
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/ktime.c
 
@@ -199,9 +235,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
 #
@@ -228,6 +261,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
@@ -253,6 +290,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