tbutc-make-tsm-a-configure-option-20011009

not tsm support can be configure'd on

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

gmake wasn't part of the deal

diff --git a/acinclude.m4 b/acinclude.m4
index 783173a..f95f431 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -44,6 +44,9 @@ AC_ARG_ENABLE(redhat-buildsys,
 AC_ARG_ENABLE(transarc-paths,
 [  --enable-transarc-paths                     Use Transarc style paths like /usr/afs and /usr/vice],, enable_transarc_paths="no"
 )
+AC_ARG_ENABLE(tivoli-tsm,
+[  --enable-tivoli-tsm                 Enable use of the Tivoli TSM API libraries for butc support],, enable_tivoli_tsm="no"
+)
 
 AC_PROG_CC
 
@@ -383,6 +386,27 @@ if test "$enable_afsdb" = "yes"; then
        AC_DEFINE(AFS_AFSDB_ENV)
 fi
 
+dnl check for tivoli
+AC_MSG_CHECKING(for tivoli tsm butc support)
+XBSA_CFLAGS=""
+if test "$enable_tivoli_tsm" = "yes"; then
+       XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
+       XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
+
+       if test -e "$XBSADIR1/xbsa.h"; then
+               XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+               AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+       elif test -e "$XBSADIR2/xbsa.h"; then
+               XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+               AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+       else
+               AC_MSG_RESULT([no, missing xbsa.h header file])
+       fi
+else
+       AC_MSG_RESULT([no])
+fi
+AC_SUBST(XBSA_CFLAGS)
+
 dnl checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT

diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in
index 7974771..7ad11f2 100644 (file)
--- a/src/config/Makefile.rs_aix42.in
+++ b/src/config/Makefile.rs_aix42.in
@@ -35,7 +35,3 @@ MV=mv
 RANLIB=ranlib
 RM=rm
 INSTALL=${TOP_SRCDIR}/pinstall/pinstall
-#
-# This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
-XBSA_FLAGS=-Dxbsa
-XBSADIR=/usr/tivoli/tsm/client/api/bin/xopen

diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in
index add1788..8055c01 100644 (file)
--- a/src/config/Makefile.sun4x_56.in
+++ b/src/config/Makefile.sun4x_56.in
@@ -49,7 +49,3 @@ INSTALL=${TOP_SRCDIR}/pinstall/pinstall
 FS_CONV_SOL26         = fs_conv_sol26
 install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26
 dest_FS_CONV_SOL26    = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26
-#
-# This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
-XBSA_FLAGS=-Dxbsa
-XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen

diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in
index 3f5e0c0..5b8a3ea 100644 (file)
--- a/src/config/Makefile.sun4x_57.in
+++ b/src/config/Makefile.sun4x_57.in
@@ -53,7 +53,3 @@ INSTALL=${TOP_SRCDIR}/pinstall/pinstall
 FS_CONV_SOL26         = fs_conv_sol26
 install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26
 dest_FS_CONV_SOL26    = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26
-#
-# This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
-XBSA_FLAGS=-Dxbsa
-XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen

diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in
index 945a142..e1fb130 100644 (file)
--- a/src/config/Makefile.sun4x_58.in
+++ b/src/config/Makefile.sun4x_58.in
@@ -46,7 +46,3 @@ INSTALL=${TOP_SRCDIR}/pinstall/pinstall
 FS_CONV_SOL26         = fs_conv_sol26
 install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26
 dest_FS_CONV_SOL26    = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26
-#
-# This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
-XBSA_FLAGS=-Dxbsa
-XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen

diff --git a/src/config/Makefile.sun4x_59.in b/src/config/Makefile.sun4x_59.in
index 945a142..e1fb130 100644 (file)
--- a/src/config/Makefile.sun4x_59.in
+++ b/src/config/Makefile.sun4x_59.in
@@ -46,7 +46,3 @@ INSTALL=${TOP_SRCDIR}/pinstall/pinstall
 FS_CONV_SOL26         = fs_conv_sol26
 install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26
 dest_FS_CONV_SOL26    = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26
-#
-# This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
-XBSA_FLAGS=-Dxbsa
-XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index d52a873..338ce9c 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -5,8 +5,6 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-# */
-
 DEST=@DEST@
 TOP_INCDIR=@TOP_INCDIR@
 TOP_LIBDIR=@TOP_LIBDIR@
@@ -30,49 +28,36 @@ SHELL    =/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CC      =${MT_CC}
-CFLAGS  = ${DBG} -w -I${TOP_SRCDIR}/config ${MT_CFLAGS}
+BUTMOBJS    =file_tm.o
+BUTMLIBS    =libbutm.a
+BUTMINCLS   =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
+BUTMINCLUDE =-I${TOP_INCDIR}
+
+CC      = ${MT_CC}
+CFLAGS  = ${DBG} -w -I${TOP_SRCDIR}/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE}
 
 LDFLAGS = ${DBG} ${XLDFLAGS}
 
