Build system: MT_LIBS includes XLIBS

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

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index fc27aa5..78645b7 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -9,9 +9,6 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
-KRB5CFLAGS = @KRB5_CPPFLAGS@
-KRB5LIBS = @KRB5_LIBS@
-
 INCLS=${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/cmd.h \
        ${TOP_INCDIR}/afs/afsutil.h
@@ -26,11 +23,12 @@ AFSIO_INCLS=${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/afsutil.h
 
 AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
-       ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
-       ${TOP_LIBDIR}/libcmd.a \
-       $(TOP_LIBDIR)/libafsutil.a \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/fsint/liboafs_fsint.la \
+       $(top_builddir)/src/vlserver/liboafs_vldb.la \
+       $(top_builddir)/src/cmd/liboafs_cmd.la \
+       $(top_builddir)/src/util/liboafs_util.la \
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libvldb.a \
@@ -47,6 +45,7 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libaudit.a \
         $(TOP_LIBDIR)/libafsutil.a \
         $(TOP_LIBDIR)/libopr.a \
+        ${TOP_LIBDIR}/libafsrfc3961.a \
         ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 CMLIBS=${TOP_LIBDIR}/libsys.a \
@@ -56,12 +55,13 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libafscom_err.a \
         ${TOP_LIBDIR}/libcmd.a \
         ${TOP_LIBDIR}/librx.a \
+        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a \
         $(TOP_LIBDIR)/libopr.a \
         $(TOP_LIBDIR)/libafsutil.a
 
-LIBS = ${FSLIBS} 
+LIBS = ${FSLIBS}
 
 all: fs up fstrace cmdebug livesys kdump-build cacheout afsio
 
@@ -87,16 +87,14 @@ fs: fs.o $(LIBS)
 
 afsio.o: afsio.c ${AFSIO_INCLS} AFS_component_version_number.c
        ${PTH_CCRULE} ${srcdir}/afsio.c
-vldbint.cs.o: ../vlserver/vldbint.cs.c
-       ${PTH_CCRULE} ../vlserver/vldbint.cs.c
-vldbint.xdr.o: ../vlserver/vldbint.xdr.c
-       ${PTH_CCRULE} ../vlserver/vldbint.xdr.c
 afscbint.ss.o: ../fsint/afscbint.ss.c
        ${PTH_CCRULE} ../fsint/afscbint.ss.c
 
-afsio: afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS}
-       $(MT_CC) $(PTH_LDFLAGS) $(AFS_CFLAGS) -o afsio afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS} \
-               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} ${KRB5LIBS}
+afsio: afsio.o afscbint.ss.o ${AFSIO_LIBS}
+       $(LT_LDRULE_static) afsio.o afscbint.ss.o \
+               ${AFSIO_LIBS} \
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
+               $(LDFLAGS_krb5) $(LIB_krb5)
 
 livesys.o: livesys.c ${INCLS} AFS_component_version_number.c
 
@@ -181,7 +179,7 @@ kdump: kdump.o
        * )     ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a ${XLIBS} ;; \
        esac
 
-kdump64: 
+kdump64:
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | sun4x_510 | hp_ux11* | sunx86_5[789] | sunx86_510 )  \
@@ -264,7 +262,7 @@ kdump-alpha_linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_numb
                -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \
                -I${TOP_SRCDIR} -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
                -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -mno-fp-regs -ffixed-8 \
-               -o kdump-alpha_linux-${LINUX_VERSION}.o -c ${srcdir}/kdump.c ;; \
+               -o kdump-alpha_linux-${LINUX_VERSION}.o -c ${srcdir}/kdump.c ;;
 
 kdump-alpha_linux-@LINUX_VERSION@: kdump-alpha_linux-@LINUX_VERSION@.o
        ${CC} ${KERN_DBG} ${KERN_OPTMZ} -o kdump-alpha_linux-${LINUX_VERSION} kdump-alpha_linux-${LINUX_VERSION}.o \
@@ -363,6 +361,7 @@ dest: kdump-build fs livesys up fstrace cmdebug afsio
 #
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug \
                AFS_component_version_number.c fstrace gcpags livesys dedebug \
                cacheout afsio