util: Use foo_pic.o instead of pic_foo.o
[openafs.git] / src / util / Makefile.in
index 17112bc..f30adfb 100644 (file)
@@ -5,53 +5,55 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-DEST=@DEST@
-TOP_INCDIR=@TOP_INCDIR@
-TOP_LIBDIR=@TOP_LIBDIR@
-TOP_OBJDIR=@TOP_OBJDIR@
 srcdir=@srcdir@
-VPATH=${srcdir}
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-sysconfdir=@sysconfdir@
-localstatedir=@localstatedir@
-COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
-RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-afsconfdir=@afsconfdir@
-viceetcdir=@viceetcdir@
-afssrvbindir=@afssrvbindir@
-afssrvsbindir=@afssrvsbindir@
-afssrvlibexecdir=@afssrvlibexecdir@
-afsdbdir=@afsdbdir@
-afslogsdir=@afslogsdir@
-afslocaldir=@afslocaldir@
-afsbackupdir=@afsbackupdir@
-afsbosconfigdir=@afsbosconfigdir@
-
-SHELL = /bin/sh
-
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = ${OPTMZ} ${XLDFLAGS}
-
-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 ${REGEX_OBJ}
+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@
+
 
-all: ukinstall kinstall \
+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 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 \
+       isathing_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 \
@@ -60,388 +62,294 @@ all: ukinstall kinstall \
        ${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}/potpourri.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}/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
 
-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}+" \
-               ${srcdir}/dirpath.hin >dirpath.h.tmp && \
-               mv dirpath.h.tmp dirpath.h )
-
-util.a: ${objects} AFS_component_version_number.o
-       $(RM) -f util.a
-       $(AR) crv util.a ${objects} AFS_component_version_number.o
-       $(RANLIB) util.a
-
-assert.o: ${srcdir}/assert.c
-       ${CC} ${CFLAGS} -c ${srcdir}/assert.c
-
-casestrcpy.o: ${srcdir}/casestrcpy.c
-       ${CC} ${CFLAGS} -c ${srcdir}/casestrcpy.c
-
-hputil.o: ${srcdir}/hputil.c
-       ${CC} ${CFLAGS} -c ${srcdir}/hputil.c
-
-flipbase64.o: ${srcdir}/flipbase64.c
-       ${CC} ${CFLAGS} -c ${srcdir}/flipbase64.c
-
-volparse.o: ${srcdir}/volparse.c
-       ${CC} ${CFLAGS} -c ${srcdir}/volparse.c
-
-snprintf.o: ${srcdir}/snprintf.c
-       ${CC} ${CFLAGS} -c ${srcdir}/snprintf.c
-
-base64.o: ${srcdir}/base64.c
-       ${CC} ${CFLAGS} -c ${srcdir}/base64.c
-
-hostparse.o: ${srcdir}/hostparse.c ${srcdir}/afsutil.h
-       ${CC} ${CFLAGS} -c ${srcdir}/hostparse.c
-
-ktime.o: ${srcdir}/ktime.c
-       ${CC} ${CFLAGS} -c ${srcdir}/ktime.c
-
-kreltime.o: ${srcdir}/kreltime.c
-       ${CC} ${CFLAGS} -c ${srcdir}/kreltime.c
+buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h
+buildtools_clean: clean
 
-get_krbrlm.o: ${srcdir}/get_krbrlm.c
-       ${CC} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
-
-uuid.o: ${srcdir}/uuid.c
-       ${CC} ${CFLAGS} -c ${srcdir}/uuid.c
-
-sys.o: ${srcdir}/sys.c ${TOP_INCDIR}/afs/param.h AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c ${srcdir}/sys.c
-
-sys: sys.o 
-       ${CC} ${LDFLAGS} -o sys sys.o
-
-isathing.o: ${srcdir}/isathing.c
-       ${CC} ${CFLAGS} -c ${srcdir}/isathing.c
-
-serverLog.o: ${srcdir}/serverLog.c
-       ${CC} ${CFLAGS} -c ${srcdir}/serverLog.c
-
-dirpath.o: ${srcdir}/dirpath.c dirpath.h
-       ${CC} ${CFLAGS} -c ${srcdir}/dirpath.c
-
-fileutil.o: ${srcdir}/fileutil.c ${srcdir}/fileutil.h
-       ${CC} ${CFLAGS} -c ${srcdir}/fileutil.c
-
-netutils.o: ${srcdir}/netutils.c ${srcdir}/netutils.h
-       ${CC} ${CFLAGS} -c ${srcdir}/netutils.c
-
-afs_atomlist.o: ${srcdir}/afs_atomlist.c ${srcdir}/afs_atomlist.h
-       ${CC} ${CFLAGS} -c ${srcdir}/afs_atomlist.c
-
-afs_lhash.o: ${srcdir}/afs_lhash.c ${srcdir}/afs_lhash.h ${srcdir}/afs_atomlist.h
-       ${CC} ${CFLAGS} -c ${srcdir}/afs_lhash.c
-
-#
-# Install targets
-#
-KDIR=../libafs/afs
-UKDIR=../libuafs/afs
-
-install: \
-       ${DESTDIR}${includedir}/afs/dirpath.h \
-       ${DESTDIR}${includedir}/afs/pthread_nosigs.h \
-       ${DESTDIR}${includedir}/afs/assert.h \
-       ${DESTDIR}${includedir}/afs/errors.h \
-       ${DESTDIR}${includedir}/afs/vice.h \
-       ${DESTDIR}${includedir}/afs/remote.h \
-       ${DESTDIR}${includedir}/afs/ktime.h \
-       ${DESTDIR}${includedir}/afs/fileutil.h \
-       ${DESTDIR}${includedir}/afs/netutils.h \
-       ${DESTDIR}${includedir}/afs/packages.h \
-       ${DESTDIR}${includedir}/afs/afsutil.h \
-       ${DESTDIR}${includedir}/afs/pthread_glock.h \
-       ${DESTDIR}${includedir}/afs/afs_atomlist.h \
-       ${DESTDIR}${includedir}/afs/afs_lhash.h \
-       ${DESTDIR}${includedir}/potpourri.h \
-       ${DESTDIR}${libdir}/afs/util.a \
-       ${DESTDIR}${libdir}/afs/libafsutil.a \
-       ${DESTDIR}${bindir}/sys
+depinstall: ${includes}
 
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/remote.h: ${srcdir}/remote.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/packages.h: ${srcdir}/packages.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/softsig.h: ${srcdir}/softsig.h
+       ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/work_queue.h: ${srcdir}/work_queue.h
+       ${INSTALL_DATA} $? $@
 