-VICED   =../viced
-VLSERVER=../vlserver
 LWP     =../lwp
-LIBACL  =../libacl
-UTIL    =../util
-DIR     =../dir
-VOL     =../vol
-FSINT   =../fsint
 BUTM    =../butm
 BUTC    =../butc
 BUCOORD = ../bucoord
 VOLSER  = ../volser
 
-# ----------------------------------------------------------------
-# The default is to build butc without using the TSM API libraries. 
-# To build with TSM support, set XBSA_NOBUILD="". Be sure you have
-#  the TSM API version 3.7.1 installed.
-# ----------------------------------------------------------------
-XBSA_NOBUILD="true"
-
 BUCOORDOBJS=ubik_db_if.o ${BUCOORD}/volstub.o ${BUCOORD}/dlq.o \
            ${BUCOORD}/status.o ${BUCOORD}/bucoord_errs.o
 
 VOLSERLIBOBJ=${VOLSER}/volint.cs.o  vsprocs.o              ${VOLSER}/vsutils.o \
             ${VOLSER}/lockprocs.o  ${VOLSER}/volint.xdr.o ${VOLSER}/volerr.o \
             ${VOLSER}/volint.ss.o  AFS_component_version_number.o 
-VOLSERLIBS=libvolser.a
+VOLSERLIBS  =libvolser.a
 
-LWPOBJS    =lock.o
-
-BUTMOBJS   =file_tm.o
-BUTMLIBS   =libbutm.a
-BUTMINCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
-BUTMINCLUDE=-I${TOP_INCDIR}
+LWPOBJS     =lock.o
 
 BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
            tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \
             ${LWPOBJS} ${BUCOORDOBJS}
+
 BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
            ${TOP_INCDIR}/afs/volume.h \
            ${TOP_INCDIR}/afs/vlserver.h \
@@ -86,6 +71,7 @@ BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
            ${TOP_INCDIR}/afs/tcdata.h \
            ${TOP_INCDIR}/afs/bubasics.h \
            ${TOP_INCDIR}/afs/butm.h
+
 BUTCINCLUDE=-I. -I${TOP_INCDIR}
 BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libbubasics.a \
@@ -100,220 +86,84 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libprocmgmt.a \
            ${TOP_LIBDIR}/librx.a
 
-include ../config/Makefile.version
+#
+# Build targets
+#
+
+all: butc
+
+butc: ${BUTCOBJS} ${BUTCLIBS}
+       ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MTLIBS} ${XLIBS} -o butc
 
-#----------------------------------------------- BUTC
+libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
+       -$(RM) -f $@
+       $(AR) crv $@ vsprocs.o ${VOLSERLIBOBJ}
+       $(RANLIB) $@
 
-butc: pre ${BUTCOBJS} ${BUTCLIBS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCOBJS} ${BUTCLIBS} $$hdrdir ${MTLIBS} ${XLIBS} -o butc
+libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
+       -$(RM) -f libbutm.a
+       $(AR) crv libbutm.a $(BUTMOBJS) AFS_component_version_number.o
+       ${RANLIB} libbutm.a
 
 dbentries.o: ${BUTC}/dbentries.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dbentries.c
+       ${CC} ${CFLAGS} -c ${BUTC}/dbentries.c
 
 tcprocs.o: ${BUTC}/tcprocs.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcprocs.c
+       ${CC} ${CFLAGS} -c ${BUTC}/tcprocs.c
 
 lwps.o: ${BUTC}/lwps.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/lwps.c
+       ${CC} ${CFLAGS} -c ${BUTC}/lwps.c
 
 tcmain.o: ${BUTC}/tcmain.c ${BUTCINCLS} AFS_component_version_number.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcmain.c
