STABLE12-eliminate-bogus-rebuilding-20030701

FIXES 1651

so makefiles have proper dependancies

(cherry picked from commit 010af620459e2af0841810f1b232eccd7bc4ccb1)

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index d0c1d48549ee753e06a533742b6e8091d3d320af..9724f1cc69c5d9e35bfeb690a8490a196f12b16a 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -36,14 +36,18 @@ all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${
                        ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
        esac
 
-# NOTE: linux case uses --new as well to work around bug in some versions of
-# gencat.
-kinstall: ${KERNELDIR}/afs AFS_component_version_number.c
+kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afs_trace.h afszcm.cat
        -chmod 666 ${KERNELDIR}/afs/*
-       ${COMPILE_ET} -v 2 afs_trace.et
        ${INSTALL} *.[csh] ${KERNELDIR}/afs
        ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}/afs
        ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
+
+afs_trace.h: afs_trace.et
+       ${COMPILE_ET} -v 2 afs_trace.et
+
+# NOTE: linux case uses --new as well to work around bug in some versions of
+# gencat.
+afszcm.cat: afs_trace.msf
        -$(RM) -f afszcm.cat
        case ${SYS_NAME} in \
                sgi_* ) \
@@ -61,9 +65,8 @@ kinstall: ${KERNELDIR}/afs AFS_component_version_number.c
 ${KERNELDIR}/afs:
        mkdir -p $@
 
-ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c
+ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c afs_trace.h
        -chmod 666 ${UKERNELDIR}/afs/*
-       ${COMPILE_ET} -v 2 afs_trace.et
        ${INSTALL} *.[csh] ${UKERNELDIR}/afs
        ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}/afs
        ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}/afs

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 931acd340d04f45d4dc2be0a506012508619d0ee..7924e1494b6559f8ad7f4a2b9afdd0142a4d9201 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -70,7 +70,11 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o
 
 all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server
 
-budb_errs.o: budb_errs.c
+#
+# budb_errs.o actually depends on neither budb_client.h nor budb_errs.h
+# but generating either of them will rebuild budb_errs.c
+#
+budb_errs.o: budb_errs.c budb_client.h budb_errs.h
 
 budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
        $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client