STABLE12-kdump-build-cleanup-20030701

FIXES 1654

don't rebuild kdump on each build

(cherry picked from commit a75f0516f52d967a1ffa0088fddaff88fe3f40bb)

diff --git a/acinclude.m4 b/acinclude.m4
index d4c37093e56827f79ca0e2bd84c0738b750003f2..b698747b40882d1205feeaf76d79def3859fb32d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -499,6 +499,21 @@ else
         AC_MSG_RESULT($AFS_SYSNAME)
 fi
 
+# KDUMP64 defaults to KDUMP for systems without a separate kdump64
+KDUMP64='${KDUMP}'
+KDUMP=kdump
+case $AFS_SYSNAME in
+       sgi_6?)
+               KDUMP=kdump.IP20;;
+       sun4x_5[789] | hp_ux11*)
+               KDUMP=kdump32
+               KDUMP64=kdump64;;
+       *linux*)
+               KDUMP='kdump-${LINUX_VERSION}';;
+esac
+AC_SUBST(KDUMP)
+AC_SUBST(KDUMP64)
+
 case $AFS_SYSNAME in
        *_darwin*)
                DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 16bdb7007007bcd70a5e23ee5ca6a58f2b18d582..b5dabe13d4e633eff44d0ac6652c39e86c80adf1 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -69,7 +69,14 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \
 
 LIBS = ${FSLIBS} 
 
-all: fs up fstrace cmdebug livesys kdump kdump64
+#
+# In order not to rebuild kdump* again and again we use
+# AFS_SYSNAME dependent targets (generated by configure)
+#
+KDUMP=@KDUMP@
+KDUMP64=@KDUMP64@
+
+all: fs up fstrace cmdebug livesys ${KDUMP} ${KDUMP64}
 
 #
 # Build targets
@@ -94,11 +101,11 @@ ${DEST}/etc/fstrace: fstrace
 ${DEST}/bin/cmdebug: cmdebug
        ${INSTALL} -s $? $@
 
-${DEST}/etc/kdump: kdump
+${DEST}/etc/${KDUMP}: ${KDUMP}
        -set -x; \
        case ${SYS_NAME} in \
        sgi_6? ) \
-               ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \
+               ${INSTALLex} -f kdump.sh.sgi_ipnos ${DEST}/etc/kdump; \
                ln -fs kdump ${DEST}/etc/kdump32; \
                ln -fs kdump.IP20 ${DEST}/etc/kdump.IP22; \
                ln -fs kdump.IP20 ${DEST}/etc/kdump.IP32; \
@@ -106,14 +113,14 @@ ${DEST}/etc/kdump: kdump
                        do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \
                done ;; \
        sun*_5[789] ) \
-               ${INSTALLex} -f kdump.sh.solaris7 $@; \
-               ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \
+               ${INSTALLex} -f kdump.sh.solaris7 ${DEST}/etc/kdump; \
+               ${INSTALL} -s -f $? $@ ;; \
        *linux* ) \
-               ${INSTALLex} -f kdump.sh.linux $@; \
-               ${INSTALL} -s kdump-${LINUX_VERSION} ${DEST}/etc/kdump-${LINUX_VERSION} ;; \
+               ${INSTALLex} -f kdump.sh.linux ${DEST}/etc/kdump; \
+               ${INSTALL} -s $? $@ ;; \
        hp_ux11* ) \
-               ${INSTALLex} -f kdump.sh.hp_ux11 $@; \
-               ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \
+               ${INSTALLex} -f kdump.sh.hp_ux11 ${DEST}/etc/kdump; \
+               ${INSTALL} -s -f $? $@;; \
        ia64_hpux11* ) \
                echo skipping kdump for ${SYS_NAME} ;; \
        *) \
@@ -185,7 +192,7 @@ cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
 cmdebug: cmdebug.o ${CMLIBS}
        $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS}
 
-kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
+${KDUMP}.o: kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
                alpha_linux* ) \
@@ -229,7 +236,7 @@ kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
                ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
        esac
 
-kdump:  kdump.o
+${KDUMP}:  ${KDUMP}.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \
@@ -282,8 +289,8 @@ install: \
        ${DESTDIR}${bindir}/up \
        ${DESTDIR}${sbindir}/fstrace \
        ${DESTDIR}${bindir}/cmdebug \
-       ${DESTDIR}${sbindir}/kdump \
-       ${DESTDIR}${sbindir}/kdump64
+       ${DESTDIR}${sbindir}/${KDUMP} \
+       ${DESTDIR}${sbindir}/${KDUMP64}
 
 #
 # Misc targets
@@ -315,11 +322,11 @@ ${DESTDIR}${sbindir}/fstrace: fstrace
 ${DESTDIR}${bindir}/cmdebug: cmdebug
        ${INSTALL} -s $? $@
 
-${DESTDIR}${sbindir}/kdump: kdump
+${DESTDIR}${sbindir}/${KDUMP}: ${KDUMP}
        -set -x; \
        case ${SYS_NAME} in \
        sgi_6? ) \
-               ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \
+               ${INSTALLex} -f kdump.sh.sgi_ipnos ${DESTDIR}${sbindir}/kdump; \
                ln -fs kdump ${DESTDIR}${sbindir}/kdump32; \
                ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP22; \
                ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP32; \
@@ -327,13 +334,14 @@ ${DESTDIR}${sbindir}/kdump: kdump
                        do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
                done ;; \
        sun*_5[789] ) \
-               ${INSTALLex} -f kdump.sh.solaris7 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \
+               ${INSTALLex} -f kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump32; \
+               ${INSTALL} -s -f $? $@;; \
        *linux* ) \
-               ${INSTALL} -s kdump-${LINUX_VERSION} ${DESTDIR}${sbindir}/kdump-${LINUX_VERSION} ;; \
+               ${INSTALLex} -f kdump.sh.linux ${DESTDIR}${sbindir}/kdump; \
+               ${INSTALL} -s @? $@ ;; \
        hp_ux11* ) \
-               ${INSTALLex} -f kdump.sh.hp_ux11 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \
+               ${INSTALLex} -f kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
+               ${INSTALL} -s -f $? $@;; \
        *) \
                ${INSTALL} -s $? $@ ;; \
        esac
@@ -354,6 +362,6 @@ dest: \
        ${DEST}/bin/up \
        ${DEST}/etc/fstrace \
        ${DEST}/bin/cmdebug \
-       ${DEST}/etc/kdump \
-       ${DEST}/etc/kdump64
+       ${DEST}/etc/${KDUMP} \
+       ${DEST}/etc/${KDUMP64}