util: Cleanup generation of dirpath.h

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

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 660f489..80ae691 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -9,10 +9,6 @@ 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@
 
 
@@ -20,8 +16,8 @@ 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 pthread_glock.o \
-        tabular_output.o ${REGEX_OBJ}
+        afs_atomlist.o afs_lhash.o pthread_glock.o tabular_output.o \
+        pthread_threadname.o ${REGEX_OBJ}
 
 objects_pic = \
        assert_pic.o \
@@ -44,9 +40,9 @@ objects_pic = \
        fstab_pic.o \
        afs_atomlist_pic.o \
        afs_lhash_pic.o \
-       snprintf_pic.o \
        pthread_glock_pic.o \
        tabular_output_pic.o \
+       pthread_threadname_pic.o \
        ${REGEX_OBJ_PIC}
 
 includes = \
@@ -157,7 +153,7 @@ ${TOP_LIBDIR}/libafsutil_pic.a: util_pic.a
 # Use " as the sed boundary character because we lose anyway if that occurs
 # in path names.
 dirpath.h: ${srcdir}/dirpath.hin Makefile
-       ( sed \
+       sed \
                -e 's"@afsconfdir"${afsconfdir}"' \
                -e 's"@viceetcdir"${viceetcdir}"' \
                -e 's"@afssrvbindir"${afssrvbindir}"' \
@@ -169,10 +165,7 @@ dirpath.h: ${srcdir}/dirpath.hin Makefile
                -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
+               ${srcdir}/dirpath.hin >dirpath.h
 
 util.a: ${objects} AFS_component_version_number.o
        $(RM) -f util.a
@@ -187,6 +180,9 @@ util_pic.a: ${objects_pic} AFS_component_version_number_pic.o
 pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
        ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 
+pthread_threadname.o: ${srcdir}/pthread_threadname.c ${includes}
+       ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_threadname.c
+
 ${objects}: ${includes}
 
 AFS_component_version_number_pic.o: AFS_component_version_number.c
@@ -261,12 +257,12 @@ afs_atomlist_pic.o: ${srcdir}/afs_atomlist.c ${includes}
 afs_lhash_pic.o: ${srcdir}/afs_lhash.c ${includes}
        $(SHD_CCRULE) ${srcdir}/afs_lhash.c
 
-snprintf_pic.o: ${srcdir}/snprintf.c ${includes}
-       $(SHD_CCRULE) ${srcdir}/snprintf.c
-
 pthread_glock_pic.o: ${srcdir}/pthread_glock.c ${includes}
        $(SHD_CCRULE) ${srcdir}/pthread_glock.c
 
+pthread_threadname_pic.o: ${srcdir}/pthread_threadname.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/pthread_threadname.c
+
 tabular_output_pic.o: ${srcdir}/tabular_output.c ${includes}
        $(SHD_CCRULE) ${srcdir}/tabular_output.c
 
@@ -353,4 +349,4 @@ check-splint:
            assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.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
+           afs_atomlist.c afs_lhash.c fstab.c