rx: Use a red black tree for the event stack

[openafs.git] / src / tbutc / Makefile.in

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 585f85b..de86dd1 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -7,19 +7,14 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 
 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=-I. -I${srcdir} ${DBG} -w -I${TOP_OBJDIR}/src/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE} \
-       -I../bucoord -I../volser
 
-LDFLAGS = ${DBG} ${XLDFLAGS}
+MODULE_CFLAGS = @XBSA_CFLAGS@ -I${BUCOORD} -I${VOLSER} -I../bucoord -I../volser
 
 LWP     = ${srcdir}/../lwp
 BUTM    = ${srcdir}/../butm
@@ -28,18 +23,16 @@ BUCOORD = ${srcdir}/../bucoord
 VOLSER  = ${srcdir}/../volser
 
 BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
-           ../bucoord/status.o ../bucoord/bucoord_errs.o
+           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
+VOLSEROBJS=vsprocs.o vsutils.o lockprocs.o
+VOLSERLIBS=${TOP_LIBDIR}/libvosadmin.a ${TOP_LIBDIR}/libafsadminutil.a
 
-LWPOBJS     =lock.o
+LWPOBJS     =lock.o waitkey.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}
+           tcudbprocs.o dump.o tcstatus.o butc_xbsa.o afsxbsa.o \
+            ${LWPOBJS} ${BUCOORDOBJS} ${VOLSEROBJS}
 
 BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
            ${TOP_INCDIR}/afs/volume.h \
@@ -60,14 +53,13 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libbubasics.a \
            ${VOLSERLIBS} \
             ${BUTMLIBS} \
-           ${TOP_LIBDIR}/libvldb.a \
            ${TOP_LIBDIR}/libafsauthent.a \
            ${TOP_LIBDIR}/libafsrpc.a \
             ${TOP_LIBDIR}/libcmd.a \
            ${TOP_LIBDIR}/util.a \
+           $(TOP_LIBDIR)/libopr.a \
            ${TOP_LIBDIR}/libusd.a \
-           ${TOP_LIBDIR}/libprocmgmt.a \
-           ${TOP_LIBDIR}/librx.a
+           ${TOP_LIBDIR}/libprocmgmt.a
 
 #
 # Build targets
@@ -76,77 +68,87 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 all: butc
 
 butc: ${BUTCOBJS} ${BUTCLIBS}
-       ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} -o butc
-
-libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
-       -$(RM) -f $@
-       $(AR) crv $@ vsprocs.o ${VOLSERLIBOBJ}
-       $(RANLIB) $@
+       $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} \
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 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
 
+afsxbsa.o: ${BUTC}/afsxbsa.c ${BUTC}/afsxbsa.h ${BUTCINCLS}
+       $(AFS_CCRULE) ${BUTC}/afsxbsa.c
+
 dbentries.o: ${BUTC}/dbentries.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/dbentries.c
+       $(AFS_CCRULE) ${BUTC}/dbentries.c
 
 tcprocs.o: ${BUTC}/tcprocs.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/tcprocs.c
+       $(AFS_CCRULE) ${BUTC}/tcprocs.c
 
 lwps.o: ${BUTC}/lwps.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/lwps.c
+       $(AFS_CCRULE) ${BUTC}/lwps.c
 
 tcmain.o: ${BUTC}/tcmain.c ${BUTCINCLS} AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c ${BUTC}/tcmain.c
+       $(AFS_CCRULE) ${BUTC}/tcmain.c
 
 list.o: ${BUTC}/list.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/list.c
+       $(AFS_CCRULE) ${BUTC}/list.c
 
 recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/recoverDb.c
+       $(AFS_CCRULE) ${BUTC}/recoverDb.c
 
+CFLAGS_tcudbprocs.o=@CFLAGS_NOERROR@
 tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/tcudbprocs.c
+       $(AFS_CCRULE) ${BUTC}/tcudbprocs.c
 
 dump.o: ${BUTC}/dump.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/dump.c
+       $(AFS_CCRULE) ${BUTC}/dump.c
 
 tcstatus.o: ${BUTC}/tcstatus.c ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/tcstatus.c
+       $(AFS_CCRULE) ${BUTC}/tcstatus.c
 
 butc_xbsa.o: ${BUTC}/butc_xbsa.c ${BUTC}/butc_xbsa.h ${BUTCINCLS}
-       ${CC} ${CFLAGS} -c ${BUTC}/butc_xbsa.c
+       $(AFS_CCRULE) ${BUTC}/butc_xbsa.c
 
 ubik_db_if.o: ${BUCOORD}/ubik_db_if.c
-       ${CC} ${CFLAGS} -c ${BUCOORD}/ubik_db_if.c
+       $(AFS_CCRULE) ${BUCOORD}/ubik_db_if.c
+
+status.o: ${BUCOORD}/status.c
+       $(AFS_CCRULE) ${BUCOORD}/status.c
+
+vsutils.o: ${VOLSER}/vsutils.c
+       $(AFS_CCRULE) ${VOLSER}/vsutils.c
 
 vsprocs.o: ${VOLSER}/vsprocs.c
-       ${CC} ${CFLAGS} -c ${VOLSER}/vsprocs.c
+       $(AFS_CCRULE) ${VOLSER}/vsprocs.c
+
+lockprocs.o: ${VOLSER}/lockprocs.c
+       $(AFS_CCRULE) ${VOLSER}/lockprocs.c
 
 lock.o: ${LWP}/lock.c
-       ${CC} ${CFLAGS} -c ${LWP}/lock.c
+       $(AFS_CCRULE) ${LWP}/lock.c
+
+waitkey.o: ${LWP}/waitkey.c
+       $(AFS_CCRULE) ${LWP}/waitkey.c
 
 file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
-       ${CC} ${CFLAGS} -c ${BUTM}/file_tm.c
+       $(AFS_CCRULE) ${BUTM}/file_tm.c
 
 #
 # Install targets
 #
-install: ${DESTDIR}${sbindir}/butc
-dest: ${DEST}/etc/butc
-
-${DEST}/etc/butc: butc
-       ${INSTALL} $? $@
+install: butc
+       ${INSTALL} -d ${DESTDIR}${sbindir}
+       ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc
 
-${DESTDIR}${sbindir}/butc: butc
-       ${INSTALL} $? $@
+dest: butc
+       ${INSTALL} -d ${DEST}/etc
+       ${INSTALL_PROGRAM} butc ${DEST}/etc/butc
 
 #
 # Misc targets
 #
-include ../config/Makefile.version
-
 clean:
        $(RM) -f *.o *.a core AFS_component_version_number.c butc
 
+include ../config/Makefile.version