util: Cleanup generation of dirpath.h
[openafs.git] / src / util / Makefile.in
index 80cb98c..80ae691 100644 (file)
@@ -9,19 +9,41 @@ 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 config_file.o ktime.o volparse.o \
         hostparse.o exec.o \
-        hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.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 \
+       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 \
+       pthread_glock_pic.o \
+       tabular_output_pic.o \
+       pthread_threadname_pic.o \
+       ${REGEX_OBJ_PIC}
 
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
@@ -29,11 +51,9 @@ includes = \
        ${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 \
@@ -44,11 +64,13 @@ includes = \
        ${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}/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
@@ -71,9 +93,6 @@ ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
 ${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
        ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/remote.h: ${srcdir}/remote.h
-       ${INSTALL_DATA} $? $@
-
 ${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
        ${INSTALL_DATA} $? $@
 
@@ -83,9 +102,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} $? $@
 
@@ -114,20 +130,30 @@ ${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 \
+       sed \
                -e 's"@afsconfdir"${afsconfdir}"' \
                -e 's"@viceetcdir"${viceetcdir}"' \
                -e 's"@afssrvbindir"${afssrvbindir}"' \
@@ -139,21 +165,29 @@ 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
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
+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
+
 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
+       $(SHD_CCRULE) AFS_component_version_number.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 
 
@@ -162,13 +196,86 @@ sys.o: sys.c AFS_component_version_number.c ${includes}
 sys: sys.o 
        $(AFS_LDRULE) sys.o
 
+# PIC objects build rules
+assert_pic.o: ${srcdir}/assert.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/assert.c
+
+base64_pic.o: ${srcdir}/base64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/base64.c
+
+casestrcpy_pic.o: ${srcdir}/casestrcpy.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/casestrcpy.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
+
+ktime_pic.o: ${srcdir}/ktime.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/ktime.c
+
+volparse_pic.o: ${srcdir}/volparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/volparse.c
+
+hostparse_pic.o: ${srcdir}/hostparse.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/hostparse.c
+
+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
+
+serverLog_pic.o: ${srcdir}/serverLog.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/serverLog.c
+
+dirpath_pic.o: ${srcdir}/dirpath.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/dirpath.c
+
+fileutil_pic.o: ${srcdir}/fileutil.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fileutil.c
+
+netutils_pic.o: ${srcdir}/netutils.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/netutils.c
+
+flipbase64_pic.o: ${srcdir}/flipbase64.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/flipbase64.c
+
+fstab_pic.o: ${srcdir}/fstab.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/fstab.c
+
+afs_atomlist_pic.o: ${srcdir}/afs_atomlist.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_atomlist.c
+
+afs_lhash_pic.o: ${srcdir}/afs_lhash.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/afs_lhash.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
+
+regex_pic.o: ${srcdir}/regex.c ${includes}
+       $(SHD_CCRULE) ${srcdir}/regex.c
+
 #
 # Install targets
 #
 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}
@@ -177,11 +284,9 @@ install: dirpath.h util.a sys
        ${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
@@ -195,9 +300,10 @@ install: dirpath.h util.a sys
        ${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
@@ -206,11 +312,9 @@ dest: dirpath.h util.a sys
        ${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
@@ -224,6 +328,7 @@ dest: dirpath.h util.a sys
        ${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
 
 #
@@ -232,7 +337,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)
@@ -242,6 +347,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
+           afs_atomlist.c afs_lhash.c fstab.c