Build system: MT_LIBS includes XLIBS

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

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index a0345a6..e5634d7 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -13,15 +13,8 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 HELPER_SPLINT=@HELPER_SPLINT@
 
 RX=$(srcdir)/../rx
-UTIL=$(srcdir)/../util
 BUDB=$(srcdir)/../budb
 
-RXOBJS= rx_pthread.o rxkad_errs.o
-
-UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
-     volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
-
-
 INCLS=\
        ${TOP_INCDIR}/lock.h \
        ${TOP_INCDIR}/ubik.h \
@@ -38,14 +31,15 @@ INCLS=\
        budb.h $(BUDB)/budb_client.h
 
 # library ordering defined by top level makefile
-LIBS=${RXOBJS} ${UTILOBJS} \
+LIBS= \
        ${TOP_LIBDIR}/libbubasics.a \
-       ${TOP_LIBDIR}/libubik_pthread.a \
-       ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/ubik/liboafs_ubik.la \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/opr/liboafs_opr.la \
-       ${TOP_LIBDIR}/libafsutil.a
+       $(top_builddir)/src/util/liboafs_util.la
 
 COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
 
@@ -54,61 +48,35 @@ 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 ${INCLS}
 
-budb_errs.h: budb_errs.c
-
 budb_errs.c: ${BUDB}/budb_errs.et
-       $(RM) -f budb_errs.c
-       ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs
+       ${COMPILE_ET_C} -p ${BUDB} budb_errs
+
+budb_errs.h: ${BUDB}/budb_errs.et
+       ${COMPILE_ET_H} -p ${BUDB} budb_errs
+
+database.o: budb_errs.h
+db_alloc.o: budb_errs.h
+db_dump.o: budb_errs.h
+db_hash.o: budb_errs.h
+db_lock.o: budb_errs.h
+dbs_dump.o: budb_errs.h
+db_text.o: budb_errs.h
+ol_verify.o: budb_errs.h
+procs.o: budb_errs.h
+server.o: budb_errs.h
+struct_ops.o: budb_errs.h
 
 #
 # Build targets
 #
 
-rx_pthread.o: ${RX}/rx_pthread.c
-       $(AFS_CCRULE) $(RX)/rx_pthread.c
-
-rxkad_errs.o: ../rxkad/rxkad_errs.c
-       $(AFS_CCRULE) ../rxkad/rxkad_errs.c
-
-# get the pthreaded util stuff compiled here.  we do this instead of
-# using the non-pthreaded libutil.a.  There probably should be a
-# pthreaded version of this library, as we are doing with ubik itself, but...
-#
-
-uuid.o: ${UTIL}/uuid.c
-       $(AFS_CCRULE) $(UTIL)/uuid.c
-
-serverLog.o: ${UTIL}/serverLog.c
-       $(AFS_CCRULE) $(UTIL)/serverLog.c
-
-fileutil.o: ${UTIL}/fileutil.c
-       $(AFS_CCRULE) $(UTIL)/fileutil.c
-
-volparse.o: ${UTIL}/volparse.c
-       $(AFS_CCRULE) $(UTIL)/volparse.c
-
-flipbase64.o: ${UTIL}/flipbase64.c
-       $(AFS_CCRULE) $(UTIL)/flipbase64.c
-
-dirpath.o: ${UTIL}/dirpath.c
-       $(AFS_CCRULE) $(UTIL)/dirpath.c
-
-softsig.o: ${UTIL}/softsig.c
-       $(AFS_CCRULE) $(UTIL)/softsig.c
-
-hostparse.o: ${UTIL}/hostparse.c
-       $(AFS_CCRULE) $(UTIL)/hostparse.c
-
-pthread_glock.o: ${UTIL}/pthread_glock.c
-       $(AFS_CCRULE) $(UTIL)/pthread_glock.c
-
 database.o: ${BUDB}/database.c budb_errs.h ${INCLS}
        $(AFS_CCRULE) $(BUDB)/database.c
 
 db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS}
        $(AFS_CCRULE) $(BUDB)/db_alloc.c
 
-db_dump.o: ${BUDB}/db_dump.c
+db_dump.o: ${BUDB}/db_dump.c budb_errs.h ${INCLS}
        $(AFS_CCRULE) $(BUDB)/db_dump.c
 
 dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS}
@@ -137,19 +105,19 @@ server.o: ${BUDB}/server.c budb_errs.h ${INCLS}
 
 budb_server: $(SERVER_OBJS) ${LIBS}
        $(LT_LDRULE_static) $(SERVER_OBJS) ${LIBS} \
-               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS}
 
 budb.cs.c: ${BUDB}/budb.rg
-       ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg
 
 budb.ss.c: ${BUDB}/budb.rg
-       ${RXGEN} -S -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -S -o $@ ${BUDB}/budb.rg
 
 budb.xdr.c: ${BUDB}/budb.rg
-       ${RXGEN} -c -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -c -o $@ ${BUDB}/budb.rg
 
 budb.h: ${BUDB}/budb.rg
-       ${RXGEN} -u -h -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -h -o $@ ${BUDB}/budb.rg
 
 budb.cs.c: budb.h
 budb.xdr.c: budb.h