util: Convert to using libtool
[openafs.git] / src / util / Makefile.in
index 705dd8b..bab7184 100644 (file)
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
+include @TOP_OBJDIR@/src/config/Makefile.lwp
 
-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}
+HELPER_SPLINT=@HELPER_SPLINT@
+
+LT_objs =base64.lo ktime.lo volparse.lo hostparse.lo exec.lo \
+        hputil.lo kreltime.lo uuid.lo serverLog.lo \
+        dirpath.lo fileutil.lo flipbase64.lo fstab.lo \
+        afs_atomlist.lo afs_lhash.lo pthread_glock.lo tabular_output.lo \
+        pthread_threadname.lo softsig.lo ${REGEX_OBJ}
+
+LT_deps = $(top_builddir)/src/opr/liboafs_opr.la
+LT_libs = $(LIB_roken) $(MT_LIBS)
 
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
-       ${TOP_INCDIR}/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
 
 all: ${includes} \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libafsutil.a \
-       sys
-
-depinstall: ${includes}
-
-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 ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/assert.c
-
-casestrcpy.o: ${srcdir}/casestrcpy.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/casestrcpy.c
-
-hputil.o: ${srcdir}/hputil.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/hputil.c
-
-flipbase64.o: ${srcdir}/flipbase64.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/flipbase64.c
-
-volparse.o: ${srcdir}/volparse.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/volparse.c
-
-snprintf.o: ${srcdir}/snprintf.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/snprintf.c
-
-base64.o: ${srcdir}/base64.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/base64.c
-
-hostparse.o: ${srcdir}/hostparse.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/hostparse.c
-
-ktime.o: ${srcdir}/ktime.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/ktime.c
-
-kreltime.o: ${srcdir}/kreltime.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/kreltime.c
-
-get_krbrlm.o: ${srcdir}/get_krbrlm.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
-
-uuid.o: ${srcdir}/uuid.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/uuid.c
-
-sys.o: ${srcdir}/sys.c AFS_component_version_number.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/sys.c
-
-sys: sys.o 
-       ${CC} ${LDFLAGS} -o sys sys.o
-
-isathing.o: ${srcdir}/isathing.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/isathing.c
-
-serverLog.o: ${srcdir}/serverLog.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/serverLog.c
+       ${TOP_LIBDIR}/libafsutil_pic.a \
+       sys \
+       liboafs_util.la
 
-dirpath.o: ${srcdir}/dirpath.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/dirpath.c
+util.a: $(LT_objs)
+       $(LT_LDLIB_lwp) $(LT_objs)
 
-fileutil.o: ${srcdir}/fileutil.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/fileutil.c
+libafsutil_pic.la: $(LT_objs)
+       $(LT_LDLIB_pic) $(LT_objs)
 
-netutils.o: ${srcdir}/netutils.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/netutils.c
+liboafs_util.la: liboafs_util.la.sym $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
-afs_atomlist.o: ${srcdir}/afs_atomlist.c ${includes}
-       ${CC} ${CFLAGS} -c ${srcdir}/afs_atomlist.c
+buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h
+buildtools_clean: clean
 
