Build fixes: prevent unnecessary rebuilding

Fixes to a few Makefiles to prevent needless rebuilding when using make
after a successful build.

Rework dependencies in src/bubasics to prevent needless rebuilding and
fix some remaining parallel build issues.  Multiple targets really
have to be avoided.

Remove dependency on the include/afs directory from the src/config Makefile.
Depending on a directory means that we will rebuild the target if the
timestamp changes, for instance if other files or sub-directories are
installed.  This caused param.h to get re-installed in some cases and
the kernel module source files to be recompiled.  This directory is
created in the top-level Makefile anyway so we shouldn't need an
explicit dependency.

Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/171
Tested-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>

diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
index 21c683e..ab0444f 100644 (file)
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@@ -12,7 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/butx.h
+all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/butx.h \
+               ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/butm.h
 
 OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o
 
@@ -74,19 +75,21 @@ bumon.xdr.c: bumon.h
 bumon.ss.c: bumon.h
 bumon.cs.c: bumon.h
 
-butc_errs.c: ${TOP_INCDIR}/afs/tcdata.h
+butm.h: butm_errs.c
 
-butm_errs.c: ${TOP_INCDIR}/afs/butm.h
-
-butm_errs.c butm.h: butm_errs.et butm.p.h
+butm_errs.c: butm_errs.et butm.p.h
        $(RM) -f butm.h butm_errs.c
        ${COMPILE_ET} -p ${srcdir} butm_errs -h butm
 
-butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
+tcdata.h: butc_errs.c
+
+butc_errs.c: butc_errs.et tcdata.p.h butm.h
        $(RM) -f tcdata.h butc_errs.c
        ${COMPILE_ET} -p ${srcdir} butc_errs -h tcdata
 
-butx_errs.c butx.h: butx_errs.et
+butx.h: butx_errs.c
+
+butx_errs.c: butx_errs.et
        $(RM) -f butx.h butx_errs.c
        ${COMPILE_ET} -p ${srcdir} butx_errs -h butx
 

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index 0fcf9e0..fdc17d7 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -58,14 +58,8 @@ config.o: ${srcdir}/config.c AFS_component_version_number.c
 # Include installation targets
 #
 
-${TOP_INCDIR}/afs: ${TOP_INCDIR}
-       mkdir -p $@
-
-${TOP_INCDIR}:
-       mkdir -p $@
-
 # XXX inlined INST
-${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: ${TOP_INCDIR}/afs ${srcdir}/param.${SYS_NAME}.h ${AFS_PARAM_COMMON}
+${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: ${srcdir}/param.${SYS_NAME}.h ${AFS_PARAM_COMMON}
        if [ "X${AFS_PARAM_COMMON}" != "X" ] ; then \
                cat ${srcdir}/${AFS_PARAM_COMMON} ${srcdir}/param.${SYS_NAME}.h > param.h.new ; \
                $(RM) -f $@; \