util: Remove packages.h
[openafs.git] / src / util / Makefile.in
index 308bb61..3c53311 100644 (file)
@@ -7,39 +7,80 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
+
+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 \
-        hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
+objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
+        hostparse.o exec.o \
+        hputil.o kreltime.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}
+        afs_atomlist.o afs_lhash.o snprintf.o pthread_glock.o \
+        tabular_output.o ${REGEX_OBJ}
+
+objects_pic = \
+       assert_pic.o \
+       base64_pic.o \
+       casestrcpy_pic.o \
+       config_file_pic.o \
+       ktime_pic.o \
+       volparse_pic.o \
+       hostparse_pic.o \
+       exec_pic.o \
+       hputil_pic.o \
+       kreltime_pic.o \
+       get_krbrlm_pic.o \
+       uuid_pic.o \
+       serverLog_pic.o \
+       dirpath_pic.o \
+       fileutil_pic.o \
+       netutils_pic.o \
+       flipbase64_pic.o \
+       fstab_pic.o \
+       afs_atomlist_pic.o \
+       afs_lhash_pic.o \
+       snprintf_pic.o \
+       pthread_glock_pic.o \
+       tabular_output_pic.o \
+       ${REGEX_OBJ_PIC}
 
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
-       ${TOP_INCDIR}/afs/assert.h \
+       ${TOP_INCDIR}/afs/afs_assert.h \
        ${TOP_INCDIR}/afs/errors.h \
        ${TOP_INCDIR}/afs/vice.h \
        ${TOP_INCDIR}/afs/remote.h \
        ${TOP_INCDIR}/afs/ktime.h \
        ${TOP_INCDIR}/afs/fileutil.h \
        ${TOP_INCDIR}/afs/netutils.h \
-       ${TOP_INCDIR}/afs/packages.h \
        ${TOP_INCDIR}/afs/afsutil.h \
        ${TOP_INCDIR}/afs/afsutil_prototypes.h \
        ${TOP_INCDIR}/afs/pthread_glock.h \
        ${TOP_INCDIR}/afs/afs_atomlist.h \
        ${TOP_INCDIR}/afs/afs_lhash.h \
        ${TOP_INCDIR}/afs/softsig.h \
-       ${TOP_INCDIR}/potpourri.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}/afs/tabular_output.h \
+       ${TOP_INCDIR}/opr/queue.h
 
 all: ${includes} \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       ${TOP_LIBDIR}/libafsutil_pic.a \
        sys
 
+buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h
+buildtools_clean: clean
+
 depinstall: ${includes}
 
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
@@ -48,7 +89,7 @@ ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
 ${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
+${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
        ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
@@ -69,9 +110,6 @@ ${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
 ${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
        ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/packages.h: ${srcdir}/packages.h
-       ${INSTALL_DATA} $? $@
-
 ${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
        ${INSTALL_DATA} $? $@
 
@@ -90,27 +128,51 @@ ${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}/afs/tabular_output.h: ${srcdir}/tabular_output.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/opr/queue.h: ${srcdir}/queue.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_LIBDIR}/util.a: util.a
        ${INSTALL_DATA} $? $@
 
 ${TOP_LIBDIR}/libafsutil.a: util.a
        ${INSTALL_DATA} $? $@
 
+${TOP_LIBDIR}/libafsutil_pic.a: util_pic.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,86 +183,99 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
-assert.o: ${srcdir}/assert.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/assert.c
+util_pic.a: ${objects_pic} AFS_component_version_number_pic.o
+       $(RM) -f util_pic.a
+       $(AR) crv util_pic.a ${objects_pic} AFS_component_version_number_pic.o
+       $(RANLIB) util_pic.a
 
-casestrcpy.o: ${srcdir}/casestrcpy.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/casestrcpy.c
+pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
+       ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 
-hputil.o: ${srcdir}/hputil.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/hputil.c
+${objects}: ${includes}
 
-flipbase64.o: ${srcdir}/flipbase64.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/flipbase64.c
+AFS_component_version_number_pic.o: AFS_component_version_number.c
+       $(SHD_CCRULE) AFS_component_version_number.c
 
-volparse.o: ${srcdir}/volparse.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/volparse.c
+config_file.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
+       $(AFS_CCRULE) -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c 
 
-snprintf.o: ${srcdir}/snprintf.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/snprintf.c
+sys.o: sys.c AFS_component_version_number.c ${includes}
 
-fstab.o: ${srcdir}/fstab.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/fstab.c
+sys: sys.o 
+       $(AFS_LDRULE) sys.o
 
-base64.o: ${srcdir}/base64.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c
+# PIC objects build rules
+assert_pic.o: ${srcdir}/assert.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/assert.c
 
-hostparse.o: ${srcdir}/hostparse.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/hostparse.c
+base64_pic.o: ${srcdir}/base64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/base64.c
 
-ktime.o: ${srcdir}/ktime.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/ktime.c
+casestrcpy_pic.o: ${srcdir}/casestrcpy.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/casestrcpy.c
 
-kreltime.o: ${srcdir}/kreltime.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/kreltime.c
+config_file_pic.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
+       $(SHD_CCRULE) ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
 
-get_krbrlm.o: ${srcdir}/get_krbrlm.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
+ktime_pic.o: ${srcdir}/ktime.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/ktime.c
 
-uuid.o: ${srcdir}/uuid.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/uuid.c
+volparse_pic.o: ${srcdir}/volparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/volparse.c
 
-sys.o: ${srcdir}/sys.c AFS_component_version_number.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/sys.c
+hostparse_pic.o: ${srcdir}/hostparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/hostparse.c
 
-sys: sys.o 
-       ${CC} ${LDFLAGS} -o sys sys.o
+exec_pic.o: ${srcdir}/exec.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/exec.c
+
+hputil_pic.o: ${srcdir}/hputil.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/hputil.c
+
+kreltime_pic.o: ${srcdir}/kreltime.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/kreltime.c
+
+get_krbrlm_pic.o: ${srcdir}/get_krbrlm.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/get_krbrlm.c
+
+uuid_pic.o: ${srcdir}/uuid.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/uuid.c
 
-isathing.o: ${srcdir}/isathing.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/isathing.c
+serverLog_pic.o: ${srcdir}/serverLog.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/serverLog.c
 
-serverLog.o: ${srcdir}/serverLog.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/serverLog.c
+dirpath_pic.o: ${srcdir}/dirpath.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/dirpath.c
 
-dirpath.o: ${srcdir}/dirpath.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/dirpath.c
+fileutil_pic.o: ${srcdir}/fileutil.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fileutil.c
 
-fileutil.o: ${srcdir}/fileutil.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/fileutil.c
+netutils_pic.o: ${srcdir}/netutils.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/netutils.c
 
-netutils.o: ${srcdir}/netutils.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/netutils.c
+flipbase64_pic.o: ${srcdir}/flipbase64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/flipbase64.c
 
-afs_atomlist.o: ${srcdir}/afs_atomlist.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_atomlist.c
+fstab_pic.o: ${srcdir}/fstab.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fstab.c
 
-afs_lhash.o: ${srcdir}/afs_lhash.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_lhash.c
+afs_atomlist_pic.o: ${srcdir}/afs_atomlist.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_atomlist.c
 
-strlcat.o: ${srcdir}/strlcat.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcat.c
+afs_lhash_pic.o: ${srcdir}/afs_lhash.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_lhash.c
 
-strlcpy.o: ${srcdir}/strlcpy.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcpy.c
+snprintf_pic.o: ${srcdir}/snprintf.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/snprintf.c
 
-strnlen.o: ${srcdir}/strnlen.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strnlen.c
+pthread_glock_pic.o: ${srcdir}/pthread_glock.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/pthread_glock.c
 
-daemon.o: ${srcdir}/daemon.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/daemon.c
+tabular_output_pic.o: ${srcdir}/tabular_output.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/tabular_output.c
 
-rxkstats.o: ${srcdir}/rxkstats.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/rxkstats.c
+regex_pic.o: ${srcdir}/regex.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/regex.c
 
 #
 # Install targets
@@ -208,54 +283,62 @@ rxkstats.o: ${srcdir}/rxkstats.c ${includes}
 KDIR=../libafs/afs
 UKDIR=../libuafs/afs
 
-install: dirpath.h util.a sys
+install: dirpath.h util.a util_pic.a sys
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL_DATA} dirpath.h ${DESTDIR}${includedir}/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DESTDIR}${includedir}/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DESTDIR}${includedir}/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DESTDIR}${includedir}/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DESTDIR}${includedir}/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DESTDIR}${includedir}/afs/remote.h
        ${INSTALL_DATA} ${srcdir}/ktime.h ${DESTDIR}${includedir}/afs/ktime.h
        ${INSTALL_DATA} ${srcdir}/fileutil.h ${DESTDIR}${includedir}/afs/fileutil.h
        ${INSTALL_DATA} ${srcdir}/netutils.h ${DESTDIR}${includedir}/afs/netutils.h
