Finish removing sunos 4.x references and build cruft

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

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 124ea48..fc27aa5 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -9,10 +9,6 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 KRB5CFLAGS = @KRB5_CPPFLAGS@
 KRB5LIBS = @KRB5_LIBS@
 
@@ -33,7 +29,8 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
-       $(TOP_LIBDIR)/libafsutil.a
+       $(TOP_LIBDIR)/libafsutil.a \
+       $(TOP_LIBDIR)/libopr.a
 
 FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libvldb.a \
@@ -48,8 +45,9 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/libaudit.a \
-        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-        $(TOP_LIBDIR)/libafsutil.a
+        $(TOP_LIBDIR)/libafsutil.a \
+        $(TOP_LIBDIR)/libopr.a \
+        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libafsint.a \
@@ -60,6 +58,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/librx.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a \
+        $(TOP_LIBDIR)/libopr.a \
         $(TOP_LIBDIR)/libafsutil.a
 
 LIBS = ${FSLIBS} 
@@ -96,12 +95,8 @@ 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}
-       +if test "@BUILD_KRB5@" = "yes"; then \
-               $(MT_CC) @KRB5_CPPFLAGS@ $(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} ; \
-       else \
-               echo "Skipping afsio (KRB5 build disabled)" ; \
-       fi
+       $(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}
 
 livesys.o: livesys.c ${INCLS} AFS_component_version_number.c
 
@@ -119,29 +114,8 @@ whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
 whatfid: whatfid.o ${LIBS}
        $(AFS_LDRULE) whatfid.o ${LIBS} $(LIB_roken) ${XLIBS}
 
-fstrace.o: fstrace.c AFS_component_version_number.c
-       case ${SYS_NAME} in \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \
-               sun*_4* ) \
-                       ${CC} ${DBG} ${OPTMZ} -I/usr/xpg2include -I/usr/5include -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
-               * ) \
-                       $(AFS_CCRULE) $(srcdir)/fstrace.c ;; \
-       esac
-
 fstrace: fstrace.o
-       case ${SYS_NAME} in \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
-               sun*_4* ) \
-                       ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \
-               hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \
-                       ${CC} -I${TOP_OBJDIR}/src/config  -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
-               * ) \
-                       $(AFS_LDRULE) fstrace.o ${TOP_LIBDIR}/libsys.a \
-                               ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \
-                               ${XLIBS} $(LIB_roken);; \
-       esac
+       $(AFS_LDRULE) fstrace.o $(LIBS) $(LIB_roken) ${XLIBS}
 
 cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
 
@@ -309,9 +283,7 @@ install: kdump-build fs livesys up fstrace cmdebug afsio
        ${INSTALL_PROGRAM} up ${DESTDIR}${bindir}/up
        ${INSTALL_PROGRAM} fstrace ${DESTDIR}${sbindir}/fstrace
        ${INSTALL_PROGRAM} cmdebug ${DESTDIR}${bindir}/cmdebug
-       if test "@BUILD_KRB5@" = "yes"; then \
-               ${INSTALL_PROGRAM} afsio ${DESTDIR}${bindir}/afsio ; \
-       fi
+       ${INSTALL_PROGRAM} afsio ${DESTDIR}${bindir}/afsio ;
        -set -x; \
        case ${SYS_NAME} in \
        sgi_6? ) \
@@ -333,6 +305,8 @@ install: kdump-build fs livesys up fstrace cmdebug afsio
        hp_ux11* ) \
                ${INSTALL_SCRIPT} kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
                ${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
+       *bsd* ) \
+               ;; \
        *) \
                ${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
        esac
@@ -350,9 +324,7 @@ dest: kdump-build fs livesys up fstrace cmdebug afsio
        ${INSTALL_PROGRAM} up ${DEST}/bin/up
        ${INSTALL_PROGRAM} fstrace ${DEST}/etc/fstrace
        ${INSTALL_PROGRAM} cmdebug ${DEST}/bin/cmdebug
-       if test "@BUILD_KRB5@" = "yes"; then \
-               ${INSTALL_PROGRAM} afsio ${DEST}/bin/afsio ; \
-       fi
+       ${INSTALL_PROGRAM} afsio ${DEST}/bin/afsio
        -set -x; \
        case ${SYS_NAME} in \
        sgi_6? ) \