+       ${CC} ${CFLAGS} -c ${BUTC}/tcmain.c
 
 list.o: ${BUTC}/list.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/list.c
+       ${CC} ${CFLAGS} -c ${BUTC}/list.c
 
 recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/recoverDb.c
+       ${CC} ${CFLAGS} -c ${BUTC}/recoverDb.c
 
 tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcudbprocs.c
+       ${CC} ${CFLAGS} -c ${BUTC}/tcudbprocs.c
 
 dump.o: ${BUTC}/dump.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dump.c
+       ${CC} ${CFLAGS} -c ${BUTC}/dump.c
 
 tcstatus.o: ${BUTC}/tcstatus.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcstatus.c
+       ${CC} ${CFLAGS} -c ${BUTC}/tcstatus.c
 
 butc_xbsa.o: ${BUTC}/butc_xbsa.c ${BUTC}/butc_xbsa.h ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/butc_xbsa.c
-
-#----------------------------------------------- BUCOORD
+       ${CC} ${CFLAGS} -c ${BUTC}/butc_xbsa.c
 
 ubik_db_if.o: ${BUCOORD}/ubik_db_if.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUCOORD}/ubik_db_if.c
-
-#----------------------------------------------- VOLSER
-# Build the libvolser.a library here. The file compiled
-# for is is vsprocs.c. The rest are from the VOLSER dir.
-
-libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
-       -$(RM) -f $@
-       $(AR) crv $@ vsprocs.o ${VOLSERLIBOBJ}
-       $(RANLIB) $@
+       ${CC} ${CFLAGS} -c ${BUCOORD}/ubik_db_if.c
 
 vsprocs.o: ${VOLSER}/vsprocs.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${VOLSER}/vsprocs.c
-
-#----------------------------------------------- LWP
+       ${CC} ${CFLAGS} -c ${VOLSER}/vsprocs.c
 
 lock.o: ${LWP}/lock.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${LWP}/lock.c
-
-#----------------------------------------------- BUTC
+       ${CC} ${CFLAGS} -c ${LWP}/lock.c
 
 file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTMINCLUDE} $$hdrdir -c ${BUTM}/file_tm.c
-
-libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
-       -$(RM) -f libbutm.a
-       $(AR) crv libbutm.a $(BUTMOBJS) AFS_component_version_number.o
-       ${RANLIB} libbutm.a
-
-#-----------------------------------------------
-clean:
-       $(RM) -f *.o *.a core AFS_component_version_number.c butc
-
-pre:
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then \
-               echo 'Will not build with XBSA'; \
-       else \
-               if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir="${XBSADIR}" ; \
-               else                               hdrdir="${XBSA_HDRDIR}" ; \
-               fi; \
-               if test "$$hdrdir" != "" -a ! -f "$$hdrdir/xbsa.h"; then \
-                       echo '*** This build of butc cannot support XBSA because'; \
-                       echo '*** the required header file "'$$hdrdir'/xbsa.h"'; \
-                       echo '*** does not exist. If you know the pathname to the'; \
-                       echo '*** header file, then use XBSA_HDRDIR="<path>" as a make'; \
-                       echo '*** argument.'; \
-                       echo '*** If you do not want to build an XBSA version of butc,'; \
-                       echo '*** then use XBSA_NOBUILD="true" as a make argument.'; \
-                       exit 2; \
-               else \
-                       echo 'Will use XBSA header files from "'$$hdrdir'" (XBSA_HDRDIR)'; \
-               fi; \
-       fi
+       ${CC} ${CFLAGS} -c ${BUTM}/file_tm.c
 
-all: butc
-
-install install.noversion:  ${DESTDIR}${sbindir}/butc
+#
+# Install targets
+#
+install: ${DESTDIR}${sbindir}/butc
+dest: ${DEST}/etc/butc
 
-noversion: install
-system: install
 ${DEST}/etc/butc: butc
        ${INSTALL} $? $@
 
 ${DESTDIR}${sbindir}/butc: butc
        ${INSTALL} $? $@
 
+#
+# Misc targets
+#
+include ../config/Makefile.version
 
-dest:  ${DEST}/etc/butc
+clean:
+       $(RM) -f *.o *.a core AFS_component_version_number.c butc