-       ${INSTALL_DATA} ${srcdir}/packages.h ${DESTDIR}${includedir}/afs/packages.h
        ${INSTALL_DATA} ${srcdir}/afsutil.h ${DESTDIR}${includedir}/afs/afsutil.h
        ${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DESTDIR}${includedir}/afs/afsutil_prototypes.h
        ${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DESTDIR}${includedir}/afs/pthread_glock.h
        ${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}/potpourri.h ${DESTDIR}${includedir}/potpourri.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}/tabular_output.h ${DESTDIR}${includedir}/afs/tabular_output.h
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/util.a
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/libafsutil.a
+       ${INSTALL_DATA} util_pic.a ${DESTDIR}${libdir}/afs/libafsutil_pic.a
        ${INSTALL_PROGRAM} sys ${DESTDIR}${bindir}/sys
 
-dest: dirpath.h util.a sys
+dest: dirpath.h util.a util_pic.a sys
        ${INSTALL} -d ${DEST}/include/afs
        ${INSTALL} -d ${DEST}/lib/afs
        ${INSTALL} -d ${DEST}/bin
        ${INSTALL_DATA} dirpath.h ${DEST}/include/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DEST}/include/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DEST}/include/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DEST}/include/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DEST}/include/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DEST}/include/afs/remote.h
        ${INSTALL_DATA} ${srcdir}/ktime.h ${DEST}/include/afs/ktime.h
        ${INSTALL_DATA} ${srcdir}/fileutil.h ${DEST}/include/afs/fileutil.h
        ${INSTALL_DATA} ${srcdir}/netutils.h ${DEST}/include/afs/netutils.h
-       ${INSTALL_DATA} ${srcdir}/packages.h ${DEST}/include/afs/packages.h
        ${INSTALL_DATA} ${srcdir}/afsutil.h ${DEST}/include/afs/afsutil.h
        ${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DEST}/include/afs/afsutil_prototypes.h
        ${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DEST}/include/afs/pthread_glock.h
        ${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}/potpourri.h ${DEST}/include/potpourri.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}/tabular_output.h ${DEST}/include/afs/tabular_output.h
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/util.a
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/libafsutil.a
+       ${INSTALL_DATA} util_pic.a ${DEST}/lib/afs/libafsutil_pic.a
        ${INSTALL_PROGRAM} sys ${DEST}/bin/sys
 
 #
@@ -264,7 +347,7 @@ dest: dirpath.h util.a sys
 
 clean:
        $(RM) -f ${objects} sys dirpath.h
-       $(RM) -f util.a *.o core AFS_component_version_number.c
+       $(RM) -f util.a util_pic.a *.o core AFS_component_version_number.c
 
 test:
        cd test; $(MAKE)
@@ -274,6 +357,6 @@ include ../config/Makefile.version
 check-splint:
        sh $(HELPER_SPLINT) $(CFLAGS) \
            assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
-           hputil.c kreltime.c isathing.c get_krbrlm.c uuid.c serverLog.c \
+           hputil.c kreltime.c get_krbrlm.c uuid.c serverLog.c \
            dirpath.c fileutil.c netutils.c flipbase64.c \
            afs_atomlist.c afs_lhash.c snprintf.c fstab.c