-afs_lhash.o: ${srcdir}/afs_lhash.c ${includes}
-       ${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/afsutil_prototypes.h \
-       ${DESTDIR}${includedir}/afs/pthread_glock.h \
-       ${DESTDIR}${includedir}/afs/afs_atomlist.h \
-       ${DESTDIR}${includedir}/afs/afs_lhash.h \
-       ${DESTDIR}${includedir}/afs/softsig.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} $? $@
-
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
+       ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
-
-${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} $? $@
-
-${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
-
-${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} $? $@
+       ${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}/afs/softsig.h: ${srcdir}/softsig.h
-       ${INSTALL} $? $@
-
-${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
-       ${INSTALL} $? $@
-
+       ${INSTALL_DATA} $? $@
 
-${TOP_LIBDIR}/util.a: util.a
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsutil.a: util.a
-       ${INSTALL} $? $@
+${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} $? $@
 
-${DESTDIR}${includedir}/afs/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/thread_pool.h: ${srcdir}/thread_pool.h
+       ${INSTALL_DATA} $? $@
 
-${DESTDIR}${includedir}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/thread_pool_types.h: ${srcdir}/thread_pool_types.h
+       ${INSTALL_DATA} $? $@
 
-${DESTDIR}${includedir}/afs/assert.h: ${srcdir}/assert.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/afs/tabular_output.h: ${srcdir}/tabular_output.h
+       ${INSTALL_DATA} $? $@
 
-${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/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.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}/afs/softsig.h: ${srcdir}/softsig.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} $? $@
-
-${DEST}/include/afs/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/packages.h: ${srcdir}/packages.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
-
-${DEST}/include/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
-       ${INSTALL} $? $@
+${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/util.a: util.a
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsutil.a: util.a
+       ${INSTALL_DATA} $? $@
 
-${DEST}/include/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsutil_pic.a: libafsutil_pic.la
+       ${INSTALL_DATA} .libs/libafsutil_pic.a $@
 
-${DEST}/include/afs/softsig.h: ${srcdir}/softsig.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
 
-${DEST}/include/potpourri.h: ${srcdir}/potpourri.h
-       ${INSTALL} $? $@
 
+$(LT_objs): ${includes}
 
-${DEST}/lib/afs/util.a: util.a
-       ${INSTALL} $? $@
+sys.o: sys.c AFS_component_version_number.c ${includes}
 
-${DEST}/lib/afs/libafsutil.a: util.a
-       ${INSTALL} $? $@
+sys: sys.o 
+       $(AFS_LDRULE) sys.o
 
+#
+# Install targets
+#
+KDIR=../libafs/afs
+UKDIR=../libuafs/afs
 
-${DEST}/bin/sys: sys
-       ${INSTALL} $? $@
+install: dirpath.h util.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}/errors.h ${DESTDIR}${includedir}/afs/errors.h
+       ${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
+       ${INSTALL_DATA} ${srcdir}/ktime.h ${DESTDIR}${includedir}/afs/ktime.h
+       ${INSTALL_DATA} ${srcdir}/fileutil.h ${DESTDIR}${includedir}/afs/fileutil.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_PROGRAM} sys ${DESTDIR}${bindir}/sys
+
+dest: dirpath.h util.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}/errors.h ${DEST}/include/afs/errors.h
+       ${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
+       ${INSTALL_DATA} ${srcdir}/ktime.h ${DEST}/include/afs/ktime.h
+       ${INSTALL_DATA} ${srcdir}/fileutil.h ${DEST}/include/afs/fileutil.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_PROGRAM} sys ${DEST}/bin/sys
 
 #
 # Misc targets
 #
 
 clean:
-       $(RM) -f ${objects} sys dirpath.h
+       $(LT_CLEAN)
+       $(RM) -f sys dirpath.h
        $(RM) -f util.a *.o core AFS_component_version_number.c
 
 test:
@@ -347,31 +219,9 @@ test:
 
 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/afsutil_prototypes.h \
-       ${DEST}/include/afs/pthread_glock.h \
-       ${DEST}/include/afs/afs_atomlist.h \
-       ${DEST}/include/afs/afs_lhash.h \
-       ${DEST}/include/afs/softsig.h \
-       ${DEST}/include/potpourri.h \
-       ${DEST}/lib/afs/util.a \
-       ${DEST}/lib/afs/libafsutil.a \
-       ${DEST}/bin/sys
-
-splint:
-       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
+check-splint:
+       sh $(HELPER_SPLINT) $(CFLAGS) \
+           base64.c ktime.c volparse.c hostparse.c \
+           hputil.c kreltime.c uuid.c serverLog.c \
+           dirpath.c fileutil.c flipbase64.c \
+           afs_atomlist.c afs_lhash.c fstab.c