-${TOP_LIBDIR}/util.a: util.a
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/work_queue_types.h: ${srcdir}/work_queue_types.h
+       ${INSTALL_DATA} $? $@
 
-${TOP_LIBDIR}/libafsutil.a: util.a
-       ${INSTALL} $? $@
+${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} $? $@
 
-${DESTDIR}${includedir}/afs/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/tabular_output.h: ${srcdir}/tabular_output.h
+       ${INSTALL_DATA} $? $@
 
-${DESTDIR}${includedir}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/assert.h: ${srcdir}/assert.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/remote.h: ${srcdir}/remote.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ktime.h: ${srcdir}/ktime.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/packages.h: ${srcdir}/packages.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/potpourri.h: ${srcdir}/potpourri.h
-       ${INSTALL} $? $@
-
-
-${DESTDIR}${libdir}/afs/util.a: util.a
-       ${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libafsutil.a: util.a
-       ${INSTALL} $? $@
-
-
-${DESTDIR}${bindir}/sys: sys
-       ${INSTALL} $? $@
-
-
-${DEST}/include/afs/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/assert.h: ${srcdir}/assert.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/remote.h: ${srcdir}/remote.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/ktime.h: ${srcdir}/ktime.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/opr/queue.h: ${srcdir}/queue.h
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/util.a: util.a
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/packages.h: ${srcdir}/packages.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsutil.a: util.a
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsutil_pic.a: util_pic.a
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
+# 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"@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)
+       rm -f dirpath.h.tmp
 
-${DEST}/include/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
+util.a: ${objects} AFS_component_version_number.o
+       $(RM) -f util.a
+       $(AR) crv util.a ${objects} AFS_component_version_number.o
+       $(RANLIB) util.a
 
-${DEST}/include/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
+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
 
-${DEST}/include/potpourri.h: ${srcdir}/potpourri.h
-       ${INSTALL} $? $@
+pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
+       ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 
+${objects}: ${includes}
 
-${DEST}/lib/afs/util.a: util.a
-       ${INSTALL} $? $@
+AFS_component_version_number_pic.o: AFS_component_version_number.c
+       $(SHD_CCRULE) AFS_component_version_number.c
 
-${DEST}/lib/afs/libafsutil.a: util.a
-       ${INSTALL} $? $@
+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 
 
+sys.o: sys.c AFS_component_version_number.c ${includes}
 
-${DEST}/bin/sys: sys
-       ${INSTALL} $? $@
+sys: sys.o 
+       $(AFS_LDRULE) sys.o
 
+# PIC objects build rules
+assert_pic.o: ${srcdir}/assert.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/assert.c
 
-kinstall: ${KDIR}/vice.h \
-       ${KDIR}/afs_base64.c \
-       ${KDIR}/afs_uuid.c \
-       ${KDIR}/afs_atomlist.c \
-       ${KDIR}/afs_atomlist.h \
-       ${KDIR}/afs_lhash.c \
-       ${KDIR}/afs_lhash.h
+base64_pic.o: ${srcdir}/base64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/base64.c
 
-${KDIR}/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
+casestrcpy_pic.o: ${srcdir}/casestrcpy.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/casestrcpy.c
 
-${KDIR}/afs_base64.c: ${srcdir}/base64.c
-       ${INSTALL} $? $@
+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
 
-${KDIR}/afs_uuid.c: ${srcdir}/uuid.c
-       ${INSTALL} $? $@
+ktime_pic.o: ${srcdir}/ktime.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/ktime.c
 
-${KDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
-       ${INSTALL} $? $@
+volparse_pic.o: ${srcdir}/volparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/volparse.c
 
-${KDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
+hostparse_pic.o: ${srcdir}/hostparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/hostparse.c
 
-${KDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
-       ${INSTALL} $? $@
+exec_pic.o: ${srcdir}/exec.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/exec.c
 
-${KDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
+hputil_pic.o: ${srcdir}/hputil.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/hputil.c
 
-ukinstall: \
-       ${UKDIR}/afs_uuid.c \
-       ${UKDIR}/afs_atomlist.c \
-       ${UKDIR}/afs_atomlist.h \
-       ${UKDIR}/afs_lhash.c \
-       ${UKDIR}/afs_lhash.h \
-       ${UKDIR}/pthread_glock.h \
-       ${UKDIR}/vice.h \
-       ${UKDIR}/errors.h \
-       ${UKDIR}/afsutil.h \
-       ${UKDIR}/dirpath.h \
-       ${UKDIR}/dirpath.c \
-       ${UKDIR}/fileutil.h \
-       ${UKDIR}/fileutil.c \
-       ${UKDIR}/netutils.h \
-       ${UKDIR}/netutils.c \
-       ${UKDIR}/casestrcpy.c \
-       ${UKDIR}/hostparse.c 
+kreltime_pic.o: ${srcdir}/kreltime.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/kreltime.c
 
-${UKDIR}/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
+isathing_pic.o: ${srcdir}/isathing.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/isathing.c
 
-${UKDIR}/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
+get_krbrlm_pic.o: ${srcdir}/get_krbrlm.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/get_krbrlm.c
 
-${UKDIR}/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
+uuid_pic.o: ${srcdir}/uuid.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/uuid.c
 
-${UKDIR}/dirpath.c: ${srcdir}/dirpath.c
-       ${INSTALL} $? $@
+serverLog_pic.o: ${srcdir}/serverLog.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/serverLog.c
 
-${UKDIR}/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
+dirpath_pic.o: ${srcdir}/dirpath.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/dirpath.c
 
-${UKDIR}/fileutil.c: ${srcdir}/fileutil.c
-       ${INSTALL} $? $@
+fileutil_pic.o: ${srcdir}/fileutil.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fileutil.c
 
-${UKDIR}/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
+netutils_pic.o: ${srcdir}/netutils.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/netutils.c
 
-${UKDIR}/netutils.c: ${srcdir}/netutils.c
-       ${INSTALL} $? $@
+flipbase64_pic.o: ${srcdir}/flipbase64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/flipbase64.c
 
-${UKDIR}/casestrcpy.c: ${srcdir}/casestrcpy.c
-       ${INSTALL} $? $@
+fstab_pic.o: ${srcdir}/fstab.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fstab.c
 
-${UKDIR}/hostparse.c: ${srcdir}/hostparse.c
-       ${INSTALL} $? $@
+afs_atomlist_pic.o: ${srcdir}/afs_atomlist.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_atomlist.c
 
-${UKDIR}/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
+afs_lhash_pic.o: ${srcdir}/afs_lhash.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_lhash.c
 
-${UKDIR}/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
+snprintf_pic.o: ${srcdir}/snprintf.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/snprintf.c
 
-${UKDIR}/afs_uuid.c: ${srcdir}/uuid.c
-       ${INSTALL} $? $@
+pthread_glock_pic.o: ${srcdir}/pthread_glock.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/pthread_glock.c
 
-${UKDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
-       ${INSTALL} $? $@
+tabular_output_pic.o: ${srcdir}/tabular_output.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/tabular_output.c
 
-${UKDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
+regex_pic.o: ${srcdir}/regex.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/regex.c
 
-${UKDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
-       ${INSTALL} $? $@
+#
+# Install targets
+#
+KDIR=../libafs/afs
+UKDIR=../libuafs/afs
 
-${UKDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
+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}/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}/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 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}/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}/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
 
 #
 # Misc targets
@@ -449,30 +357,16 @@ ${UKDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
 
 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)
 
 include ../config/Makefile.version
 
-dest: \
-       ${DEST}/include/afs/dirpath.h \
-       ${DEST}/include/afs/pthread_nosigs.h \
-       ${DEST}/include/afs/assert.h \
-       ${DEST}/include/afs/errors.h \
-       ${DEST}/include/afs/vice.h \
-       ${DEST}/include/afs/remote.h \
-       ${DEST}/include/afs/ktime.h \
-       ${DEST}/include/afs/fileutil.h \
-       ${DEST}/include/afs/netutils.h \
-       ${DEST}/include/afs/packages.h \
-       ${DEST}/include/afs/afsutil.h \
-       ${DEST}/include/afs/pthread_glock.h \
-       ${DEST}/include/afs/afs_atomlist.h \
-       ${DEST}/include/afs/afs_lhash.h \
-       ${DEST}/include/potpourri.h \
-       ${DEST}/lib/afs/util.a \
-       ${DEST}/lib/afs/libafsutil.a \
-       ${DEST}/bin/sys
-
+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 \
+           dirpath.c fileutil.c netutils.c flipbase64.c \
+           afs_atomlist.c afs_lhash.c snprintf.c fstab.c