no-copy-libafs-builds-20021015

make things so file copies from src/libafs don't happen; change how libafs_tree is done

diff --git a/Makefile-libafs.in b/Makefile-libafs.in
new file mode 100644 (file)
index 0000000..64f7884
--- /dev/null
+++ b/Makefile-libafs.in
@@ -0,0 +1,9 @@
+# Copyright 2000, International Business Machines Corporation and others.
+# All Rights Reserved.
+# 
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+
+all: 
+       cd src && cd libafs && $(MAKE)

diff --git a/Makefile.in b/Makefile.in
index ac9ac417f9769bc133a475c00a453e812aaefdd5..209e5cf92352c987da67e120add391951854f6c3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,11 +22,12 @@ ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@
 #   rxgen, compile_et and others already exist and runs it with
 #   "-argument kinstall".
 
-COMPILE_PART1  = cd src; cd
-COMPILE_PART2A = ; $(MAKE)
+COMPILE_PART1  = cd src && cd
+COMPILE_PART2A = && $(MAKE)
 COMPILE_PART2B = all
 COMPILE_PART2  = ${COMPILE_PART2A} ${COMPILE_PART2B}
 COMPILE_CLEAN  = ${COMPILE_PART2A} clean
+COMPILE_DEPINSTALL  = ${COMPILE_PART2A} depinstall
 
 all: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
        $(MAKE) build
@@ -83,11 +84,6 @@ dest_dirs: force
        mkdir -p ${DEST}/root.server/etc
        mkdir -p ${DEST}/root.server/usr/afs/bin
 
-# This is needed to get these dirs built prior to stuff being installed into them
-build_dirs_rx:
-       mkdir -p ${TOP_OBJDIR}/src/libafs/rx
-       mkdir -p ${TOP_OBJDIR}/src/libuafs/rx
-
 project: cmd comerr 
 
 tests: all 
@@ -99,14 +95,14 @@ config:
 pinstall: config
        ${COMPILE_PART1} pinstall ${COMPILE_PART2}
 
-procmgmt: config pinstall
+procmgmt: pinstall
        ${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: pinstall procmgmt
+util: procmgmt
        ${COMPILE_PART1} util ${COMPILE_PART2}
 
-audit: pinstall rx rxkad fsint
-       ${COMPILE_PART1} audit ${COMPILE_PART2}
+audit: util rx rxkad
+       ${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
 
 comerr: util
        ${COMPILE_PART1} comerr ${COMPILE_PART2}
@@ -119,13 +115,13 @@ cmd: comerr
                ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \
        esac
 
-lwp: project util
+lwp: util
        ${COMPILE_PART1} lwp ${COMPILE_PART2}
 
-rxgen: pinstall
+rxgen: pinstall 
        ${COMPILE_PART1} rxgen ${COMPILE_PART2}
 
-rx: project lwp rxgen build_dirs_rx
+rx: pinstall lwp rxgen 
        ${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxstat: rx
@@ -135,54 +131,53 @@ rxtests: rxdebug
 rxdebug: rx sys
        ${COMPILE_PART1} rxdebug ${COMPILE_PART2}
 
-fsint: project kfsint
-
-kfsint: lwp rxgen rx
+fsint: cmd comerr rxgen rx lwp 
        ${COMPILE_PART1} fsint ${COMPILE_PART2}
 
-export2: project fsint
+export2: project 
 
-export: fsint
+export: 
        @case ${SYS_NAME} in \
        rs_aix*) \
-               ${COMPILE_PART1} export ${COMPILE_PART2} ;; \
-       *) \
-               echo skipping export for ${SYS_NAME} ;; \
+               ${MAKE} export_build ; \
        esac
 
-afs: export
+export_build: fsint
+       ${COMPILE_PART1} export ${COMPILE_PART2}
+
+afs: export pinstall comerr
        ${COMPILE_PART1} afs ${COMPILE_PART2}
 
 des: config pinstall
        ${COMPILE_PART1} des ${COMPILE_PART2} 
 
-sys: project afs des rx rxstat fsint
+sys: cmd comerr afs des rx rxstat fsint
        ${COMPILE_PART1} sys ${COMPILE_PART2}
 
-rxkad: project des rx
+rxkad: cmd comerr sys des rx
        ${COMPILE_PART1} rxkad ${COMPILE_PART2}
 
-auth: project comerr des lwp rx sys rxkad audit
+auth: cmd comerr comerr des lwp rx sys rxkad audit
        ${COMPILE_PART1} auth ${COMPILE_PART2}
 
-ubik: project auth 
+ubik: cmd comerr auth 
        ${COMPILE_PART1} ubik ${COMPILE_PART2}
 
 ubiktests: ubik
 
-ptserver: project ubik cmd comerr auth audit
+ptserver: cmd comerr ubik cmd comerr auth audit
        ${COMPILE_PART1} ptserver ${COMPILE_PART2}
 
-kauth: project ubik cmd auth comerr ptserver audit libacl
+kauth: cmd comerr ubik cmd auth comerr ptserver audit libacl
        ${COMPILE_PART1} kauth ${COMPILE_PART2}
 
-dauth: project ubik cmd auth kauth comerr
+dauth: cmd comerr ubik cmd auth kauth comerr
        ${COMPILE_PART1} dauth ${COMPILE_PART2}
 
-libacl: project ptserver
+libacl: cmd comerr ptserver
        ${COMPILE_PART1} libacl ${COMPILE_PART2}
 
-dir: project libacl
+dir: cmd comerr libacl
        ${COMPILE_PART1} dir ${COMPILE_PART2}
 
 # Removed from sgi_* case below:
@@ -195,16 +190,16 @@ sgiefs:
                echo No efs stuff for ${SYS_NAME};; \
        esac
 
-vol: project dir afs sgiefs
+vol: cmd comerr dir afs sgiefs
        ${COMPILE_PART1} vol ${COMPILE_PART2}
 
-vlserver: project vol audit
+vlserver: cmd comerr vol audit
        ${COMPILE_PART1} vlserver ${COMPILE_PART2}
 
-viced: project vlserver audit
+viced: cmd comerr vlserver audit
        ${COMPILE_PART1} viced ${COMPILE_PART2}
 
-tviced: project viced vlserver libafsrpc libafsauthent
+tviced: cmd comerr viced vlserver libafsrpc libafsauthent
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux110|*fbsd*) \
                ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
@@ -212,17 +207,17 @@ tviced: project viced vlserver libafsrpc libafsauthent
                echo Not building MT viced for ${SYS_NAME} ;; \
        esac
 
-volser: project tviced usd kauth audit
+volser: cmd comerr tviced usd kauth audit
        ${COMPILE_PART1} volser ${COMPILE_PART2}
 
-venus: project volser ptserver
+venus: cmd comerr volser ptserver
        ${COMPILE_PART1} venus ${COMPILE_PART2}
        ${COMPILE_PART1} venus/test ${COMPILE_PART2}
 
-afsd: project sys kauth
+afsd: cmd comerr sys kauth
        ${COMPILE_PART1} afsd ${COMPILE_PART2}
 
-null: project
+null: cmd comerr
        ${COMPILE_PART1} null ${COMPILE_PART2}
 
 ${TOP_LIBDIR}/libtermlib.a: 
@@ -234,27 +229,21 @@ ${TOP_LIBDIR}/libtermlib.a:
                ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \
        esac
 
-gtx: project null auth kauth ${TOP_LIBDIR}/libtermlib.a
+gtx: cmd comerr null auth kauth ${TOP_LIBDIR}/libtermlib.a
        ${COMPILE_PART1} gtx ${COMPILE_PART2}
 
-fsprobe: project util fsint volser
+fsprobe: cmd comerr util fsint volser
        ${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
-scout: project gtx fsprobe
+scout: cmd comerr gtx fsprobe
        ${COMPILE_PART1} scout ${COMPILE_PART2}
 
-uss: des kauth project rx vlserver vol volser
+uss: des kauth cmd comerr rx vlserver vol volser
        ${COMPILE_PART1} uss ${COMPILE_PART2}
 
-bozo: project ntp audit
+bozo: cmd comerr ntp audit
        ${COMPILE_PART1} bozo ${COMPILE_PART2}
 
-
-# Removed from respective case statements below:
-# ${COMPILE_PART1} vfsckaix42 ${COMPILE_PART2} ;;
-# ${COMPILE_PART1} vfscksol25 ${COMPILE_PART2} ;;
-# ${COMPILE_PART1} vfscksol26 ${COMPILE_PART2} ;;
-# ${COMPILE_PART1} vfscksol27 ${COMPILE_PART2} ;;
 vfsck: vol
        set -x; \
        case ${SYS_NAME} in \
@@ -264,7 +253,7 @@ vfsck:      vol
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac
 
-login: project kauth rxkad
+login: cmd comerr kauth rxkad
        set -x; \
        case ${SYS_NAME} in \
        sgi_* ) \
@@ -285,64 +274,86 @@ login: project kauth rxkad
                ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
        esac
 
-KERNELDIR= \
-  afs \
-  dir \
-  rx \
-  fsint \
-  auth \
-  rxkad \
-  util \
-  libacl \
-  vlserver \
-  sgiefs  \
-  rxstat
 
+#
+# _depinstall targets - only build and install headers/sources that are needed by libafs/libuafs
+#
+# encode dependencies within the _depinstall targets as required
+#
+lwp_depinstall: pinstall
+       ${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL}
 
-UKERNELDIR= \
-  afs \
-  dir \
-  rx \
-  fsint \
-  util \
-  auth \
-  rxkad \
-  vlserver \
-  kauth \
-  des \
-  afsweb \
-  rxstat
+rx_depinstall: pinstall
+       ${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}
+
+rxkad_depinstall: pinstall comerr
+       ${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}
 
+ubik_depinstall: pinstall comerr rxgen
+       ${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL}
 
-libafs: lwp libafs_setup ${KERNELDIR}
+vlserver_depinstall: pinstall rxgen ubik_depinstall auth_depinstall
+       ${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}
+
+auth_depinstall: pinstall comerr
+       ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
+
+fsint_depinstall: pinstall rxgen
+       ${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL}
+
+rxstat_depinstall: pinstall rxgen
+       ${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL}
+
+libacl_depinstall: pinstall
+       ${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL}
+
+afs_depinstall: pinstall comerr
+       ${COMPILE_PART1} afs ${COMPILE_DEPINSTALL}
+
+dir_depinstall: pinstall
+       ${COMPILE_PART1} dir ${COMPILE_DEPINSTALL}
+
+kauth_depinstall: pinstall rxgen comerr
+       ${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL}
+
+ptserver_depinstall: pinstall rxgen comerr
+       ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
+
+
+#
+# libafs build targets
+#
+libafs_setup: config export
+       src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
+
+libafs: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall rxkad_depinstall fsint_depinstall \
+               libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall
        ${COMPILE_PART1} libafs ${COMPILE_PART2}
 
-libafs_tree: libafs_setup ${KERNELDIR}
-       -/bin/rm -rf libafs_tree
-       for d in afs afsint rx config; do \
-               [ -d libafs_tree/$$d ] || mkdir -p libafs_tree/$$d; \
-       done
-       for f in `cd src/libafs; find . -name '*.[ch]'` \
-               Makefile.common Makefile.extradefs ${DARWIN_INFOFILE} \
-               afs.shutdown afs.startup redhat.sh sgi_master sgi_system \
-               ; do \
-               ${INSTALL} -c -f src/libafs/$$f libafs_tree/$$f; \
-       done
-       for f in config.guess config.sub install-sh missing mkinstalldirs \
-               ; do \
-               ${INSTALL} -c -f $$f libafs_tree/$$f; \
-       done
-       src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE}.in libafs_tree/Makefile.in ${SYS_NAME}
-       ${INSTALL} -c src/config/Makefile.config.in libafs_tree/config
-       ${INSTALL} -c src/config/afsconfig.h.in libafs_tree/config
-       ${INSTALL} -c -f -ns configure-libafs libafs_tree/configure
-       case ${SYS_NAME} in \
-       *linux*) \
-               ${INSTALL} -c src/config/make_vnode.pl libafs_tree/config ; \
-               ${INSTALL} -c src/afs/LINUX/osi_vfs.hin libafs_tree/afs ;; \
-       esac
+libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall rxkad_depinstall fsint_depinstall \
+               libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall
+       ${TOP_SRCDIR}/config/make_libafs_tree.pl \
+               -sn $(SYS_NAME) \
+               -os $(MKAFS_OSTYPE) \
+               -t @TOP_OBJDIR@/libafs_tree \
+               -o @TOP_OBJDIR@ \
+               -p @srcdir@
 
-libuafs: lwp libuafs_setup ${UKERNELDIR}
+#
+# libuafs build targets
+#
+
+UKERNELDIR= \
+  des \
+  afsweb 
+
+libuafs_setup: config export
+       src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
+
+libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \
+               auth_depinstall dir_depinstall libacl_depinstall rxkad_depinstall \
+               ubik_depinstall afs_depinstall kauth_depinstall ptserver_depinstall \
+               rxstat_depinstall lwp_depinstall des
        set -x; \
        case ${SYS_NAME} in \
        hp_ux102* | *_obsd* | sun*_4* | *_nbsd*) \
@@ -354,28 +365,28 @@ libuafs: lwp libuafs_setup ${UKERNELDIR}
 afsweb: kauth dauth 
        ${COMPILE_PART1} afsweb ${COMPILE_PART2}
 
-update: project auth
+update: cmd comerr auth
        ${COMPILE_PART1} update ${COMPILE_PART2}
 
-log: project auth 
+log: cmd comerr auth 
        ${COMPILE_PART1} log ${COMPILE_PART2}
 
-bu_utils: project usd
+bu_utils: cmd comerr usd
        ${COMPILE_PART1} bu_utils ${COMPILE_PART2}
 
-usd: project
+usd: cmd comerr
        ${COMPILE_PART1} usd ${COMPILE_PART2}
 
-bubasics: project comerr rx
+bubasics: cmd comerr comerr rx
        ${COMPILE_PART1} bubasics ${COMPILE_PART2}
 
-butm: project bubasics usd uss
+butm: cmd comerr bubasics usd uss
        ${COMPILE_PART1} butm ${COMPILE_PART2}
 
-butc: project bubasics butm budb bucoord cmd rxgen rx
+butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
        ${COMPILE_PART1} butc ${COMPILE_PART2}
 
-tbutc: project bubasics butm budb bucoord cmd butc
+tbutc: cmd comerr bubasics butm budb bucoord cmd butc
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux110) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
@@ -383,16 +394,16 @@ tbutc: project bubasics butm budb bucoord cmd butc
                echo Not building MT butc for ${SYS_NAME} ;; \
        esac
 
-budb: project bubasics uss
+budb: cmd comerr bubasics uss
        ${COMPILE_PART1} budb ${COMPILE_PART2}
 
-bucoord: project bubasics budb volser
+bucoord: cmd comerr bubasics budb volser
        ${COMPILE_PART1} bucoord ${COMPILE_PART2}
 
-xstat: project fsint viced
+xstat: cmd comerr fsint viced
        ${COMPILE_PART1} xstat ${COMPILE_PART2}
 
-afsmonitor: project gtx xstat
+afsmonitor: cmd comerr gtx xstat
        ${COMPILE_PART1} afsmonitor ${COMPILE_PART2}
 
 tests: rxtests ubiktests
@@ -479,12 +490,6 @@ finale_nolibafs: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
 
-libafs_setup: config export
-       src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
-
-libuafs_setup: config export
-       src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
-
 force:
 
 TARGET=finale

diff --git a/acinclude.m4 b/acinclude.m4
index 55fd5f2d3d4d6cc75e9e854ec93611f17a73c6b0..a91dee42f939bf9285ab1a72458a05bad8521119 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -641,4 +641,23 @@ AC_SUBST(IRIX_BUILD_IP35)
 
 OPENAFS_OSCONF
 
+TOP_SRCDIR="${srcdir}/src"
+dnl
+dnl If we're using ./configure, need a more reasonable TOP_SRCDIR, since relative links don't work everywhere
+dnl
+case $TOP_SRCDIR in
+        /*)
+                ;;
+        *)
+                TOP_SRCDIR=${SRCDIR_PARENT}/src
+esac
+
+TOP_OBJDIR="${SRCDIR_PARENT}"
+TOP_INCDIR="${SRCDIR_PARENT}/include"
+TOP_LIBDIR="${SRCDIR_PARENT}/lib"
+if test "${DEST}x" = "x"; then
+        DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
+fi
+
+
 ])

diff --git a/configure-libafs.in b/configure-libafs.in
index 0b740e620d21eaa0a333c85c4654bc4ac03e3330..f9fa0facaa1abfcd41ce02943eca4a3168922440 100644 (file)
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,26 +1,14 @@
-AC_INIT(Makefile.common)
+AC_INIT(src/libafs/Makefile.common.in)
 AM_INIT_AUTOMAKE(openafs-libafs,devel)
-AC_CONFIG_HEADER(config/afsconfig.h)
+AC_CONFIG_HEADER(src/config/afsconfig.h)
 define(OPENAFS_CONFIGURE_LIBAFS)
 
 AC_PROG_CC
 OPENAFS_CONFIGURE_COMMON
 
-TOP_SRCDIR="${SRCDIR_PARENT}"
-TOP_INCDIR="${SRCDIR_PARENT}/include"
-TOP_LIBDIR="${SRCDIR_PARENT}/lib"
-if test "${DEST}x" = "x"; then
-       DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
-fi
-
-# Check for files involved in porting.  Report errors, don't make the
-# user hunt through the configure log after the build fails!
-if test ! -r config/Makefile.${AFS_SYSNAME}.in ; then
-  AC_MSG_ERROR(no source file config/Makefile.${AFS_SYSNAME}.in)
-fi
-
 AC_OUTPUT(             \
 Makefile               \
-config/Makefile.config \
-config/Makefile.${AFS_SYSNAME} \
+src/config/Makefile.config \
+src/libafs/Makefile.common \
+src/libafs/Makefile \
 )

diff --git a/configure.in b/configure.in
index 5829c555526d227c53be07f0aa46a3e249f4952c..dfce048571294c76a3b2751916367c888dbea4da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,14 +5,6 @@ AC_CONFIG_HEADER(src/config/afsconfig.h)
 AC_PROG_CC
 OPENAFS_CONFIGURE_COMMON
 
-TOP_SRCDIR="${srcdir}/src"
-TOP_OBJDIR="${SRCDIR_PARENT}"
-TOP_INCDIR="${SRCDIR_PARENT}/include"
-TOP_LIBDIR="${SRCDIR_PARENT}/lib"
-if test "${DEST}x" = "x"; then
-       DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
-fi
-
 AC_OUTPUT(             \
 Makefile               \
 src/afs/Makefile \

diff --git a/libafsdep b/libafsdep
new file mode 100644 (file)
index 0000000..d035d7e
--- /dev/null
+++ b/libafsdep
@@ -0,0 +1,17 @@
+#
+# Note, do not copy configure-libafs, or Makefile-libafs, as they are 
+# copied and renamed in the make_libafs_tree.pl script.
+#
+config.guess
+config.sub
+install-sh
+missing
+mkinstalldirs
+#
+# Following are listed in here cause the include/ dir doesn't exist in
+# source tree. For now, just copying everything, though this could easily
+# be shrunk to only copying minimal list of files if you're willing to accept
+# the maintenance that implies.
+#
+include/*.h
+include/*/*.h

diff --git a/src/afs/AIX/osi_config.c b/src/afs/AIX/osi_config.c
index 4708ac0917892d02d06c7cb95bc81a95b98db563..12416ec88f7c38f83e51db1a15001b3727a3f3c4 100644 (file)
--- a/src/afs/AIX/osi_config.c
+++ b/src/afs/AIX/osi_config.c
@@ -34,7 +34,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c
index 06bd7db16501c5313a9c50cefb9fd88fc6279eed..f898f40f236fcd481d54835970c7efe6bdad874d 100644 (file)
--- a/src/afs/AIX/osi_file.c
+++ b/src/afs/AIX/osi_file.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/AIX/osi_groups.c b/src/afs/AIX/osi_groups.c
index 4892e5175ad556801021e9dbcf93cb43a74cfcae..a9f3fa67cd7838cfe53ed1dc800bf2dd0af39ee1 100644 (file)
--- a/src/afs/AIX/osi_groups.c
+++ b/src/afs/AIX/osi_groups.c
@@ -14,13 +14,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 
 static int

diff --git a/src/afs/AIX/osi_inode.c b/src/afs/AIX/osi_inode.c
index 1b045b579d4dd48e8712bab7fca784a9c889aaf1..44c383bd4634b3bc35b3d05b4fa3b23362bee4a9 100644 (file)
--- a/src/afs/AIX/osi_inode.c
+++ b/src/afs/AIX/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include "sys/syspest.h"
 
 #if !defined(offsetof)

diff --git a/src/afs/AIX/osi_misc.c b/src/afs/AIX/osi_misc.c
index 55ac68b64ed5a247f850a37aff40e1632de139f4..bb3b99eca365ef450aaffccdc0c790f3f047649a 100644 (file)
--- a/src/afs/AIX/osi_misc.c
+++ b/src/afs/AIX/osi_misc.c
@@ -17,41 +17,41 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../h/systm.h"
-#include "../h/types.h"
-#include "../h/errno.h"
-#include "../h/stat.h"
-#include "../h/user.h"
-#include "../h/uio.h"
-#include "../h/vattr.h"
-#include "../h/file.h"
-#include "../h/vfs.h"
-#include "../h/chownx.h"
-#include "../h/systm.h"
-#include "../h/access.h"
-#include "../rpc/types.h"
-#include "../afs/osi_vfs.h"
-#include "../netinet/in.h"
-#include "../h/mbuf.h"
-#include "../rpc/types.h"
-#include "../rpc/xdr.h"
-#include "../h/vmuser.h"
-#include "../h/syspest.h"
-
-#include "../afs/stds.h"
-#include "../afs/afs_osi.h"
+#include "h/systm.h"
+#include "h/types.h"
+#include "h/errno.h"
+#include "h/stat.h"
+#include "h/user.h"
+#include "h/uio.h"
+#include "h/vattr.h"
+#include "h/file.h"
+#include "h/vfs.h"
+#include "h/chownx.h"
+#include "h/systm.h"
+#include "h/access.h"
+#include "rpc/types.h"
+#include "osi_vfs.h"
+#include "netinet/in.h"
+#include "h/mbuf.h"
+#include "rpc/types.h"
+#include "rpc/xdr.h"
+#include "h/vmuser.h"
+#include "h/syspest.h"
+
+#include "afs/stds.h"
+#include "afs/afs_osi.h"
 #define RFTP_INTERNALS 1
-#include "../afs/volerrors.h"
-#include "../afsint/afsint.h"
-#include "../afsint/vldbint.h"
-#include "../afs/lock.h"
-#include "../afs/exporter.h"
-#include "../afs/afs.h"
-#include "../afs/afs_stats.h"
+#include "afs/volerrors.h"
+#include "afsint.h"
+#include "vldbint.h"
+#include "afs/lock.h"
+#include "afs/exporter.h"
+#include "afs/afs.h"
+#include "afs/afs_stats.h"
 
 /* In Aix one may specify an init routine routine which is called once during
  * initialization of all gfs; one day we might need to actual do somehing here.

diff --git a/src/afs/AIX/osi_sleep.c b/src/afs/AIX/osi_sleep.c
index 1f225cf91904e750cfcb7484eb09e43d4d71a5ca..d43632eec18af4b0d092265b7aee7b436592f9fe 100644 (file)
--- a/src/afs/AIX/osi_sleep.c
+++ b/src/afs/AIX/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/AIX/osi_timeout.c b/src/afs/AIX/osi_timeout.c
index af976a0f970de3536c4685af56d1e46843dae1da..9b904257c1098cb10c786bc5ef3183375ca4b75e 100644 (file)
--- a/src/afs/AIX/osi_timeout.c
+++ b/src/afs/AIX/osi_timeout.c
@@ -13,12 +13,12 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
 #include "sys/limits.h"
 #include "sys/types.h"
 #include "sys/user.h"

diff --git a/src/afs/AIX/osi_vfsops.c b/src/afs/AIX/osi_vfsops.c
index ac1770f083998331041a80cfd4c22d31a6579991..edf30756f87399079cf573648446f2414a9f1c86 100644 (file)
--- a/src/afs/AIX/osi_vfsops.c
+++ b/src/afs/AIX/osi_vfsops.c
@@ -11,18 +11,18 @@
  * osi_vfsops.c for AIX
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 
 
 #ifdef AFS_AIX_IAUTH_ENV
-#include "../afs/nfsclient.h"
-#include "../afs/exporter.h"
+#include "afs/nfsclient.h"
+#include "afs/exporter.h"
 extern struct afs_exporter     *afs_nfsexporter;
 #endif
 

diff --git a/src/afs/AIX/osi_vm.c b/src/afs/AIX/osi_vm.c
index 6cf80f74b5a3ae083ede21258142014afa486874..8a9cc0a20728bd1868d4d9a27fc04c1fab4ff2e4 100644 (file)
--- a/src/afs/AIX/osi_vm.c
+++ b/src/afs/AIX/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 /* Try to discard pages, in order to recycle a vcache entry.
  *

diff --git a/src/afs/AIX/osi_vnodeops.c b/src/afs/AIX/osi_vnodeops.c
index 2a548a6fd49e665344867601f7e4e52657db774c..fa1314307b31c59bee1f6f3fe368e0152fead4e3 100644 (file)
--- a/src/afs/AIX/osi_vnodeops.c
+++ b/src/afs/AIX/osi_vnodeops.c
@@ -8,50 +8,50 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../h/systm.h"
-#include "../h/types.h"
-#include "../h/errno.h"
-#include "../h/stat.h"
-#include "../h/user.h"
-#include "../h/uio.h"
-#include "../h/vattr.h"
-#include "../h/file.h"
-#include "../h/vfs.h"
-#include "../h/chownx.h"
-#include "../h/systm.h"
-#include "../h/access.h"
+#include "h/systm.h"
+#include "h/types.h"
+#include "h/errno.h"
+#include "h/stat.h"
+#include "h/user.h"
+#include "h/uio.h"
+#include "h/vattr.h"
+#include "h/file.h"
+#include "h/vfs.h"
+#include "h/chownx.h"
+#include "h/systm.h"
+#include "h/access.h"
 #ifdef AFS_AIX51_ENV
-#include "../h/acl.h"
+#include "h/acl.h"
 #endif
-#include "../rpc/types.h"
-#include "../afs/osi_vfs.h"
-#include "../netinet/in.h"
-#include "../h/mbuf.h"
-#include "../h/vmuser.h"
-#include "../h/shm.h"
-#include "../rpc/types.h"
-#include "../rpc/xdr.h"
-
-#include "../afs/stds.h"
-#include "../afs/afs_osi.h"
+#include "rpc/types.h"
+#include "osi_vfs.h"
+#include "netinet/in.h"
+#include "h/mbuf.h"
+#include "h/vmuser.h"
+#include "h/shm.h"
+#include "rpc/types.h"
+#include "rpc/xdr.h"
+
+#include "afs/stds.h"
+#include "afs/afs_osi.h"
 #define RFTP_INTERNALS 1
-#include "../afs/volerrors.h"
-#include "../afsint/afsint.h"
-#include "../afsint/vldbint.h"
-#include "../afs/lock.h"
-#include "../afs/exporter.h"
-#include "../afs/afs.h"
-#include "../afs/afs_chunkops.h"
-#include "../afs/afs_stats.h"
-#include "../afs/nfsclient.h"
-#include "../afs/icl.h"
-#include "../afs/prs_fs.h"
-#include "../h/flock.h"
-#include "../afs/afsincludes.h"
+#include "afs/volerrors.h"
+#include "afsint.h"
+#include "vldbint.h"
+#include "afs/lock.h"
+#include "afs/exporter.h"
+#include "afs/afs.h"
+#include "afs/afs_chunkops.h"
+#include "afs/afs_stats.h"
+#include "afs/nfsclient.h"
+#include "afs/icl.h"
+#include "afs/prs_fs.h"
+#include "h/flock.h"
+#include "afsincludes.h"
 
 
 /*

diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c
index 40116ed3b98dc1d25723a40a44efabb245f94d36..f3ff494e0b331b93034138b20e1588678105e6a2 100644 (file)
--- a/src/afs/DARWIN/osi_file.c
+++ b/src/afs/DARWIN/osi_file.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
-#include "../afs/osi_inode.h"
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
+#include "afs/osi_inode.h"
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/DARWIN/osi_groups.c b/src/afs/DARWIN/osi_groups.c
index 8bf01bdcc3048dd495437625c28672b506f86c72..cba32ddfdbb114f49995216e861c0175ab0f5b70 100644 (file)
--- a/src/afs/DARWIN/osi_groups.c
+++ b/src/afs/DARWIN/osi_groups.c
@@ -15,13 +15,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 static int
 afs_getgroups(

diff --git a/src/afs/DARWIN/osi_inode.c b/src/afs/DARWIN/osi_inode.c
index 1a69d82800157a6ef5628882ad32b6fa19ac88de..b5950775378d4f758697b8ef5354f3dc028079f8 100644 (file)
--- a/src/afs/DARWIN/osi_inode.c
+++ b/src/afs/DARWIN/osi_inode.c
@@ -13,14 +13,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include <ufs/ufs/ufsmount.h>
 extern struct ucred afs_osi_cred;
 

diff --git a/src/afs/DARWIN/osi_misc.c b/src/afs/DARWIN/osi_misc.c
index 7a90e4c73e2a304373d10e641d35e40dd1632e6e..c106f8fc3779dd7d5532ebbf19112081324d427c 100644 (file)
--- a/src/afs/DARWIN/osi_misc.c
+++ b/src/afs/DARWIN/osi_misc.c
@@ -8,12 +8,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #include <sys/namei.h>
 
 int osi_lookupname(char *aname, enum uio_seg seg, int followlink,

diff --git a/src/afs/DARWIN/osi_module.c b/src/afs/DARWIN/osi_module.c
index 823dd1aab64347a3d98d24ccfaed346f66b17c4c..67ab99b2d2718acc99084aa74466b32b6af57a7b 100644 (file)
--- a/src/afs/DARWIN/osi_module.c
+++ b/src/afs/DARWIN/osi_module.c
@@ -1,14 +1,14 @@
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #ifdef AFS_DARWIN60_ENV /* not in Kernel.framework anymore !?! */
 #include <sys/syscall.h>
 #else
-#include "../sys/syscall.h"
+#include "sys/syscall.h"
 #endif
 #include <mach/kmod.h>
 

diff --git a/src/afs/DARWIN/osi_sleep.c b/src/afs/DARWIN/osi_sleep.c
index c0f881cc649334db5da8c305b2fb4e9a720df1a3..666b6e0eea70e4c00a302f7e166f9c2de45b5623 100644 (file)
--- a/src/afs/DARWIN/osi_sleep.c
+++ b/src/afs/DARWIN/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);

diff --git a/src/afs/DARWIN/osi_vfsops.c b/src/afs/DARWIN/osi_vfsops.c
index c5656e09c17be8cafa7c908e2dabc76bf0f42da8..de871354965c12bf5c3471446993f4ae6d0ad6b6 100644 (file)
--- a/src/afs/DARWIN/osi_vfsops.c
+++ b/src/afs/DARWIN/osi_vfsops.c
@@ -4,7 +4,7 @@
 RCSID("$Header$");
 
 #include <afs/sysincludes.h>            /* Standard vendor system headers */
-#include <afs/afsincludes.h>            /* Afs-based standard headers */
+#include <afsincludes.h>            /* Afs-based standard headers */
 #include <afs/afs_stats.h>              /* statistics */
 #include <sys/malloc.h>
 #include <sys/namei.h>

diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c
index f5a60862bde09a702d1be366ed6f1cdab184b4c6..70792bbf88edd2a9c0ba3eca2199df8d2df3bc83 100644 (file)
--- a/src/afs/DARWIN/osi_vm.c
+++ b/src/afs/DARWIN/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 #include <sys/ubc.h>
 
 /* Try to discard pages, in order to recycle a vcache entry.

diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index 47334d2d582b00f7501e5521a65cb6b36a2d2975..bd020ed7f442add23a5c54895a315b42b5ade07c 100644 (file)
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -4,7 +4,7 @@
 RCSID("$Header$");
 
 #include <afs/sysincludes.h>            /* Standard vendor system headers */
-#include <afs/afsincludes.h>            /* Afs-based standard headers */
+#include <afsincludes.h>            /* Afs-based standard headers */
 #include <afs/afs_stats.h>              /* statistics */
 #include <sys/malloc.h>
 #include <sys/namei.h>

diff --git a/src/afs/DUX/osi_file.c b/src/afs/DUX/osi_file.c
index b016a76201b09a71ecca87259320183923676d0b..2ba492f479390a895bda5901e072c0de3be71068 100644 (file)
--- a/src/afs/DUX/osi_file.c
+++ b/src/afs/DUX/osi_file.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/DUX/osi_groups.c b/src/afs/DUX/osi_groups.c
index 77001be92f52ab080d525143d11997691d2ac0e7..d39aeb6112c4a829418842f8f37003a176ea44f6 100644 (file)
--- a/src/afs/DUX/osi_groups.c
+++ b/src/afs/DUX/osi_groups.c
@@ -14,13 +14,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 static int
 afs_getgroups(

diff --git a/src/afs/DUX/osi_inode.c b/src/afs/DUX/osi_inode.c
index 6fd4e6bca35b6bfb7745ff39c6ee7d50a0bcaa25..970895e3664fdee7bf61c07bcdc9672a120bd1d4 100644 (file)
--- a/src/afs/DUX/osi_inode.c
+++ b/src/afs/DUX/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include <ufs/ufsmount.h>
 
 /* given a vnode, return the `inode number'; if it's a UFS vnode just

diff --git a/src/afs/DUX/osi_misc.c b/src/afs/DUX/osi_misc.c
index e7fcdc7a44fbacb966aa0352c3f17d0db1308be6..6035f9fbf8738084f6219d71e4c945139b933dea 100644 (file)
--- a/src/afs/DUX/osi_misc.c
+++ b/src/afs/DUX/osi_misc.c
@@ -13,12 +13,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
 
 /*
  * afs_suser() returns true if the caller is superuser, false otherwise.

diff --git a/src/afs/DUX/osi_sleep.c b/src/afs/DUX/osi_sleep.c
index f90b598bacbd84df8e8b5bec5ac243a21719fdee..0e452a1afcfb31becf7047cdda9dd8d3952b2b93 100644 (file)
--- a/src/afs/DUX/osi_sleep.c
+++ b/src/afs/DUX/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/DUX/osi_vfsops.c b/src/afs/DUX/osi_vfsops.c
index ffc48ccefe1a98664ab826f1adfde6de6b01edcb..4063b6c5ae09103933c6a1c31fae63ee22cdceb5 100644 (file)
--- a/src/afs/DUX/osi_vfsops.c
+++ b/src/afs/DUX/osi_vfsops.c
@@ -11,13 +11,13 @@
  * osi_vfsops.c for DUX
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 #include <sys/types.h>
 #include <kern/mach_param.h>
 #include <sys/sysconfig.h>

diff --git a/src/afs/DUX/osi_vm.c b/src/afs/DUX/osi_vm.c
index ffc7bcaac7efaff0e20da7a2ee2d6edbb8ffc406..f6a8b92f82636a5778b3893d357c3fd24302a23f 100644 (file)
--- a/src/afs/DUX/osi_vm.c
+++ b/src/afs/DUX/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 #include <vm/vm_ubc.h>
 #include <values.h>
 

diff --git a/src/afs/DUX/osi_vnodeops.c b/src/afs/DUX/osi_vnodeops.c
index d1baa196525a990c034b0c9f0215a77368308a2f..d874ee11edfa8701a0a6baf053e955af7522fa84 100644 (file)
--- a/src/afs/DUX/osi_vnodeops.c
+++ b/src/afs/DUX/osi_vnodeops.c
@@ -12,19 +12,19 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
 #include <vm/vm_mmap.h>
 #include <vm/vm_ubc.h>
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 extern int afs_lookup(), afs_create(), afs_noop(), afs_open(), afs_close();

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index 8e666b6eafeebfddebf190e3709a55eea526c576..86016c60f25ead7fa110298d71c7fa315ad9d84b 100644 (file)
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c
index e55c535d2a8f21c64ecbb11cb49cd1542e6fa088..1c70217199eab6bcd364736eb8c054da668828de 100644 (file)
--- a/src/afs/FBSD/osi_groups.c
+++ b/src/afs/FBSD/osi_groups.c
@@ -15,13 +15,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 static int
 afs_getgroups(

diff --git a/src/afs/FBSD/osi_inode.c b/src/afs/FBSD/osi_inode.c
index 0942af3a811c3113e6099a2fc6ba8d7a9f0a275f..262bf5faad717afdf7372d9e98495e360f0c21ed 100644 (file)
--- a/src/afs/FBSD/osi_inode.c
+++ b/src/afs/FBSD/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include <sys/queue.h>
 #include <sys/lock.h>
 #include <ufs/ufsmount.h>

diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c
index 8e5a8ab6646729197d9f21d2fdc08e342db99cad..a073b9211512d19fc72be9c973d632b432cb334a 100644 (file)
--- a/src/afs/FBSD/osi_misc.c
+++ b/src/afs/FBSD/osi_misc.c
@@ -15,12 +15,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
 #include <sys/namei.h>
 /*
  * afs_suser() returns true if the caller is superuser, false otherwise.

diff --git a/src/afs/FBSD/osi_module.c b/src/afs/FBSD/osi_module.c
index 1b8fbd9da054489028e04691365c4b8f55917a4f..97551eafb5762c7b5a5eafe2511e762cbd237e80 100644 (file)
--- a/src/afs/FBSD/osi_module.c
+++ b/src/afs/FBSD/osi_module.c
@@ -2,7 +2,7 @@
 
 #include <afs/param.h>
 #include <afs/sysincludes.h>
-#include <afs/afsincludes.h>
+#include <afsincludes.h>
 #include <sys/module.h>
 #include <sys/sysproto.h>
 #include <sys/syscall.h>

diff --git a/src/afs/FBSD/osi_sleep.c b/src/afs/FBSD/osi_sleep.c
index 60a3f9b53090efc03b1c0169a6d7cab2edea6bc9..25889f410d8c808acb2dbbc50ca0a60a09ca990d 100644 (file)
--- a/src/afs/FBSD/osi_sleep.c
+++ b/src/afs/FBSD/osi_sleep.c
@@ -9,13 +9,13 @@
 
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index bbf1acc36f41ae0d40bf1b57a1350e4e180255c1..9eaf2276d7fa13b972f44dcca092e0b8dd5d7e37 100644 (file)
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -4,7 +4,7 @@
 RCSID("$Header$");
 
 #include <afs/sysincludes.h>            /* Standard vendor system headers */
-#include <afs/afsincludes.h>            /* Afs-based standard headers */
+#include <afsincludes.h>            /* Afs-based standard headers */
 #include <afs/afs_stats.h>              /* statistics */
 #include <sys/malloc.h>
 #include <sys/namei.h>

diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c
index ff2b5d23a6c4e1b76d59ce46b0c05357b9daaf95..8cc84c8e9bea3f3ced3ebb33a25afa008fcb8376 100644 (file)
--- a/src/afs/FBSD/osi_vm.c
+++ b/src/afs/FBSD/osi_vm.c
@@ -19,13 +19,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 #include <vm/vm_object.h>
 #include <vm/vm_map.h>
 #include <limits.h>

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index f6204e732531d02c3742a1934200717889e40be6..2bdbfd84ce702167304fbc1386ee182f8b9ac175 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -4,7 +4,7 @@
 RCSID("$Header$");
 
 #include <afs/sysincludes.h>            /* Standard vendor system headers */
-#include <afs/afsincludes.h>            /* Afs-based standard headers */
+#include <afsincludes.h>            /* Afs-based standard headers */
 #include <afs/afs_stats.h>              /* statistics */
 #include <sys/malloc.h>
 #include <sys/namei.h>

diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c
index 790c45a754d32645721e556f4c79828218a7d678..accd3de5f5927539a2102ef1534515be0e3025f5 100644 (file)
--- a/src/afs/HPUX/osi_file.c
+++ b/src/afs/HPUX/osi_file.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
-#include "../afs/osi_inode.h"  /* igetinode() */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
+#include "afs/osi_inode.h"     /* igetinode() */
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/HPUX/osi_groups.c b/src/afs/HPUX/osi_groups.c
index 49ac59497a1e3fbaa2f6721cab7d42fc902275ef..f0c8046f1c20aaff7b372bf559b75df260534e34 100644 (file)
--- a/src/afs/HPUX/osi_groups.c
+++ b/src/afs/HPUX/osi_groups.c
@@ -14,13 +14,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 static int
 afs_getgroups(

diff --git a/src/afs/HPUX/osi_inode.c b/src/afs/HPUX/osi_inode.c
index 8a4066a4d2804db96b087944317f8b208ed18ae4..a549fa810971e2f038345bcc978c0d8a150720de 100644 (file)
--- a/src/afs/HPUX/osi_inode.c
+++ b/src/afs/HPUX/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include <sys/mount.h>
 
 

diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h
index 60853aeb1cd7d399a3b0d918a8c551b2d833d369..bf144a53657acf1cc660484264e9f95320fa69ce 100644 (file)
--- a/src/afs/HPUX/osi_machdep.h
+++ b/src/afs/HPUX/osi_machdep.h
@@ -18,7 +18,7 @@
 #ifndef _OSI_MACHDEP_H_
 #define _OSI_MACHDEP_H_
 
-#include "../h/kern_sem.h"
+#include "h/kern_sem.h"
 
 #define        afs_hz      hz
 extern struct timeval time;

diff --git a/src/afs/HPUX/osi_misc.c b/src/afs/HPUX/osi_misc.c
index 55c53546ca5822d4ab0a4e140229b0f2c54f9f2c..b3c7a9e3719d38aadb148708ef1b42dc6323429e 100644 (file)
--- a/src/afs/HPUX/osi_misc.c
+++ b/src/afs/HPUX/osi_misc.c
@@ -13,12 +13,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
 
 /*
  * afs_suser() returns true if the caller is superuser, false otherwise.

diff --git a/src/afs/HPUX/osi_sleep.c b/src/afs/HPUX/osi_sleep.c
index 22394bff2750df58158b84938aee3fd181bb2f5d..022c644c776f7d7a63255d7545110493f2c1e2e6 100644 (file)
--- a/src/afs/HPUX/osi_sleep.c
+++ b/src/afs/HPUX/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/HPUX/osi_vfsops.c b/src/afs/HPUX/osi_vfsops.c
index 9a666b1284f5c079eb3642be5e70e60f92e2b062..36377bfaec0887309485f0a6edc994752ec7a2bf 100644 (file)
--- a/src/afs/HPUX/osi_vfsops.c
+++ b/src/afs/HPUX/osi_vfsops.c
@@ -11,13 +11,13 @@
  * osi_vfsops.c for HPUX
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 #include <sys/scall_kernprivate.h>
 
 

diff --git a/src/afs/HPUX/osi_vm.c b/src/afs/HPUX/osi_vm.c
index 4510e3bf60c5061dfc598370f17db07743a0e63f..11aa3f7c66a58a3ba869d3f909761ad529ad9600 100644 (file)
--- a/src/afs/HPUX/osi_vm.c
+++ b/src/afs/HPUX/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 /* Try to discard pages, in order to recycle a vcache entry.
  *

diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c
index cafe4b5e4fa75a0d6a06a18be1ffce332d86716c..049d508b09a9fed39d519239ae2d1f2860ffa20d 100644 (file)
--- a/src/afs/HPUX/osi_vnodeops.c
+++ b/src/afs/HPUX/osi_vnodeops.c
@@ -10,13 +10,13 @@
 /* This is a placeholder for routines unique to the port of AFS to hp-ux*/
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics stuff */
 
 #include <sys/uio.h>
 #include <sys/vfs.h>
@@ -160,25 +160,25 @@ afs_lockf( vp, flag, len, cred, fp, LB, UB )
 }
 
 
-#include "../machine/vmparam.h"        /* For KERNELSPACE */
-#include "../h/debug.h"
-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/vmmac.h"
-#include "../h/time.h"
-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
-#include "../h/dbd.h"
-#include "../h/vfd.h"
-#include "../h/region.h"
-#include "../h/pregion.h"
-#include "../h/vmmeter.h"
-#include "../h/user.h"
-#include "../h/sysinfo.h"
-#include "../h/pfdat.h"
-#include "../h/tuneable.h"
-#include "../h/buf.h"
-#include "../netinet/in.h"
+#include "machine/vmparam.h"   /* For KERNELSPACE */
+#include "h/debug.h"
+#include "h/types.h"
+#include "h/param.h"
+#include "h/vmmac.h"
+#include "h/time.h"
+#include "ufs/inode.h"
+#include "ufs/fs.h"
+#include "h/dbd.h"
+#include "h/vfd.h"
+#include "h/region.h"
+#include "h/pregion.h"
+#include "h/vmmeter.h"
+#include "h/user.h"
+#include "h/sysinfo.h"
+#include "h/pfdat.h"
+#include "h/tuneable.h"
+#include "h/buf.h"
+#include "netinet/in.h"
 
 /* a freelist of one */
 struct buf *afs_bread_freebp = 0;

diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c
index ac4bddfa7c59c5a1f50ebdc1af36fab534e364f2..9542c5376907c3cb80504a956b9b035c08f98b24 100644 (file)
--- a/src/afs/IRIX/osi_file.c
+++ b/src/afs/IRIX/osi_file.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
 
 int afs_osicred_initialized=0;
 afs_lock_t afs_xosi;           /* lock is for tvattr */

diff --git a/src/afs/IRIX/osi_groups.c b/src/afs/IRIX/osi_groups.c
index 97518a1ef41037f0396446246d37a5ead35c02f4..4b773f35116b014087fd174591f9b72567419980 100644 (file)
--- a/src/afs/IRIX/osi_groups.c
+++ b/src/afs/IRIX/osi_groups.c
@@ -16,13 +16,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 
 static int

diff --git a/src/afs/IRIX/osi_idbg.c b/src/afs/IRIX/osi_idbg.c
index c7abfe3337a8686a89a6209c6c016da88ad1976c..3e176f471be435ed68bfabcea560b07300fd6b3f 100644 (file)
--- a/src/afs/IRIX/osi_idbg.c
+++ b/src/afs/IRIX/osi_idbg.c
@@ -11,14 +11,14 @@
  * Implementation of Irix IDBG facility for AFS.
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_SGI62_ENV
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 
 /*

diff --git a/src/afs/IRIX/osi_inode.c b/src/afs/IRIX/osi_inode.c
index 300308c25ba18855780720a9c920c41eae149ba0..b1efb1ef510520fab5368ea255482b9b13195bd7 100644 (file)
--- a/src/afs/IRIX/osi_inode.c
+++ b/src/afs/IRIX/osi_inode.c
@@ -40,14 +40,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 
 #define BAD_IGET       -1000
 

diff --git a/src/afs/IRIX/osi_misc.c b/src/afs/IRIX/osi_misc.c
index 560e26e75a129b5fb8e12791d71c55938f4f5d18..70806613ba1347d7eb1cae4b17c460bcb161d605 100644 (file)
--- a/src/afs/IRIX/osi_misc.c
+++ b/src/afs/IRIX/osi_misc.c
@@ -11,14 +11,14 @@
  * Implementation of miscellaneous Irix routines.
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_SGI62_ENV
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 
 

diff --git a/src/afs/IRIX/osi_sleep.c b/src/afs/IRIX/osi_sleep.c
index 12bfbfae956a5462d47a83c2cfa8af1ffc27503f..3674bafd074703fb1dd55f66fc5777dc491d6958 100644 (file)
--- a/src/afs/IRIX/osi_sleep.c
+++ b/src/afs/IRIX/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/IRIX/osi_vfsops.c b/src/afs/IRIX/osi_vfsops.c
index 3c1b2fd9ec8c7522a565c7bf73a3b1628ead5998..2f922c550526ef44a38ac791218c456aa8b6a54b 100644 (file)
--- a/src/afs/IRIX/osi_vfsops.c
+++ b/src/afs/IRIX/osi_vfsops.c
@@ -11,13 +11,13 @@
  * osi_vfsops.c for IRIX
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 #include "sys/syssgi.h"
 
 

diff --git a/src/afs/IRIX/osi_vm.c b/src/afs/IRIX/osi_vm.c
index ca6c4175d649dbc46fb33f5215b477156398bc54..3d44051d32899e64f90f03e4c47dd119c453524b 100644 (file)
--- a/src/afs/IRIX/osi_vm.c
+++ b/src/afs/IRIX/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"     /* statistics */
 #include "sys/flock.h"         /* for IGN_PID */
 
 extern struct vnodeops Afs_vnodeops;

diff --git a/src/afs/IRIX/osi_vnodeops.c b/src/afs/IRIX/osi_vnodeops.c
index 50f6df245f1dd429271bceb1e2e28ee5b62c5585..51e4be7b75a8f6d07f93ac0ee4b49163792270e4 100644 (file)
--- a/src/afs/IRIX/osi_vnodeops.c
+++ b/src/afs/IRIX/osi_vnodeops.c
@@ -11,16 +11,16 @@
  * SGI specific vnodeops + other misc interface glue
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_SGI62_ENV
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../sys/flock.h" 
-#include "../afs/nfsclient.h"  
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
+#include "sys/flock.h" 
+#include "afs/nfsclient.h"  
 
 /* AFSBSIZE must be at least the size of a page, else the client will hang.
  * For 64 bit platforms, the page size is more than 8K.

diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c
index 431844bfa7de637151661ba7451aaf7f4a06f722..1f8d1a440aebca6066d43d40049a73735b9978ab 100644 (file)
--- a/src/afs/LINUX/osi_alloc.c
+++ b/src/afs/LINUX/osi_alloc.c
@@ -12,17 +12,17 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../h/mm.h"
-#include "../h/slab.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "h/mm.h"
+#include "h/slab.h"
 
-#include "../afs/afs_atomlist.h"
-#include "../afs/afs_lhash.h"
+#include "afs_atomlist.h"
+#include "afs_lhash.h"
 
 #define MAX_KMALLOC_SIZE PAGE_SIZE /* Max we should alloc with kmalloc */
 #define MAX_BUCKET_LEN 30 /* max. no. of entries per buckets we expect to see */
@@ -51,7 +51,7 @@ struct afs_lhash_stat afs_linux_lsb; /* hash table statistics */
 unsigned int afs_linux_hash_bucket_dist[MAX_BUCKET_LEN]; /* bucket population distribution in our hash table */
 
 #if defined(AFS_LINUX24_ENV)
-#include "../h/vmalloc.h"
+#include "h/vmalloc.h"
 #else
 /* externs : can we do this in a better way. Including vmalloc.h causes other
  * problems.*/

diff --git a/src/afs/LINUX/osi_cred.c b/src/afs/LINUX/osi_cred.c
index a362a78eacaf0a1b4651f593c2810936add24d80..087a49d58ee0c9817798c8de69210fe842e2e3c7 100644 (file)
--- a/src/afs/LINUX/osi_cred.c
+++ b/src/afs/LINUX/osi_cred.c
@@ -12,12 +12,12 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 
 /* Setup a pool for creds. Allocate several at a time. */
 #define CRED_ALLOC_STEP 29 /* at 140 bytes/cred = 4060 bytes. */

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 614df2b8e9560972144eb743b94f69fa30a5f0da..cbb16ecf70438973bca344632a5857fd3cb530e1 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
-#include "../h/smp_lock.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
+#include "h/smp_lock.h"
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index e031bd4568567feeb0b7b7f3c4ae221d49e62e67..ad7a080150a000af4e2a8c1fa1559b106cc972bb 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -14,15 +14,15 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 #ifdef AFS_LINUX22_ENV
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 
 static int afs_getgroups(cred_t *cr, gid_t *groups);

diff --git a/src/afs/LINUX/osi_inode.c b/src/afs/LINUX/osi_inode.c
index 200c4e6d33d0302f0374c91b6d386b7195a5f5cb..6625a6a1893dbc485c9a86ee1684f53bcfa922b1 100644 (file)
--- a/src/afs/LINUX/osi_inode.c
+++ b/src/afs/LINUX/osi_inode.c
@@ -18,14 +18,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 
 #define BAD_IGET       -1000
 

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 1b5d5d856b75064d970a0571e4a0e05f217b0f53..b952a62cb985785420ec264a594f9c52929a7737 100644 (file)
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -28,7 +28,7 @@
 
 
 #define afs_hz HZ
-#include "../h/sched.h"
+#include "h/sched.h"
 #define osi_Time() (xtime.tv_sec)
 #if  (CPU == sparc64)
 #define osi_GetTime(V) do { (*(V)).tv_sec = xtime.tv_sec; (*(V)).tv_usec = xtime.tv_usec; } while (0)

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index bafcbd7c89d97e920ee42a84793c96d1420b09b1..0a5cbc2c15a3b9318f3d2dc5d1a7dddce45797af 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -12,15 +12,15 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"
 #if defined(AFS_LINUX24_ENV)
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 
 char *crash_addr = 0; /* Induce an oops by writing here. */

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index b3e7cd2608911e46b88e02e567569603d45c946d..e51a5fac637fa5e220bb3dcff9a9c27d33680adb 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -12,14 +12,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../h/unistd.h" /* For syscall numbers. */
-#include "../h/mm.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "h/unistd.h" /* For syscall numbers. */
+#include "h/mm.h"
 
 #include <linux/module.h>
 #include <linux/slab.h>

diff --git a/src/afs/LINUX/osi_sleep.c b/src/afs/LINUX/osi_sleep.c
index 3ac172e7f9d53a4930e33c5473142f6503c970d5..a85448d4a40bfb2f7766d6ba0bf4c3b907a1df9d 100644 (file)
--- a/src/afs/LINUX/osi_sleep.c
+++ b/src/afs/LINUX/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
 

diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index 1479ca1a4ced1d8a18f8208194ce75da9bf00f00..d159c8966d70e59fb3c487e26d19e2ffce3927a3 100644 (file)
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -7,11 +7,11 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #include <linux/sysctl.h>
 #include <linux/config.h>

diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index e0e16938527f5e8247b26b9ccadaf5b503fa4340..e2784957b40c1c99bff2ea42d08cd21a2bd3d932 100644 (file)
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -13,16 +13,16 @@
  * super_block operations should return negated errno to Linux.
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"
-#include "../h/locks.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"
+#include "h/locks.h"
 #if defined(AFS_LINUX24_ENV)
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 
 #define __NO_VERSION__ /* don't define kernel_verion in module.h */

diff --git a/src/afs/LINUX/osi_vm.c b/src/afs/LINUX/osi_vm.c
index 26ac359412f6fb6958e93af64283870db65b25ab..0c15dcb87052a72b3e8706a9ffb93b8a746a5b2d 100644 (file)
--- a/src/afs/LINUX/osi_vm.c
+++ b/src/afs/LINUX/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"     /* statistics */
 
 /* Linux VM operations
  *

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 99112c49946654d411f13c590e84a7b53d61b3c4..972aac8a46b8cbc8f7e4f59ef368b72975553d8d 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -21,18 +21,18 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"
-#include "../afs/afs_osidnlc.h"
-#include "../h/mm.h"
-#include "../h/pagemap.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"
+#include "afs/afs_osidnlc.h"
+#include "h/mm.h"
+#include "h/pagemap.h"
 #if defined(AFS_LINUX24_ENV)
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 
 #ifdef pgoff2loff

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 317cb7e2e92d599da82f21efc2a8269c9557bfd8..a465faa132689fb62ed709c7d0b5414853850731 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -8,22 +8,15 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h
+all: depinstall
+
+depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \
+       ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
        esac
 
-# NOTE: linux case uses --new as well to work around bug in some versions of
-# gencat.
-kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afszcm.cat
-       -chmod 666 ${KERNELDIR}/afs/*
-       ${INSTALL} ${srcdir}/*.[csh] ${KERNELDIR}/afs
-       -${INSTALL} *.[csh] ${KERNELDIR}/afs
-       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${KERNELDIR}/afs
-       ${INSTALL} ${srcdir}/${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
-       -${INSTALL} ${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
-
 afs_trace.h afs_trace.msf: afs_trace.et
        ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et
 
@@ -42,19 +35,6 @@ afszcm.cat: afs_trace.msf
                        gencat afszcm.cat afs_trace.msf ;; \
        esac
 
-${KERNELDIR}/afs:
-       mkdir -p $@
-
-ukinstall: ${UKERNELDIR}/afs afs_trace.msf AFS_component_version_number.c
-       -chmod 666 ${UKERNELDIR}/afs/*
-       ${INSTALL} *.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/*.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/UKERNEL/*.[csh] ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
 install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \

diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c
index 185d793582804b492d024570e0532573bf90c85f..da66dc560c0a8112c4f466c2e6a974d875e76301 100644 (file)
--- a/src/afs/NBSD/osi_file.c
+++ b/src/afs/NBSD/osi_file.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/NBSD/osi_groups.c b/src/afs/NBSD/osi_groups.c
index 77f4d64890cde1b727590b53b619be2f7e0d20fe..c512413a1573eb914bdc5b666f22f7e297bd4602 100644 (file)
--- a/src/afs/NBSD/osi_groups.c
+++ b/src/afs/NBSD/osi_groups.c
@@ -16,13 +16,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 #define NOCRED  ((struct ucred *) -1)
 #define NOUID   ((uid_t) -1)

diff --git a/src/afs/NBSD/osi_inode.c b/src/afs/NBSD/osi_inode.c
index 2e77da016fd1d980297c3817c3c0a0bf23142c78..2b1020aa026287a03a79284882b53897338b523c 100644 (file)
--- a/src/afs/NBSD/osi_inode.c
+++ b/src/afs/NBSD/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 #include <sys/queue.h>
 #include <sys/lock.h>
 #include <ufs/ufsmount.h>

diff --git a/src/afs/NBSD/osi_misc.c b/src/afs/NBSD/osi_misc.c
index 1064a1a6405e67a22e42fc54eccb21c52b0c295c..8c48c799d3992be90bcb5a7dbeed7cedb7d29ce7 100644 (file)
--- a/src/afs/NBSD/osi_misc.c
+++ b/src/afs/NBSD/osi_misc.c
@@ -15,12 +15,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
 
 /*
  * afs_suser() returns true if the caller is superuser, false otherwise.

diff --git a/src/afs/NBSD/osi_sleep.c b/src/afs/NBSD/osi_sleep.c
index a22ff85e6e40231b0b59b3e3e084504a58d77e12..6948109d4b73de75bf68657d84ff68cf8ef72a06 100644 (file)
--- a/src/afs/NBSD/osi_sleep.c
+++ b/src/afs/NBSD/osi_sleep.c
@@ -9,13 +9,13 @@
 
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 
 

diff --git a/src/afs/NBSD/osi_vfsops.c b/src/afs/NBSD/osi_vfsops.c
index 752879a0cb6e19b085fb96017be18946e811143c..ff9d3a8de436d1b00328c0a554e957f812287d16 100644 (file)
--- a/src/afs/NBSD/osi_vfsops.c
+++ b/src/afs/NBSD/osi_vfsops.c
@@ -11,13 +11,13 @@
  * osi_vfsops.c for DUX
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 #include <sys/types.h>
 #include <kern/mach_param.h>
 #include <sys/sysconfig.h>

diff --git a/src/afs/NBSD/osi_vm.c b/src/afs/NBSD/osi_vm.c
index 275c82ab68c43f377a228b3843e8129278d9dbfc..8a100846131659d82015fd340f1e5e864544030a 100644 (file)
--- a/src/afs/NBSD/osi_vm.c
+++ b/src/afs/NBSD/osi_vm.c
@@ -19,13 +19,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 /* #include <vm/vm_ubc.h> */
 #include <limits.h>
 #include <float.h>

diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c
index badb165f8a7d1ff709dd3d7edf073fe9b405fb1c..23bb5f063c2d532fe29119026aaa3378ed658532 100644 (file)
--- a/src/afs/NBSD/osi_vnodeops.c
+++ b/src/afs/NBSD/osi_vnodeops.c
@@ -12,21 +12,21 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>
 #include <vm/vm_map.h>
 /* #include <vm/vm_ubc.h> */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 extern int afs_lookup(), afs_create(), afs_noop(), afs_open(), afs_close();

diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c
index 2df465bba13bbfb2888952a25350cb48b5758e9c..3b4f4e619c360340ec46a727ec40dcf14c4e317f 100644 (file)
--- a/src/afs/SOLARIS/osi_file.c
+++ b/src/afs/SOLARIS/osi_file.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* afs statistics */
-#include "../afs/osi_inode.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* afs statistics */
+#include "afs/osi_inode.h"
 
 
 int afs_osicred_initialized=0;

diff --git a/src/afs/SOLARIS/osi_groups.c b/src/afs/SOLARIS/osi_groups.c
index 86b25187c4154e1b0dbd620aca2b0a58ab81540f..048d4e3a82b3ac672050f65784b5b89fe8a05b9a 100644 (file)
--- a/src/afs/SOLARIS/osi_groups.c
+++ b/src/afs/SOLARIS/osi_groups.c
@@ -14,13 +14,13 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 
 static int

diff --git a/src/afs/SOLARIS/osi_inode.c b/src/afs/SOLARIS/osi_inode.c
index 159373c2e3b72dfbba4f0802909ebf8dc4bb809e..4fc5dfeb34583593cd79a65ca8b2646dc200c90e 100644 (file)
--- a/src/afs/SOLARIS/osi_inode.c
+++ b/src/afs/SOLARIS/osi_inode.c
@@ -14,14 +14,14 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/osi_inode.h"
-#include "../afs/afs_stats.h" /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/osi_inode.h"
+#include "afs/afs_stats.h" /* statistics stuff */
 
 extern int (*ufs_iallocp)(), (*ufs_iupdatp)(), (*ufs_igetp)(),
            (*ufs_itimes_nolockp)();

diff --git a/src/afs/SOLARIS/osi_sleep.c b/src/afs/SOLARIS/osi_sleep.c
index 5ea0c595c478951925b8d1bde82d04b0f851d23c..5505f10455607a6c0f78d0c3967d312c991456cf 100644 (file)
--- a/src/afs/SOLARIS/osi_sleep.c
+++ b/src/afs/SOLARIS/osi_sleep.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
 

diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c
index cb7af819eb765cb88d25f98c62ebe7a1a3400452..4db6cf4627eb8cde564a7ec61b192ade46e32729 100644 (file)
--- a/src/afs/SOLARIS/osi_vfsops.c
+++ b/src/afs/SOLARIS/osi_vfsops.c
@@ -11,15 +11,15 @@
  * osi_vfsops.c for SOLARIS
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
-#include "../h/modctl.h"
-#include "../h/syscall.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
+#include "h/modctl.h"
+#include "h/syscall.h"
 #include <sys/kobj.h>
 
 

diff --git a/src/afs/SOLARIS/osi_vm.c b/src/afs/SOLARIS/osi_vm.c
index 73a907e7db6cf7b880fb6699c4aae0a3bc122b32..d8a214bd5e6904fc901867e355513d41d8576cac 100644 (file)
--- a/src/afs/SOLARIS/osi_vm.c
+++ b/src/afs/SOLARIS/osi_vm.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../afs/nfsclient.h"  
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
+#include "afs/nfsclient.h"  
 
 #if    defined(AFS_SUN5_ENV)
 /* This file contains Solaris VM-related code for the cache manager. */

diff --git a/src/afs/SOLARIS/osi_vnodeops.c b/src/afs/SOLARIS/osi_vnodeops.c
index cc8b1118eb53906e169d02cd11167ce631b2b1d9..2f379c217686cd3d079aed6bc345d00af7b07c91 100644 (file)
--- a/src/afs/SOLARIS/osi_vnodeops.c
+++ b/src/afs/SOLARIS/osi_vnodeops.c
@@ -8,7 +8,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
@@ -32,10 +32,10 @@ RCSID("$Header$");
  * Variables: Afs_vnodeops
  *
  */
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../afs/nfsclient.h"  
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
+#include "afs/nfsclient.h"  
 
 
 #include <sys/mman.h>

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 63d3cbdd0de06fe184eeb263c6219a54d214a749..9763ab0854b3b122fa38940c63dc7d2923081562 100644 (file)
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -12,24 +12,24 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 
 #ifdef UKERNEL
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include <net/if.h>
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_usrops.h"
-#include "../afs/afs_stats.h"
-#include "../afs/auth.h"
-#include "../afs/cellconfig.h"
-#include "../afs/vice.h"
-#include "../afs/kautils.h"
-#include "../afs/afsutil.h"
-#include "../rx/rx_globals.h"
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs_usrops.h"
+#include "afs/afs_stats.h"
+#include "afs/auth.h"
+#include "afs/cellconfig.h"
+#include "afs/vice.h"
+#include "afs/kautils.h"
+#include "afs/afsutil.h"
+#include "rx/rx_globals.h"
 
 #define VFS 1
 #undef VIRTUE

diff --git a/src/afs/UKERNEL/afsincludes.h b/src/afs/UKERNEL/afsincludes.h
index ec40b53f73107bd37a948b78545a4d23efff36bd..049475d21d4aacd1755f112f3aabb36aad0978a2 100644 (file)
--- a/src/afs/UKERNEL/afsincludes.h
+++ b/src/afs/UKERNEL/afsincludes.h
@@ -8,21 +8,21 @@
  */
 
 /* AFS based headers */
-#include "../afs/stds.h"
-#include "../rx/rx.h"
-#include "../afs/afs_osi.h"
-#include "../afs/lock.h"
-#include "../afs/volerrors.h"
-#include "../afs/voldefs.h"
-#include "../afsint/afsint.h"
-#include "../afs/exporter.h"
-#include "../afsint/vldbint.h"
-#include "../afs/afs.h"
-#include "../afs/afs_chunkops.h"
-#include "../afs/rxkad.h"
-#include "../afs/prs_fs.h"
-#include "../afs/dir.h"
-#include "../afs/afs_axscache.h"
-#include "../afs/icl.h"
-#include "../afs/afs_stats.h"
-#include "../afs/afs_prototypes.h"
+#include "afs/stds.h"
+#include "rx/rx.h"
+#include "afs/afs_osi.h"
+#include "afs/lock.h"
+#include "afs/volerrors.h"
+#include "afs/voldefs.h"
+#include "afsint.h"
+#include "afs/exporter.h"
+#include "vldbint.h"
+#include "afs/afs.h"
+#include "afs/afs_chunkops.h"
+#include "rx/rxkad.h"
+#include "afs/prs_fs.h"
+#include "afs/dir.h"
+#include "afs/afs_axscache.h"
+#include "afs/icl.h"
+#include "afs/afs_stats.h"
+#include "afs/afs_prototypes.h"

diff --git a/src/afs/UKERNEL/osi_groups.c b/src/afs/UKERNEL/osi_groups.c
index 292bf08404f8c23ada0c228d7378d84a13e0bc58..71a641b1614cbae50496e6eb3c41166ea769784b 100644 (file)
--- a/src/afs/UKERNEL/osi_groups.c
+++ b/src/afs/UKERNEL/osi_groups.c
@@ -12,13 +12,13 @@
  * setpag (aliased to use_setpag in sysincludes.h)
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"  /* statistics */
 
 
 int afs_xsetgroups()

diff --git a/src/afs/UKERNEL/osi_machdep.h b/src/afs/UKERNEL/osi_machdep.h
index e6d95950dce67d418a1538313324fa8d25216131..b4a52465f0bbc3530a1eb06d836f44eb58e4d87a 100644 (file)
--- a/src/afs/UKERNEL/osi_machdep.h
+++ b/src/afs/UKERNEL/osi_machdep.h
@@ -18,7 +18,7 @@
 #ifndef _OSI_MACHDEP_H_
 #define _OSI_MACHDEP_H_
 
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 
 #define MAX_OSI_PATH            1024
 #define MAX_OSI_FILES           1024

diff --git a/src/afs/UKERNEL/osi_vfsops.c b/src/afs/UKERNEL/osi_vfsops.c
index ee3a8634baa0cc5d33d003afab802b85958761f2..db1fcdcdaa0fa4cb47b0a6d762587b2f31724f86 100644 (file)
--- a/src/afs/UKERNEL/osi_vfsops.c
+++ b/src/afs/UKERNEL/osi_vfsops.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 
 
 int afs_mount();
@@ -36,7 +36,7 @@ struct vcache *afs_globalVp = 0;
 int afs_rootCellIndex = 0;
 
 #if !defined(AFS_USR_AIX_ENV)
-#include "../sys/syscall.h"
+#include "sys/syscall.h"
 #endif
 
 afs_mount(afsp, path, data)

diff --git a/src/afs/UKERNEL/osi_vm.c b/src/afs/UKERNEL/osi_vm.c
index 2bdcefcda655063e0816291ed3bbc7535b345706..960a6464e9a4076ff0cd79ae7f37b544fad021f2 100644 (file)
--- a/src/afs/UKERNEL/osi_vm.c
+++ b/src/afs/UKERNEL/osi_vm.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 void osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred)
 {

diff --git a/src/afs/UKERNEL/osi_vnodeops.c b/src/afs/UKERNEL/osi_vnodeops.c
index 348c929a5a42a6279b2f1f5370683a9ca077c099..aaee487763a2b9bff092ead177777395061ce3f0 100644 (file)
--- a/src/afs/UKERNEL/osi_vnodeops.c
+++ b/src/afs/UKERNEL/osi_vnodeops.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"  /* statistics */
 
 extern int afs_noop();
 extern int afs_badop();

diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
index 06a8a277c0cf4666b6a8bde7ab03468aebee3c4e..69fcd333d7de6a1ea746120ea457a2cbff126070 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_access.c
+++ b/src/afs/VNOPS/afs_vnop_access.c
@@ -20,16 +20,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 #ifndef ANONYMOUSID
 #define ANONYMOUSID     32766 /* make sure this is same as in ptserver.h */

diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
index be797a85994402a2d92eb1ddc4f3ba73005ae048..c78dbd8c0ad6714234be239157ec3bdc33eae8d1 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_attrs.c
+++ b/src/afs/VNOPS/afs_vnop_attrs.c
@@ -19,16 +19,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 extern afs_rwlock_t afs_xcbhash;
 struct afs_exporter *afs_nfsexporter;

diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c
index e3e90a3f7abad4b71ce93d6c48cb838804e9905f..6064e34c2dbbf04c81495bdacf9a97a4ccb6c67a 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_create.c
+++ b/src/afs/VNOPS/afs_vnop_create.c
@@ -14,16 +14,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 /* question: does afs_create need to set CDirty in the adp or the avc?
  * I think we can get away without it, but I'm not sure.  Note that

diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c
index a5fd19e66430493dfc5c42803b578012a70caac4..a3f2a63eca2fe02d905d7920c31615e8d344b856 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_dirops.c
+++ b/src/afs/VNOPS/afs_vnop_dirops.c
@@ -18,16 +18,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 extern afs_rwlock_t afs_xvcache;
 extern afs_rwlock_t afs_xcbhash;

diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c
index d366c40e93a4a84ceddf7c9eafd96d84bca7c3c9..74d1878d2adb535733ebf7eb083867ff92ef4d16 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_fid.c
+++ b/src/afs/VNOPS/afs_vnop_fid.c
@@ -15,17 +15,17 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #if !defined(AFS_DUX40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index bbec38f1ddb1099029c09619462db4ca571df6bb..2d84703b9c7c4f11ef06d96973b222ad439be5b8 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -13,16 +13,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 /* Static prototypes */
 static int HandleGetLock(register struct vcache *avc,

diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c
index f53ecb12c36ff0e68855694722e79aab57a73ac3..d240a0e36526cec03acab29164de46247d9ae1ce 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_link.c
+++ b/src/afs/VNOPS/afs_vnop_link.c
@@ -14,16 +14,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 extern afs_rwlock_t afs_xcbhash;
 

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index 5ecde68a6f69483b643b76eaa81d883d2346d208..ff779de8d1cca83f7299762497de1d808506cdc3 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -20,17 +20,17 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/exporter.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/exporter.h"
+#include "afs/afs_osidnlc.h"
 
 
 /**

diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c
index 93612d4875d3733d6b78f176e8f6d7d42d05c8c6..2fcf8ce4696378e7ce7c4437e4bd265869ba2a27 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_open.c
+++ b/src/afs/VNOPS/afs_vnop_open.c
@@ -15,16 +15,16 @@
 
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 

diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c
index 4f01069a6d4d9b3c273bab6b4a9436cbd21c98a3..cb2c55f86fbe8e51c8f8ae1ce0fbd13110db6210 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_read.c
+++ b/src/afs/VNOPS/afs_vnop_read.c
@@ -17,16 +17,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 extern char afs_zeros[AFS_ZEROS];

diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c
index c50bfb25b7a2da3059e4ed0071fe0524fa88c7b2..4cd97de410289fd18f63f8b3bbf0a7628a0e5733 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_readdir.c
+++ b/src/afs/VNOPS/afs_vnop_readdir.c
@@ -20,16 +20,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 /**

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index 661e6dac1978476977f34254a3d2361b90a149f3..135a996cdeb2184835d8fc5571c8d09a916afedf 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -20,16 +20,16 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 extern afs_rwlock_t afs_xvcache;

diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c
index 9d2bb286585dc2d8df546d469559a95144cae8af..942c2a25dc602ab252a1e9a2e641a581f94c823c 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_rename.c
+++ b/src/afs/VNOPS/afs_vnop_rename.c
@@ -15,16 +15,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 extern afs_rwlock_t afs_xcbhash;
 

diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c
index 17d22b175c46f2b753dc03792b208c028b43ac1f..f5b2a643e0d6d994a4153ff479d9cd153141010e 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_strategy.c
+++ b/src/afs/VNOPS/afs_vnop_strategy.c
@@ -13,18 +13,18 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #if !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX20_ENV)
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 

diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c
index 2580aae32531e0ce12dae77f72954004f73976d5..4f4cbc9db9eeeea92ae09ab49317dd058e03c173 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_symlink.c
+++ b/src/afs/VNOPS/afs_vnop_symlink.c
@@ -19,16 +19,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 extern afs_rwlock_t afs_xvcache;
 extern afs_rwlock_t afs_xcbhash;

diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c
index bd3321b7e6622eb0f37d0428eeca500e0700cfa3..8e014b0e4b5ac51d2e49a24f17bb0673ac95bfdb 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_write.c
+++ b/src/afs/VNOPS/afs_vnop_write.c
@@ -18,16 +18,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 extern unsigned char *afs_indexFlags;

diff --git a/src/afs/afs.h b/src/afs/afs.h
index ff9463b92d36535795a42e8b410e2ab5d7a9b334..b2d029badacff26dd595a63ab3454294b5adc706 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -15,7 +15,7 @@
 #ifdef KDUMP_KERNEL
 #include <afs/afs_args.h>
 #else
-#include "../afs/afs_args.h"
+#include "afs/afs_args.h"
 #endif
 
 

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index 105d65a37c9e8c6901cc5c329720614a3ebb469f..c27f242c6cc56180b874057a4334d90c708980b3 100644 (file)
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -11,12 +11,12 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #ifndef UKERNEL
 #if !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV)
@@ -25,16 +25,16 @@ RCSID("$Header$");
 #endif
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
 #endif
 #endif /* !UKERNEL */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
-#include "../afs/afs_util.h"
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
+#include "afs/afs_util.h"
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afs_axscache.c b/src/afs/afs_axscache.c
index 150bf2b65b60c9dc39eac43c217d33c57c65bda4..23083c6be74bbac2b49384adbbec7f4d4f48fe03 100644 (file)
--- a/src/afs/afs_axscache.c
+++ b/src/afs/afs_axscache.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
 #include "afs/stds.h"
 static struct axscache *afs_axsfreelist = NULL;
 static struct xfreelist { struct xfreelist *next; } *xfreemallocs = 0;

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index dad53c5a0bd4d596d43fe16d54fc48a533777250..7dbb4751f29d4d2deb7251999cf0f891044d35ef 100644 (file)
--- a/src/afs/afs_buffer.c
+++ b/src/afs/afs_buffer.c
@@ -8,42 +8,42 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #if !defined(UKERNEL)
-#include "../h/param.h"
-#include "../h/types.h"
-#include "../h/time.h"
+#include "h/param.h"
+#include "h/types.h"
+#include "h/time.h"
 #if    defined(AFS_AIX31_ENV) || defined(AFS_DEC_ENV)
-#include "../h/limits.h"
+#include "h/limits.h"
 #endif
 #if    !defined(AFS_AIX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX20_ENV)
-#include "../h/kernel.h"    /* Doesn't needed, so it should go */
+#include "h/kernel.h"    /* Doesn't needed, so it should go */
 #endif
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afs_osi.h"
-#include "../afsint/afsint.h"
-#include "../afs/lock.h"
+#include "afs/afs_osi.h"
+#include "afsint.h"
+#include "afs/lock.h"
 
 #if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV)
-#include "../h/buf.h"
+#include "h/buf.h"
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/stds.h"
-#include "../afs/volerrors.h"
-#include "../afs/exporter.h"
-#include "../afs/prs_fs.h"
-#include "../afs/afs_chunkops.h"
-#include "../afs/dir.h"
+#include "afs/stds.h"
+#include "afs/volerrors.h"
+#include "afs/exporter.h"
+#include "afs/prs_fs.h"
+#include "afs/afs_chunkops.h"
+#include "afs/dir.h"
 
-#include "../afs/afs_stats.h"
-#include "../afs/longc_procs.h"
-#include "../afs/afs.h"
+#include "afs/afs_stats.h"
+#include "afs/longc_procs.h"
+#include "afs/afs.h"
 
 #ifndef        BUF_TIME_MAX
 #define        BUF_TIME_MAX    0x7fffffff

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 5c5c33fc276fe90c25c0c6d642461f9890b133c6..39a1309e18d9773f10d1dc86ab1c5dc3e4ab516d 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -8,25 +8,25 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"
-#include "../rx/rx_globals.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"
+#include "rx/rx_globals.h"
 #if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV)
 #include "net/if.h"
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "netinet/in_var.h"
 #endif
 #endif /* !defined(UKERNEL) */
 #ifdef AFS_LINUX22_ENV
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 
 

diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c
index 4b3c2dc38f87b0e64a24fbfd75ef590c339aa3d5..4285fc41bfe50f92e4ed40a865520e957e2f9d3d 100644 (file)
--- a/src/afs/afs_callback.c
+++ b/src/afs/afs_callback.c
@@ -14,14 +14,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"  /*Cache Manager stats*/
-#include "../afs/afs_args.h"
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_stats.h"     /*Cache Manager stats*/
+#include "afs/afs_args.h"
 
 afs_int32 afs_allCBs   = 0;            /*Break callbacks on all objects */
 afs_int32 afs_oddCBs   = 0;            /*Break callbacks on dirs*/

diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c
index 62e32b59acef721602c144f3dcd72e8b50f0f232..33c0147d8f23b434e4d6cbb64b1706e3212f86ea 100644 (file)
--- a/src/afs/afs_cbqueue.c
+++ b/src/afs/afs_cbqueue.c
@@ -72,16 +72,16 @@
  * granted with a shorter expiration time.
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_cbqueue.h"
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_cbqueue.h"
 #include "afs/afs.h"
-#include "../afs/lock.h"
-#include "../afs/afs_stats.h"
+#include "afs/lock.h"
+#include "afs/afs_stats.h"
 
 static unsigned int base = 0;
 static unsigned int basetime = 0;

diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c
index 76e92dcdc9ecc6f996a015c7ace9500b858bcdee..8f2ee0ecd22056595662f75b4bfc9ecdf5fd067d 100644 (file)
--- a/src/afs/afs_cell.c
+++ b/src/afs/afs_cell.c
@@ -11,15 +11,15 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
-#include "../afs/afs_osi.h"
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
+#include "afs/afs_osi.h"
 
 /* Local variables. */
 afs_rwlock_t afs_xcell;                /* Export for cmdebug peeking at locks */

diff --git a/src/afs/afs_chunk.c b/src/afs/afs_chunk.c
index 1059a01e5f3f3dd03531287346083cc61e830f94..b2720396b4f8d6ab083466cdb114b205b9cc9029 100644 (file)
--- a/src/afs/afs_chunk.c
+++ b/src/afs/afs_chunk.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h"
+#include "afs/stds.h"
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h"
 
 /*
  * Chunk module.

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index f476246e76bcb67b5545d763ad9151c014162e20..e06751b19ba35d4dae549bedd17ebf53b3f7d9f6 100644 (file)
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -11,27 +11,27 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #if !defined(UKERNEL)
 #include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
 #endif /* ! AFS_HPUX110_ENV */
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c
index 43a8cc7d231b0069c99387f91cf6814d24126ab4..a913e2ecdeadff061b2aa9e1e3774e38de97cb84 100644 (file)
--- a/src/afs/afs_daemons.c
+++ b/src/afs/afs_daemons.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics gathering code */
-#include "../afs/afs_cbqueue.h" 
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics gathering code */
+#include "afs/afs_cbqueue.h" 
 #ifdef AFS_AIX_ENV
 #include <sys/adspace.h>       /* for vm_att(), vm_det() */
 #endif

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index d2d7bee7cd58f3cc00a714783dc94b721f24834b..c93059391c09d5d603bf3cb485dd11edac944992 100644 (file)
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -11,15 +11,15 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_stats.h"  /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/afs_osidnlc.h"
 
 /* Forward declarations. */
 static void afs_GetDownD(int anumber, int *aneedSpace);

diff --git a/src/afs/afs_dynroot.c b/src/afs/afs_dynroot.c
index 892a63dfe564b0207a3dc714e2ac494537ce338b..8cc5697bfffaea68a3092aacbaff14407f59e64b 100644 (file)
--- a/src/afs/afs_dynroot.c
+++ b/src/afs/afs_dynroot.c
@@ -26,17 +26,17 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h"
-#include "../afs/afs_osi.h"
-#include "../afsint/afsint.h"
-#include "../afs/lock.h"
+#include "afs/stds.h"
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h"
+#include "afs/afs_osi.h"
+#include "afsint.h"
+#include "afs/lock.h"
 
-#include "../afs/prs_fs.h"
-#include "../afs/dir.h"
+#include "afs/prs_fs.h"
+#include "afs/dir.h"
 
 #define AFS_DYNROOT_CELLNAME   "dynroot"
 #define AFS_DYNROOT_VOLUME     1

diff --git a/src/afs/afs_exporter.c b/src/afs/afs_exporter.c
index 68e184c80739f10663734811c7e4edba019875a5..49fc81b984c77c7e3dffd4f1da68fda4e29aba4a 100644 (file)
--- a/src/afs/afs_exporter.c
+++ b/src/afs/afs_exporter.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics gathering code */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics gathering code */
 
 struct afs_exporter    *root_exported=0;   /* Head of "exporters" link list */
 afs_lock_t             afs_xexp;

diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c
index fbf7650257eef6ba6a891718a38cccc11d28f0dc..8b35c5238391a6b7ee0d85bd861934fdbba22061 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -14,14 +14,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 /* Exported variables */
 struct osi_dev cacheDev;           /*Cache device*/

diff --git a/src/afs/afs_lock.c b/src/afs/afs_lock.c
index 7d8da9302556c4499258e5a216e03e65683ffb36..9e666fa71898062997815777776104c005426322 100644 (file)
--- a/src/afs/afs_lock.c
+++ b/src/afs/afs_lock.c
@@ -23,13 +23,13 @@
 */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* afs statistics */
 
 /* probably needed if lock_trace is enabled - should ifdef */
 int afs_trclock=0;

diff --git a/src/afs/afs_mariner.c b/src/afs/afs_mariner.c
index 022640b343ffdcf5e743f7a974207a18699b2a1d..1a8d7094e3436dada253175380c861c3733b2b68 100644 (file)
--- a/src/afs/afs_mariner.c
+++ b/src/afs/afs_mariner.c
@@ -14,13 +14,13 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"  /* statistics */
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_stats.h"  /* statistics */
 
 /* Exported variables */
 struct rx_service *afs_server;

diff --git a/src/afs/afs_memcache.c b/src/afs/afs_memcache.c
index 8981c2ca0fd3eca4aef2cb69a77caca5fc76a52f..b0104326d37f48317b2517e0d54c450cc4ad58ec 100644 (file)
--- a/src/afs/afs_memcache.c
+++ b/src/afs/afs_memcache.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 #ifndef AFS_LINUX22_ENV
-#include "../rpc/types.h"
+#include "rpc/types.h"
 #endif
 #ifdef AFS_ALPHA_ENV
 #undef kmem_alloc
@@ -23,8 +23,8 @@ RCSID("$Header$");
 #undef mem_free
 #undef register
 #endif  /* AFS_ALPHA_ENV */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
 
 /* memory cache routines */
 static struct memCacheEntry *memCache;

diff --git a/src/afs/afs_nfsclnt.c b/src/afs/afs_nfsclnt.c
index 27481415d0383968d9949dd12bbaf11da9b79c72..a2ce0b320b47056872864ecec27bd1c8e356c142 100644 (file)
--- a/src/afs/afs_nfsclnt.c
+++ b/src/afs/afs_nfsclnt.c
@@ -8,16 +8,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #if !defined(AFS_NONFSTRANS) || defined(AFS_AIX_IAUTH_ENV)
 #ifndef        AFS_DEC_ENV
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../afs/nfsclient.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"     /* statistics */
+#include "afs/nfsclient.h"
 
 int afs_nfsclient_reqhandler(), afs_nfsclient_hold(), afs_PutNfsClientPag();
 int afs_nfsclient_sysname(), afs_nfsclient_GC(), afs_nfsclient_stats();

diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c
index feabd4e3cdfb67ca0d9f1b260306a2e4e2eb2c03..ac365409a6c70699076f8fab54653a86c8905905 100644 (file)
--- a/src/afs/afs_nfsdisp.c
+++ b/src/afs/afs_nfsdisp.c
@@ -8,32 +8,32 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 /* Ugly Ugly Ugly  but precludes conflicting XDR macros; We want kernel xdr */
 #define __XDR_INCLUDE__
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h" /* Standard vendor system headers */
 #if defined(AFS_SUN55_ENV) && !defined(AFS_NONFSTRANS) 
-#include "../rpc/types.h"
-#include "../rpc/auth.h"
-#include "../rpc/auth_unix.h"
-#include "../rpc/auth_des.h"
+#include "rpc/types.h"
+#include "rpc/auth.h"
+#include "rpc/auth_unix.h"
+#include "rpc/auth_des.h"
 #if !defined(AFS_SUN58_ENV)
-#include "../rpc/auth_kerb.h"
+#include "rpc/auth_kerb.h"
 #endif
-#include "../sys/tiuser.h"
-#include "../rpc/xdr.h"
-#include "../rpc/svc.h"
-#include "../nfs/nfs.h"
-#include "../nfs/export.h"
-#include "../nfs/nfs_clnt.h"
-#include "../nfs/nfs_acl.h"
-#include "../afs/afsincludes.h"        
-#include "../afs/afs_stats.h"   
-#include "../afs/exporter.h"
+#include "sys/tiuser.h"
+#include "rpc/xdr.h"
+#include "rpc/svc.h"
+#include "nfs/nfs.h"
+#include "nfs/export.h"
+#include "nfs/nfs_clnt.h"
+#include "nfs/nfs_acl.h"
+#include "afs/afsincludes.h"   
+#include "afs/afs_stats.h"   
+#include "afs/exporter.h"
 
 static int xlatorinit_v2_done=0;
 static int xlatorinit_v3_done=0;

diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index f9d36a96e0222ff218ec867c23a3cf906d2e487b..01f3980f9d2bd426fd6bff0db49c324862b8f4ca 100644 (file)
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -8,13 +8,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 #ifdef AFS_AIX_ENV
 #include <sys/adspace.h>       /* for vm_att(), vm_det() */
 #endif

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index c311a7fdfd782dbabb02535b3ce41953a462c320..37c407da3d27a4298fe29576acb7a6bd32d7b5ab 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -10,8 +10,8 @@
 #ifndef _AFS_OSI_
 #define _AFS_OSI_
 
-#include "../h/types.h"
-#include "../h/param.h"
+#include "h/types.h"
+#include "h/param.h"
 
 #ifdef AFS_LINUX20_ENV
 #ifndef _LINUX_CODA_FS_I
@@ -23,8 +23,8 @@ struct coda_inode_info {};
 #define _LINUX_XFS_FS_I
 struct xfs_inode_info {};
 #endif
-#include "../h/fs.h"
-#include "../h/mm.h"
+#include "h/fs.h"
+#include "h/mm.h"
 #endif
 
 
@@ -376,7 +376,7 @@ typedef struct timeval osi_timeval_t;
 /* Now include system specific OSI header file. It will redefine macros
  * defined here as required by the OS.
  */
-#include "../afs/osi_machdep.h"
+#include "osi_machdep.h"
 
 /* Declare any structures which use these macros after the OSI implementation
  * has had the opportunity to redefine them.

diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c
index 5303825a3bb8b0a70dea9275519e14d3c786d31e..9fcc118c1bb2e0c6a70e3484b2f277c958c501d6 100644 (file)
--- a/src/afs/afs_osi_alloc.c
+++ b/src/afs/afs_osi_alloc.c
@@ -8,15 +8,15 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #ifdef AFS_AIX41_ENV
 #include "sys/lockl.h"

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 4ee71a0cfe8322b0b6b45fe3197f547b2ceacbf2..736c77722828ba30c506b34f94c0827a55ef803d 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -20,16 +20,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 /* Imported variables */

diff --git a/src/afs/afs_osi_uio.c b/src/afs/afs_osi_uio.c
index 38bbd9d3ac2922d5f88f336cb7b2ac5ef59deb22..2065755a1dcbecc6165feee9b1f3ac0cb0456569 100644 (file)
--- a/src/afs/afs_osi_uio.c
+++ b/src/afs/afs_osi_uio.c
@@ -8,16 +8,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 /*

diff --git a/src/afs/afs_osi_vget.c b/src/afs/afs_osi_vget.c
index 025470b213b5f2a27c7b4e48c0fce9a1021e19f2..423d2fbc5df35b333112d051bd12a353cf0198e7 100644 (file)
--- a/src/afs/afs_osi_vget.c
+++ b/src/afs/afs_osi_vget.c
@@ -12,13 +12,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* statistics stuff */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* statistics stuff */
 
 
 

diff --git a/src/afs/afs_osidnlc.c b/src/afs/afs_osidnlc.c
index 8bfdcb514377814591fb760414a97c6a679071e4..69098ccabf6f091195a57b8d3314022c184ca1a8 100644 (file)
--- a/src/afs/afs_osidnlc.c
+++ b/src/afs/afs_osidnlc.c
@@ -8,16 +8,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
 #include "afs/afs.h"
-#include "../afs/lock.h"
-#include "../afs/afs_stats.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/lock.h"
+#include "afs/afs_stats.h"
+#include "afs/afs_osidnlc.h"
 
 /* Things to do:
  *    also cache failed lookups.

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 9f0c39c33113774f39665621b457e1e51f41e43d..c14dd46f9506d69e64c28f0c2babb7e9e75a1b1b 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -8,15 +8,15 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
-#include "../afs/vice.h"
-#include "../rx/rx_globals.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
+#include "afs/vice.h"
+#include "rx/rx_globals.h"
 
 struct VenusFid afs_rootFid;
 afs_int32 afs_waitForever=0;

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 5a2ceca284601e959a18ec8aab39a009e1b85714..57c9dfd2b32da0c855248441205ccfb28f888546 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -878,7 +878,7 @@ extern afs_int32 RXSTATS_ExecuteRequest(struct rx_call *acall);
 
 
 #if defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#include "../afs/osi_prototypes.h"
+#include "osi_prototypes.h"
 #endif
 
 #endif /* _AFS_PROTOTYPES_H_ */

diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c
index 8c1f978372d45e03ea62c3c154bdb68d10610116..f34d5ebe266c494f789c1e3d11e3eeed95ea5e57 100644 (file)
--- a/src/afs/afs_segments.c
+++ b/src/afs/afs_segments.c
@@ -11,15 +11,15 @@
  * --------------------- Required definitions ---------------------
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"  /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_stats.h"  /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/afs_osidnlc.h"
 
 afs_uint32 afs_stampValue=0;
 

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 10ba950ba9a2913f2e80d27b0a931dc04e92cf24..a71e7df7f94ccb9f674e6c98d5238e1dfe73c754 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -30,19 +30,19 @@
  * 
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #if !defined(UKERNEL)
 #include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
@@ -52,8 +52,8 @@ RCSID("$Header$");
 #endif
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afs_stat.c b/src/afs/afs_stat.c
index 591a6a8143fbbbd77877454e3d9ac2a13a8e76db..7398ea881595f90b1d14fe5b98d4a107828816a6 100644 (file)
--- a/src/afs/afs_stat.c
+++ b/src/afs/afs_stat.c
@@ -10,12 +10,12 @@
 /* statistics-gathering package */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
 #include "afs_stats.h"
 
 struct afs_CMStats afs_cmstats;

diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index c23e95cc5969203f66639c4cb1d3f787f55321f7..8f72c5fcc38e21144188efc05235d6555b6a4c64 100644 (file)
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -17,7 +17,7 @@
 #ifndef __TRANSARC_AFS_STATS_H__
 #define __TRANSARC_AFS_STATS_H__
 
-#include "../afs/param.h"
+#include "afs/param.h"
 
 /* the following is to work around a VAX compiler limitation */
 #if defined(vax)

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index cea8927976db7aab2ee4910173cd7cbbee5b7568..d456bdaf0df7e75fc89867c596b423ea7ff5c80d 100644 (file)
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -11,27 +11,27 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #if !defined(UKERNEL)
 #include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
 #endif /* ! AFS_HPUX110_ENV */
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index 798d01a9cdcda8f4150000fb99e3782c04bdedf4..114510936a88f8ac6bdeb51180935a547314437c 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -13,27 +13,27 @@
  * Implements:
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #if !defined(UKERNEL)
 #include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
 #endif /* ! AFS_HPUX110_ENV */
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index d5fb0aaa4acfe9acf2844ee7f2baa22cad42da97..ef21a4dfdffaef46c96330aa86065f29a39e6e00 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -36,15 +36,15 @@
  *
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"
-#include "../afs/afs_cbqueue.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h" /*Standard vendor system headers*/
+#include "afsincludes.h" /*AFS-based standard headers*/
+#include "afs/afs_stats.h"
+#include "afs/afs_cbqueue.h"
+#include "afs/afs_osidnlc.h"
 
 #ifdef AFS_OSF_ENV
 afs_int32 afs_maxvcount = 0;           /* max number of vcache entries */

diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c
index 559576a338f08223fa550f7e00a5fbd9574b0f19..1286028ce0f29e2c061e87c69a0f1384adfa6b6e 100644 (file)
--- a/src/afs/afs_volume.c
+++ b/src/afs/afs_volume.c
@@ -16,27 +16,27 @@
  * afs_FindVolume
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 
 #if !defined(UKERNEL)
 #include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
 #include <netinet/in_var.h>
 #endif /* ! AFS_HPUX110_ENV */
 #endif /* !defined(UKERNEL) */
 
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"   /* afs statistics */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"   /* afs statistics */
 
 #if    defined(AFS_SUN56_ENV)
 #include <inet/led.h>

diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h
index 5c224210eb7b210b8973777708e8adbb3370d39a..98bb633519be911febff023cc0398624dad7ff05 100644 (file)
--- a/src/afs/afsincludes.h
+++ b/src/afs/afsincludes.h
@@ -7,30 +7,34 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#ifdef UKERNEL
+#include <UKERNEL/afsincludes.h>
+#else
+
 #include <afsconfig.h>
 
 /* AFS based headers */
-#include "../afs/stds.h"
+#include "afs/stds.h"
 #ifdef AFS_AIX_ENV
-#include "../afs/osi_vfs.h"
+#include "osi_vfs.h"
 #else
 #ifdef AFS_DEC_ENV
-#include "../afs/gfs_vfs.h"
-#include "../afs/gfs_vnode.h"
+#include "afs/gfs_vfs.h"
+#include "afs/gfs_vnode.h"
 #else
 #ifdef AFS_HPUX_ENV
-#include "../afs/osi_vfs.h"
+#include "osi_vfs.h"
 #endif /* AFS_HPUX_ENV */
 #endif /* AFS_DEC_ENV */
 #endif /* AFS_AIX_ENV */
 #if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)
-#include "../afs/osi_vfs.h"
+#include "osi_vfs.h"
 #endif
-#include "../rx/rx.h"
-#include "../afs/afs_osi.h"
-#include "../afs/lock.h"
-#include "../afs/volerrors.h"
-#include "../afs/voldefs.h"
+#include "rx/rx.h"
+#include "afs/afs_osi.h"
+#include "afs/lock.h"
+#include "afs/volerrors.h"
+#include "afs/voldefs.h"
 #ifdef AFS_LINUX20_ENV
 #ifdef TRUE
 #undef TRUE
@@ -41,19 +45,21 @@
 #undef __NFDBITS
 #undef __FDMASK
 #endif
-#include "../afsint/afsint.h"
-#include "../afs/exporter.h"
-#include "../afsint/vldbint.h"
-#include "../afs/afs.h"
-#include "../afs/afs_chunkops.h"
-/*#include "../afs/auxinode.h" -- used only in afs_istuff.c */
-#include "../afs/rxkad.h"
-#include "../afs/prs_fs.h"
-#include "../afs/dir.h"
-#include "../afs/afs_axscache.h"
-#include "../afs/icl.h"
-#include "../afs/afs_stats.h"
-#include "../afs/afs_prototypes.h"
+#include "afsint.h"
+#include "afs/exporter.h"
+#include "vldbint.h"
+#include "afs/afs.h"
+#include "afs/afs_chunkops.h"
+/*#include "afs/auxinode.h"    -- used only in afs_istuff.c */
+#include "rx/rxkad.h"
+#include "afs/prs_fs.h"
+#include "afs/dir.h"
+#include "afs/afs_axscache.h"
+#include "afs/icl.h"
+#include "afs/afs_stats.h"
+#include "afs/afs_prototypes.h"
 #if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#include "../afs/osi_machdep.h"
+#include "osi_machdep.h"
+#endif
+
 #endif

diff --git a/src/afs/libafsdep b/src/afs/libafsdep
new file mode 100644 (file)
index 0000000..6c2baf2
--- /dev/null
+++ b/src/afs/libafsdep
@@ -0,0 +1,4 @@
+MKAFS_OSTYPE/*.[chs]
+MKAFS_OSTYPE/*.hin
+VNOPS/*.[chs]
+*.[chs]

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 1806ad921448615e414392dd01491fcf59b70a1c..41a9b0398b60a916272c00318a6f79bd828cb8fc 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -7,6 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#ifdef UKERNEL
+#include <UKERNEL/sysincludes.h>
+#else
+
 #ifndef __AFS_SYSINCLUDESH__
 #define __AFS_SYSINCLUDESH__ 1
 
@@ -84,24 +88,24 @@ typedef unsigned short                  etap_event_t;
 #endif
 #endif
 #if    !defined(AFS_OSF_ENV)
-#include "../h/errno.h"
-#include "../h/types.h"
-#include "../h/param.h"
+#include "h/errno.h"
+#include "h/types.h"
+#include "h/param.h"
 
 #ifdef AFS_AUX_ENV
 #ifdef PAGING
-#include "../h/mmu.h"
-#include "../h/seg.h"
-#include "../h/page.h"
-#include "../h/region.h"
+#include "h/mmu.h"
+#include "h/seg.h"
+#include "h/page.h"
+#include "h/region.h"
 #endif /* PAGING */
-#include "../h/sysmacros.h"
-#include "../h/signal.h"
-#include "../h/var.h"
+#include "h/sysmacros.h"
+#include "h/signal.h"
+#include "h/var.h"
 #endif /* AFS_AUX_ENV */
 
-#include "../h/systm.h"
-#include "../h/time.h"
+#include "h/systm.h"
+#include "h/time.h"
 
 #ifdef AFS_AIX_ENV
 #ifdef AFS_AIX41_ENV
@@ -119,18 +123,18 @@ typedef unsigned short                  etap_event_t;
 
 #if defined(AFS_SGI_ENV)
 #include "values.h"
-#include "../sys/sema.h"
-#include "../sys/cmn_err.h"
+#include "sys/sema.h"
+#include "sys/cmn_err.h"
 #ifdef AFS_SGI64_ENV
 #include <ksys/behavior.h>
 #endif /* AFS_SGI64_ENV */
-#include "../fs/efs_inode.h"
+#include "fs/efs_inode.h"
 #ifdef AFS_SGI_EFS_IOPS_ENV
-#include "../sgiefs/efs.h"
+#include "sgiefs/efs.h"
 #endif
-#include "../sys/kmem.h"
-#include "../sys/cred.h"
-#include "../sys/resource.h"
+#include "sys/kmem.h"
+#include "sys/cred.h"
+#include "sys/resource.h"
 
 /*
  * ../sys/debug.h defines ASSERT(), but it is nontrivial only if DEBUG
@@ -143,20 +147,20 @@ typedef unsigned short                  etap_event_t;
  */
 #if defined(AFS_SGI65_ENV) && !defined(DEBUG)
 #define DEBUG
-#include "../sys/debug.h"
+#include "sys/debug.h"
 #undef DEBUG
 #else
-#include "../sys/debug.h"
+#include "sys/debug.h"
 #endif
 
-#include "../sys/statvfs.h"
-#include "../sys/sysmacros.h"
-#include "../sys/fs_subr.h"
-#include "../sys/siginfo.h"
+#include "sys/statvfs.h"
+#include "sys/sysmacros.h"
+#include "sys/fs_subr.h"
+#include "sys/siginfo.h"
 #endif  /* AFS_SGI_ENV */
 
 #if !defined(AFS_AIX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_SGI_ENV)
-#  include "../h/kernel.h"
+#  include "h/kernel.h"
 #endif /* !SUN5 && !SGI */
 
 #ifdef AFS_SUN5_ENV
@@ -164,45 +168,45 @@ typedef unsigned short                  etap_event_t;
 #endif
 
 #if    defined(AFS_SUN56_ENV)
-#include "../h/vfs.h"          /* stops SUN56 socketvar.h warnings */
-#include "../h/stropts.h"      /* stops SUN56 socketvar.h warnings */
-#include "../h/stream.h"       /* stops SUN56 socketvar.h errors */
+#include "h/vfs.h"             /* stops SUN56 socketvar.h warnings */
+#include "h/stropts.h" /* stops SUN56 socketvar.h warnings */
+#include "h/stream.h"  /* stops SUN56 socketvar.h errors */
 #endif
 
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/protosw.h"
+#include "h/socket.h"
+#include "h/socketvar.h"
+#include "h/protosw.h"
 
 #if defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_FBSD_ENV)
-#  include "../h/dirent.h"
+#  include "h/dirent.h"
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/sysmacros.h"
-#    include "../h/fs/ufs_fsdir.h"
+#    include "h/sysmacros.h"
+#    include "h/fs/ufs_fsdir.h"
 #  endif /* AFS_SUN5_ENV */
 #else
-#  include "../h/dir.h"
+#  include "h/dir.h"
 #endif /* SGI || SUN || HPUX */
 
 #ifdef AFS_DEC_ENV
-#  include "../h/smp_lock.h"
+#  include "h/smp_lock.h"
 #endif /* AFS_DEC_ENV */
 
 
 #if !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV)
-#include "../h/user.h"
+#include "h/user.h"
 #endif /* AFS_SGI64_ENV */
 #define        MACH_USER_API   1
-#include "../h/file.h"
-#include "../h/uio.h"
-#include "../h/buf.h"
-#include "../h/stat.h"
+#include "h/file.h"
+#include "h/uio.h"
+#include "h/buf.h"
+#include "h/stat.h"
 
 
 /* ----- The following mainly deal with vnodes/inodes stuff ------ */
 #ifdef AFS_DEC_ENV
-#  include "../h/mount.h"
-#  include "../machine/psl.h"
-#  include "../afs/gfs_vnode.h"
+#  include "h/mount.h"
+#  include "machine/psl.h"
+#  include "afs/gfs_vnode.h"
 #endif
 
 #ifdef AFS_MACH_ENV
@@ -218,12 +222,12 @@ typedef unsigned short                  etap_event_t;
 
 #ifndef AFS_DEC_ENV
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/statvfs.h"
+#    include "h/statvfs.h"
 #  endif /* AFS_SUN5_ENV */
 #  ifdef AFS_HPUX_ENV
 struct vfspage;                        /* for vnode.h compiler warnings */
-#    include "../h/swap.h"     /* for struct swpdbd, for vnode.h compiler warnings */
-#    include "../h/dbd.h"      /* for union idbd, for vnode.h compiler warnings */
+#    include "h/swap.h"        /* for struct swpdbd, for vnode.h compiler warnings */
+#    include "h/dbd.h" /* for union idbd, for vnode.h compiler warnings */
 #  endif /* AFS_HPUX_ENV */
 #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV)
 #  include <sys/uio.h>
@@ -253,16 +257,16 @@ MALLOC_DECLARE(M_AFS);
 #  include <ufs/ufs/inode.h>
 #  include <ufs/ffs/fs.h>
 #else
-#  include "../h/vfs.h"
-#  include "../h/vnode.h"
+#  include "h/vfs.h"
+#  include "h/vnode.h"
 #  ifdef       AFS_SUN5_ENV
-#    include "../h/fs/ufs_inode.h"
-#    include "../h/fs/ufs_mount.h"
+#    include "h/fs/ufs_inode.h"
+#    include "h/fs/ufs_mount.h"
 #  else
 #    if !defined(AFS_SGI_ENV) && !defined(AFS_AIX32_ENV)
-#      include "../ufs/inode.h"
+#      include "ufs/inode.h"
 #      if !defined(AFS_SGI_ENV) && !defined(AFS_HPUX_ENV)
-#        include "../ufs/mount.h"
+#        include "ufs/mount.h"
 #      endif /* !AFS_HPUX_ENV */
 #    endif /* !AFS_AIX32_ENV */
 #  endif /* AFS_SUN5_ENV */
@@ -270,55 +274,55 @@ MALLOC_DECLARE(M_AFS);
 #endif /* AFS_DEC_ENV */
 
 /* These mainly deal with networking and rpc headers */
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #undef MFREE   /* defined at mount.h for AIX */
 #ifdef AFS_SUN5_ENV
-#  include "../h/time.h"
+#  include "h/time.h"
 #else
-#  include "../h/mbuf.h"
+#  include "h/mbuf.h"
 #endif /* AFS_SUN5_ENV */
 
-#include "../rpc/types.h"
-#include "../rx/xdr.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 
 #ifdef AFS_AIX32_ENV
 #  include "net/spl.h"
 #endif
 
 /* Miscellaneous headers */
-#include "../h/proc.h"
+#include "h/proc.h"
 #if !defined(AFS_FBSD_ENV)
-#include "../h/ioctl.h"
+#include "h/ioctl.h"
 #endif /* AFS_FBSD_ENV */
 
 #if    defined(AFS_HPUX101_ENV)
-#include "../h/proc_iface.h"
-#include "../h/vas.h"
+#include "h/proc_iface.h"
+#include "h/vas.h"
 #endif
 
 #if    defined(AFS_HPUX102_ENV)
-#include "../h/unistd.h"
-#include "../h/tty.h"
+#include "h/unistd.h"
+#include "h/tty.h"
 #endif
 
 #if !defined(AFS_SGI_ENV) && !defined(AFS_SUN_ENV) && !defined(AFS_MACH_ENV) && !defined(AFS_AIX32_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV)
 
-#  include "../h/text.h"
+#  include "h/text.h"
 #endif 
 
 
 #if    defined(AFS_AIX_ENV) || defined(AFS_DEC_ENV)
-#  include "../h/flock.h"      /* fcntl.h is a user-level include in aix */
+#  include "h/flock.h" /* fcntl.h is a user-level include in aix */
 #else
-#  include "../h/fcntl.h"
+#  include "h/fcntl.h"
 #endif /* AIX || DEC */
 
 #if defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
-#  include "../h/unistd.h"
+#  include "h/unistd.h"
 #endif /* SGI || SUN */
 
 #ifdef AFS_AIX32_ENV
-#  include "../h/vmuser.h"
+#  include "h/vmuser.h"
 #endif /* AFS_AIX32_ENV */
 
 #if    defined(AFS_SUN5_ENV)
@@ -383,3 +387,5 @@ MALLOC_DECLARE(M_AFS);
 #endif /* AFS_OBSD_ENV */
 
 #endif /* __AFS_SYSINCLUDESH__  so idempotent */
+
+#endif

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index b5f796efd0304a7c5d3dbe030570e9f3bad837ae..f5080e806610a8f0d14bea2b90a754d0e88405fe 100644 (file)
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@@ -114,23 +114,10 @@ netscape_afs_web_secure:
        chmod a+x ${DEST}/root.afsweb/install/${NETSCAPE_INSTALL_SCRIPT}
        chmod a+w ${DEST}/root.afsweb/install/${NETSCAPE_INSTALL_SCRIPT}
 
-all: kinstall ukinstall
+all: 
 
 install:  
 
-kinstall:
-       @echo No $@ source here.
-
-
-webinstall: ${UKERNELDIR}/afs ${UKSRCS}
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-ukinstall:
-       @echo No $@ source here.
-
 ##
 ## For Apache Afs Web Secure libraries and binaries
 ## NOTE: APACHE_INCLUDES should point to the Apache src directory where 

diff --git a/src/afsweb/apache_includes/1.3.1/alloc.h b/src/afsweb/apache_includes/1.3.1/alloc.h
index 902be1ed7065be5fec55cf190a5899ce92961c8b..715b8aceab142f954d83fbbfdac8803fe050da54 100644 (file)
--- a/src/afsweb/apache_includes/1.3.1/alloc.h
+++ b/src/afsweb/apache_includes/1.3.1/alloc.h
@@ -85,7 +85,7 @@ extern "C" {
 
  /* Need declaration of DIR on Win32 */
 #ifdef WIN32
-#include "../os/win32/readdir.h"
+#include "os/win32/readdir.h"
 #endif
 
 typedef struct pool pool;

diff --git a/src/afsweb/apache_includes/1.3.1/ap_config.h b/src/afsweb/apache_includes/1.3.1/ap_config.h
index d12a44bb0c9f8a6aa5dd012722d63e12e59d2000..7a223cc542d0f5fb973b464a92d8d14a73d22b8d 100644 (file)
--- a/src/afsweb/apache_includes/1.3.1/ap_config.h
+++ b/src/afsweb/apache_includes/1.3.1/ap_config.h
@@ -85,7 +85,7 @@ stat() properly */
 #ifdef WIN32
 /* include process.h first so we can override spawn[lv]e* properly */
 #include <process.h>
-#include "../os/win32/os.h"
+#include "os/win32/os.h"
 #else
 #include "os.h"
 #endif
@@ -892,7 +892,7 @@ typedef int rlim_t;
 #endif
 
 #ifdef WIN32
-#include "../include/hsregex.h"
+#include "include/hsregex.h"
 #elif defined(USE_HSREGEX)
 #include "hsregex.h"
 #else

diff --git a/src/afsweb/apache_includes/1.3.6/alloc.h b/src/afsweb/apache_includes/1.3.6/alloc.h
index 8a0e21f5d5c0d825fdadc61850aae63afbc71d74..1faab62d0472db7f98b2b26c2330658d408e2d1c 100644 (file)
--- a/src/afsweb/apache_includes/1.3.6/alloc.h
+++ b/src/afsweb/apache_includes/1.3.6/alloc.h
@@ -85,7 +85,7 @@ extern "C" {
 
  /* Need declaration of DIR on Win32 */
 #ifdef WIN32
-#include "../os/win32/readdir.h"
+#include "os/win32/readdir.h"
 #endif
 
 typedef struct pool pool;

diff --git a/src/afsweb/apache_includes/1.3.6/ap_config.h b/src/afsweb/apache_includes/1.3.6/ap_config.h
index a33d5630dcc752b581898dfa19b01dfd7e93e889..a63043450284f65e39cbf859b0c5d3dce43c6823 100644 (file)
--- a/src/afsweb/apache_includes/1.3.6/ap_config.h
+++ b/src/afsweb/apache_includes/1.3.6/ap_config.h
@@ -110,7 +110,7 @@ stat() properly */
 #ifdef WIN32
 /* include process.h first so we can override spawn[lv]e* properly */
 #include <process.h>
-#include "../os/win32/os.h"
+#include "os/win32/os.h"
 #else
 #include "os.h"
 #endif
@@ -1006,7 +1006,7 @@ typedef int rlim_t;
 #endif
 
 #ifdef WIN32
-#include "../include/hsregex.h"
+#include "include/hsregex.h"
 #elif defined(USE_HSREGEX)
 #include "hsregex.h"
 #else

diff --git a/src/afsweb/nsafs.c b/src/afsweb/nsafs.c
index 51dde9cbe7b3548ea6860e15d5a2ec48ad621acc..6bd69e8f3119325c36209865be3e99457858879d 100644 (file)
--- a/src/afsweb/nsafs.c
+++ b/src/afsweb/nsafs.c
@@ -12,20 +12,20 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include <net/if.h>
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"
-#include "../afs/afs_usrops.h"
-#include "../afs/auth.h"
-#include "../afs/cellconfig.h"
-#include "../afs/vice.h"
-#include "../afs/kautils.h"
-#include "../afs/nsafs.h"
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"
+#include "afs_usrops.h"
+#include "afs/auth.h"
+#include "afs/cellconfig.h"
+#include "afs/vice.h"
+#include "afs/kautils.h"
+#include "afs/nsafs.h"
 
 #define NSAFS_DFLT_RCVTHREADS  2       /* Dflt number recevice threads */
 #define NSAFS_BUFFER_SIZE      4096    /* Send/Receive buffer size */
@@ -183,7 +183,7 @@ void nsafs_decode64(char *buf)
 /*
  * Interface for pioctls - used for unlogging 
  */
-#include "../afs/venus.h"
+#include "afs/venus.h"
 int do_pioctl(char *in_buffer, int in_size, 
               char *out_buffer, int out_size, 
               int opcode, char *path, int followSymLinks)

diff --git a/src/afsweb/securehash.c b/src/afsweb/securehash.c
index aac3417afa507ee74ef08a6f07def85504e64259..848995c83f21017c622d84b0b60a6e433e058db4 100644 (file)
--- a/src/afsweb/securehash.c
+++ b/src/afsweb/securehash.c
@@ -26,18 +26,18 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include <net/if.h>
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h"
-#include "../afs/auth.h"
-#include "../afs/cellconfig.h"
-#include "../afs/vice.h"
-#include "../afs/nsafs.h"
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h"
+#include "afs/auth.h"
+#include "afs/cellconfig.h"
+#include "afs/vice.h"
+#include "afs/nsafs.h"
 
 static int big_endian;
 

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index b55ce93a19180463a097165e85fc78cbd1db996b..b16cde44bef94ebac2775045fb0297e45e4e1138 100644 (file)
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -17,18 +17,12 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
-all: ukinstall ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
+all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
 
 # XXX-INST: where to install the AIX audit files?
-install:  ${DESTDIR}${libdir}/afs/libaudit.a ${DESTDIR}${includedir}/afs/audit.h
-
-ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afs/audit.h
-
-${UKERNELDIR}/afs:
-       mkdir -p ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs/audit.h: audit.h
-       ${INSTALL} $? $@
+install: \
+       ${DESTDIR}${libdir}/afs/libaudit.a \
+       ${DESTDIR}${includedir}/afs/audit.h
 
 ${DEST}/include/afs/audit.h: audit.h
        ${INSTALL} $? $@

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index ade7c3cd31fad0db147d865e0b00147829ca5697..8caf9d5daa73dabb46bfc89cf5585a3956998034 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -23,7 +23,9 @@ KSRCS=auth.h
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
        ktc.c authcon.c ktc_errors.c
 
-all: kinstall ukinstall ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h copyauth setkey
+all: ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a depinstall copyauth setkey
+
+depinstall: ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h
 
 cellconfig.o: cellconfig.c ${INCLS}
 ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
@@ -68,45 +70,6 @@ ktc_errors.c auth.h: ktc_errors.et auth.p.h
 #
 # Install targets
 #
-kinstall: ${KERNELDIR}/afs/auth.h
-
-${KERNELDIR}/afs/auth.h: auth.h
-       ${INSTALL} $? $@
-
-ukinstall: \
-       ${UKERNELDIR}/afs/auth.h \
-       ${UKERNELDIR}/afs/cellconfig.h \
-       ${UKERNELDIR}/afs/acfg_errors.c \
-       ${UKERNELDIR}/afs/keys.h \
-       ${UKERNELDIR}/afs/cellconfig.c \
-       ${UKERNELDIR}/afs/ktc.c \
-       ${UKERNELDIR}/afs/authcon.c \
-       ${UKERNELDIR}/afs/ktc_errors.c
-
-${UKERNELDIR}/afs/auth.h: auth.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/cellconfig.h: cellconfig.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/cellconfig.c: cellconfig.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/acfg_errors.c: acfg_errors.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/keys.h: keys.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ktc.c: ktc.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/authcon.c: authcon.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ktc_errors.c: ktc_errors.c
-       ${INSTALL} $? $@
-
 install:   ${DESTDIR}${libdir}/afs/libauth.a ${DESTDIR}${libdir}/afs/libauth.krb.a ${DESTDIR}${includedir}/afs/keys.h ${DESTDIR}${includedir}/afs/cellconfig.h ${DESTDIR}${includedir}/afs/auth.h ${DESTDIR}${sbindir}/copyauth 
 
 ${DEST}/lib/afs/libauth.a: libauth.a

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index a462ad947abc25b3bc68a4014bb5dcdfa9dd9356..f532e450ab593a48c91e08a60e01255b647ce5e5 100644 (file)
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,17 +17,17 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../afs/pthread_glock.h"
-#include "../des/des.h"
-#include "../rx/rxkad.h"
-#include "../rx/rx.h"
-#include "../afs/cellconfig.h"
-#include "../afs/keys.h"
-#include "../afs/auth.h"
-#include "../afs/pthread_glock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "afs/pthread_glock.h"
+#include "des/des.h"
+#include "rx/rxkad.h"
+#include "rx/rx.h"
+#include "afs/cellconfig.h"
+#include "afs/keys.h"
+#include "afs/auth.h"
+#include "afs/pthread_glock.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 817bbfad18500640895abec1162d0f08afbb966c..763d97a91a08b5e6ba749918c1d913c45a5f088b 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -15,8 +15,8 @@ RCSID("$Header$");
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
 #ifdef UKERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #else /* UKERNEL */
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index b304e5a2176c540eeac942733ffb8f28d174b893..ef3d3a7d3243f5c610052793126c5404624a7746 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -19,15 +19,15 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../afs/pthread_glock.h"
-#include "../afs/vice.h"
-#include "../afs/auth.h"
-#include "../afs/venus.h"
-#include "../afs/pthread_glock.h"
-#include "../afs/dirpath.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "afs/pthread_glock.h"
+#include "afs/vice.h"
+#include "afs/auth.h"
+#include "afs/venus.h"
+#include "afs/pthread_glock.h"
+#include "afs/dirpath.h"
 
 #if !defined(min)
 #define min(a,b) ((a)<(b)?(a):(b))

diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c
index cc952dd8cf538fb6717e1a28b496688dbe9ce5d2..caefafa816c34a7d1bbaeb1e403636623e061c2e 100644 (file)
--- a/src/auth/ktc_nt.c
+++ b/src/auth/ktc_nt.c
@@ -25,7 +25,7 @@ RCSID("$Header$");
 #include <rpc.h>
 #include <afs/smb_iocons.h>
 #include <afs/pioctl_nt.h>
-#include "../WINNT/afsd/afsrpc.h"
+#include "WINNT/afsd/afsrpc.h"
 #include <afs/vice.h>
 #include "auth.h"
 #include <afs/afsutil.h>

diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
index d85e3dc42143aef7681488839185e4cb5c526d3b..60b59e3f8840eb0523714e4e1c7ab58e4416e7bf 100644 (file)
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@@ -30,9 +30,6 @@ dtest: dtest.o
 
 system: test
 
-kinstall:
-       @echo No kernel source here.
-
 clean:
        $(RM) -f  *.a *.o ctest dtest itest core
 

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index 828237b6a88779b0992437b33981ef87d79ee2f9..c661998cafd8278ff3d17a910cdd5689bdf9a3ce 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -9,7 +9,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config -I. -I${srcdir} ${XCFLAGS}
 
-all: ukinstall compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a
+all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a
 
 et_lex.lex.c: et_lex.lex.l
        $(RM) -f et_lex.lex.c
@@ -30,42 +30,8 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
 #
 # Installation targets
 #
-ukinstall: \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/com_err.c \
-       ${UKERNELDIR}/afs/com_err.h \
-       ${UKERNELDIR}/afs/error_msg.c \
-       ${UKERNELDIR}/afs/error_table.h \
-       ${UKERNELDIR}/afs/mit-sipb-cr.h \
-       ${UKERNELDIR}/afs/internal.h \
-       ${UKERNELDIR}/afs/et_name.c
-
 install:  ${DESTDIR}${bindir}/compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a
 
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afs/com_err.c: com_err.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/com_err.h: com_err.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/error_msg.c: error_msg.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/error_table.h: error_table.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/internal.h: internal.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/et_name.c: et_name.c
-       ${INSTALL} $? $@
-
 ${DEST}/bin/compile_et: compile_et
        ${INSTALL} $? $@
 

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index bc845b8ffa6f0b6bbfc6a4339f9c8fe132f40458..9b8e1c1eff7f0f932ca3199158c36cb9c5c41b17 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -12,7 +12,7 @@ CFLAGS=$(DBG) -I${TOP_INCDIR} -I. ${XCFLAGS}
 
 INST=$(RM) -f $@; $(CP) $? $@
 
-all: config mkvers ukinstall kinstall \
+all: config mkvers \
        ${TOP_INCDIR}/afs/param.h \
        ${TOP_INCDIR}/afs/stds.h \
        ${TOP_INCDIR}/afs/afs_sysnames.h \
@@ -34,12 +34,6 @@ Makefile.version: ${srcdir}/Makefile.version-CML Makefile.version-NOCML
 AFS_component_version_number.c: Makefile.version
        $(MAKE) -f Makefile.version AFS_component_version_number.c
 
-${KERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
-       $(INST)
-
-${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
-       $(INST)
-
 #
 # App build/install targets
 #
@@ -58,25 +52,16 @@ config.o: ${srcdir}/config.c AFS_component_version_number.c
 #
 # Include installation targets
 #
-KDIRS = ${KERNELDIR}/afs \
-       ${KERNELDIR}/rx \
-       ${KERNELDIR}/afsint \
-       ${KERNELDIR}/config
 
-$(KDIRS): 
+${TOP_INCDIR}/afs: ${TOP_INCDIR}
        mkdir -p $@
 
-UKDIRS = ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/rx \
-       ${UKERNELDIR}/afsint \
-       ${UKERNELDIR}/config
-
-$(UKDIRS): 
+${TOP_INCDIR}:
        mkdir -p $@
 
 # XXX inlined INST
-${KERNELDIR}/afs/param.h ${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: ${srcdir}/param.${SYS_NAME}.h ${AFS_PARAM_COMMON}
-       if [ X${AFS_PARAM_COMMON} != X ] ; then \
+${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: ${TOP_INCDIR}/afs ${srcdir}/param.${SYS_NAME}.h ${AFS_PARAM_COMMON}
+       if [ "X${AFS_PARAM_COMMON}" != "X" ] ; then \
                cat ${srcdir}/${AFS_PARAM_COMMON} ${srcdir}/param.${SYS_NAME}.h > param.h.new ; \
                $(RM) -f $@; \
                 $(CP) param.h.new $@ ; \
@@ -84,27 +69,24 @@ ${KERNELDIR}/afs/param.h ${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs
                $(RM) -f $@; $(CP) ${srcdir}/param.${SYS_NAME}.h $@ ; \
        fi
 
-${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${TOP_INCDIR}/afs/afs_sysnames.h: ${srcdir}/afs_sysnames.h
+${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${TOP_INCDIR}/afs/afs_sysnames.h: ${srcdir}/afs_sysnames.h
        $(INST)
 
-${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: ${srcdir}/stds.h
+${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: ${srcdir}/stds.h
        $(INST)
 
-${UKERNELDIR}/afs/icl.h ${KERNELDIR}/afs/icl.h ${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: ${srcdir}/icl.h 
+${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: ${srcdir}/icl.h 
        $(INST)
 
-${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: ${srcdir}/afs_args.h 
+${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: ${srcdir}/afs_args.h 
        $(INST)
 
-${UKERNELDIR}/afs/venus.h ${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: ${srcdir}/venus.h 
+${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: ${srcdir}/venus.h 
        $(INST)
 
 ${DEST}/include/afs/debug.h ${DESTDIR}${includedir}/afs/debug.h ${TOP_INCDIR}/afs/debug.h: ${srcdir}/debug.h 
        $(INST)
 
-${UKERNELDIR}/afs/param.h: ${srcdir}/param.${SYS_NAME}_usr.h
-       $(INST)
-
 # these are needed to compile the kernel.  Config is necessary to
 # convert the MakefileProto in libafs and the kernel links provide the
 # kernel include environment.  param.h is, well, param.h.  The afs_sysnames.h
@@ -118,25 +100,6 @@ install: ${DESTDIR}${includedir}/afs/param.h \
        ${DESTDIR}${includedir}/afs/venus.h \
        ${DESTDIR}${includedir}/afs/debug.h
 
-kinstall: \
-       $(KDIRS) \
-       ${KERNELDIR}/afs/param.h \
-       ${KERNELDIR}/afs/stds.h \
-       ${KERNELDIR}/afs/afs_sysnames.h \
-       ${KERNELDIR}/afs/afs_args.h \
-       ${KERNELDIR}/afs/icl.h \
-       ${KERNELDIR}/afs/AFS_component_version_number.c
-
-ukinstall: \
-       $(UKDIRS) \
-       ${UKERNELDIR}/afs/param.h \
-       ${UKERNELDIR}/afs/stds.h \
-       ${UKERNELDIR}/afs/afs_sysnames.h \
-       ${UKERNELDIR}/afs/afs_args.h \
-       ${UKERNELDIR}/afs/icl.h \
-       ${UKERNELDIR}/afs/venus.h \
-       ${UKERNELDIR}/afs/AFS_component_version_number.c
-
 clean:
        $(RM) -f *.o config mkvers core xprt AFS_component_version_number.c param.h.new
 

diff --git a/src/config/libafsdep b/src/config/libafsdep
new file mode 100644 (file)
index 0000000..a5cae2e
--- /dev/null
+++ b/src/config/libafsdep
@@ -0,0 +1,4 @@
+make_vnode.pl
+Makefile.config.in
+Makefile.version
+afsconfig.h.in

diff --git a/src/config/make_libafs_tree.pl b/src/config/make_libafs_tree.pl
new file mode 100755 (executable)
index 0000000..0e27934
--- /dev/null
+++ b/src/config/make_libafs_tree.pl
@@ -0,0 +1,224 @@
+#!/usr/bin/perl
+$| = 1;
+#
+# Build the libafs_tree by reading component list files in the src dir, and copying the
+# listed files from the src and obj dirs into the libafs_tree directory. 
+#
+# Dependent components are listed in file named "libafsdep" in each dir with dependencies.
+#
+use File::Find;
+use File::Path;
+
+my $quiet = 0;
+my $showonly = 0;
+
+while ( $_ = shift @ARGV )
+{
+       if (m/^-t/) { $treedir = testArg( shift @ARGV ); next; }
+       if (m/^-p/) { $projdir = testArg( shift @ARGV ); next; }
+       if (m/^-sn/) { $sysname = testArg( shift @ARGV ); next; }
+
+       if (m/^-os/) { $ostype = testArg( shift @ARGV ); next; }
+       elsif (m/^-o/) { $objdir  = testArg( shift @ARGV ); next; }
+
+       if (m/^-q/) { $quiet = 1; next; }
+       if (m/^-n/) { $showonly = 1; next; }
+       usage;
+}
+if ( !$treedir || !$projdir || !$ostype || !$sysname)
+{
+       &usage;
+       exit 1;
+}
+if ( !$objdir )
+{
+       $objdir = $projdir;
+}
+
+$quiet || print "libafs_tree_dir = $treedir\n";
+$quiet || print "top_proj_dir = $projdir\n";
+$quiet || print "top_obj_dir = $objdir\n";
+$quiet || print "\n";
+my $qprojdir = quotemeta($projdir);
+
+#
+# Start with an empty dir
+#
+if ( -e $treedir && ! -d $treedir )
+{
+       die "Ick. Destination is not a directory and already exists!\n";
+}
+elsif ( -e $treedir )
+{
+       #$quiet || print "Cleaning up previous tree build:\n";
+       #rmtree([$treedir],!$quiet,0);
+       #$quiet || print "Done.\n\n";
+}
+
+#
+# Find all the dep list files in the src dir
+#
+finddepth(\&find_libafsdep, $projdir);
+
+#
+# Manual actions
+#
+&copyit("$projdir/configure-libafs", "$treedir/configure-libafs");
+&copyit("$projdir/Makefile-libafs.in", "$treedir/Makefile.in");
+
+system("$objdir/src/config/config", 
+       "$projdir/src/libafs/MakefileProto.$ostype.in", 
+       "$treedir/src/libafs/Makefile.in",
+       $sysname);
+
+#
+# Subs
+#
+
+sub find_libafsdep
+{
+       my ($fname) = $_;
+
+       if ( $fname eq "libafsdep" )
+       {
+               &process_libafsdep($File::Find::dir, $fname);
+       }
+}
+
+sub process_libafsdep
+{
+       my ($dir, $depname) = @_;
+       my ($file);
+
+       my $subdir = $dir;
+       $subdir =~ s|^$qprojdir||o;
+       $subdir =~ s|^/||gio;
+       $subdir =~ s|/$||gio;
+
+       print "# $dir/$depname\n";
+       open(COMPS, "$dir/$depname");
+       while ( defined($file = <COMPS>) )
+       {
+               my ($destdir, $proj_src,$obj_src);
+
+               chomp($file);
+               $file =~ s|#.*||gio;
+
+               #
+               # do some simple substitution in dep file
+               #
+               $file =~ s/MKAFS_OSTYPE/$ostype/ge;
+               $file =~ s/AFS_SYSNAME/$sysname/ge;
+
+               next if ( $file eq "" );
+
+               $proj_src = "$projdir/$subdir/$file";
+               $obj_src = "$objdir/$subdir/$file";
+               $proj_src =~ s|//+|/|gio;
+               $obj_src =~ s|//+|/|gio;
+
+               if ( $file !~ /\*/ && $file !~ /\[/  ) # no globs in filename
+               {
+                       my $fname = $file;
+                       $fname =~ s|.*/||gio;
+
+                       if ( -f $proj_src )
+                       {
+                               $destdir = mkfullpath($projdir, $proj_src, $treedir);           
+                               copyit($proj_src, "$destdir/$fname");
+                       }
+       
+                       if ( $obj_src ne $proj_src && -f $obj_src)
+                       {
+                               $destdir = mkfullpath($objdir, $obj_src, $treedir);
+                               copyit($obj_src, "$destdir/$fname");
+                       }
+               }
+               else
+               {
+                       #print "Globbing ($proj_src)\n";
+                       foreach my $src ( glob($proj_src) )
+                       {
+                               my $fname = $src;
+                               $fname =~ s|.*/||gio;
+
+                               $destdir = mkfullpath($projdir, $src, $treedir);                
+                               copyit($src, "$destdir/$fname");
+                       }
+                       #print "Globbing ($obj_src)\n";
+                       foreach my $src ( glob($obj_src) )
+                       {
+                               my $fname = $src;
+                               $fname =~ s|.*/||gio;
+
+                               $destdir = mkfullpath($objdir, $src, $treedir);
+                               copyit($src, "$destdir/$fname");
+                       }
+               }
+       }
+       close(COMPS);
+               
+       $quiet || print "\n";
+}
+
+sub usage
+{
+       print "usage: $0 -p top_proj_dir -os mkafs_ostype -sn sysname\n";
+       print "\t\t[-o top_obj_dir] [-t libafs_tree_dir] [-h] [-q] [-n]\n";
+       print "\ttop_proj_dir = /path/to/openafs - top level of openafs checkout/tarball\n";
+       print "\ttop_obj_dir = /path/to/objdir - top level of build directory, defaults to top_proj_dir\n";
+       print "\tlibafs_tree_dir = /path/to/libafs_tree - tree dir to create, defaults to top_obj_dir/libafs_tree\n";
+       print "\t-os = ostype value (i.e. LINUX)\n";
+       print "\t-sn = afs sysname (i.e. i386_linux24)\n";
+       print "\t-q = quiet build\n";
+       print "\t-n = just show what will be done\n";
+       print "\t-h = show this message\n";
+       
+       exit 1;
+}
+
+sub testArg
+{
+       my ($arg) = @_;
+       return $arg if ( $arg && $arg ne "" );
+       usage;
+}
+
+sub mkfullpath
+{
+       my ($frombase, $fromfile, $destbase) = @_;
+       my $qfrombase = quotemeta $frombase;
+
+       my $subdir = $fromfile;
+       $subdir =~ s|^$qfrombase||;
+       $subdir =~ s|^(.*)/(.*?)$|$1|o;
+       $subdir =~ s|^/||gio;
+       $subdir =~ s|/$||gio;
+       $subdir =~ s|//+|/|gio;
+
+       my $destdir = "$destbase/$subdir";
+       $destdir =~ s|/$||gio;
+       $destdir =~ s|//+|/|gio;
+
+       $showonly || mkpath([$destdir], !$quiet, 0755);
+
+       return $destdir;
+}
+
+sub copyit
+{
+       my ( $from, $to ) = @_;
+       my (@from, @new);
+
+       @from = stat($from);
+       @to = stat($to);
+
+       if ( ($#to < 0) || ($from[7] != $to[7]) || ($from[9] != $to[9]) )
+       {
+               $quiet || print "+ cp -p $from $to\n";
+               $showonly || system( "cp", "-p", $from, $to );
+       }
+}
+
+
+exit 0;

diff --git a/src/config/param.alpha_dux40.h b/src/config/param.alpha_dux40.h
index 1270ee9bc75bf44340e340aed3df684dc0b91ba9..d20b61a489fae101ce3be4312959bbdad1c855ae 100644 (file)
--- a/src/config/param.alpha_dux40.h
+++ b/src/config/param.alpha_dux40.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -109,3 +112,77 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_64BIT_ENV          1
+#define AFS_ENV                        1
+#define AFS_USR_OSF_ENV                1
+#define AFS_USR_DUX40_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             232
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_alpha_dux40        1
+#define SYS_NAME       "alpha_dux40"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux40
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+#define AFSLITTLE_ENDIAN        1
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_dux40_usr.h b/src/config/param.alpha_dux40_usr.h
index 053d35f953ee136e60706496b9c3511ec0408730..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_dux40_usr.h
+++ b/src/config/param.alpha_dux40_usr.h
@@ -1,67 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_64BIT_ENV          1
-#define AFS_ENV                        1
-#define AFS_USR_OSF_ENV                1
-#define AFS_USR_DUX40_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             232
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_alpha_dux40        1
-#define SYS_NAME       "alpha_dux40"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux40
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-#define AFSLITTLE_ENDIAN        1
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_dux50.h b/src/config/param.alpha_dux50.h
index c44909593cb81de9c204dfdf9466961bb75f58ca..d23671715506824130eb7bbcc0d8d29d7455786c 100644 (file)
--- a/src/config/param.alpha_dux50.h
+++ b/src/config/param.alpha_dux50.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -116,3 +119,77 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_64BIT_ENV          1
+#define AFS_ENV                        1
+#define AFS_USR_OSF_ENV                1
+#define AFS_USR_DUX40_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             232
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_alpha_dux40        1
+#define SYS_NAME       "alpha_dux50"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux50
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+#define AFSLITTLE_ENDIAN        1
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_dux50_usr.h b/src/config/param.alpha_dux50_usr.h
index 3b0ec833d9938ed341098ce829b523f0554fa5db..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_dux50_usr.h
+++ b/src/config/param.alpha_dux50_usr.h
@@ -1,67 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_64BIT_ENV          1
-#define AFS_ENV                        1
-#define AFS_USR_OSF_ENV                1
-#define AFS_USR_DUX40_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             232
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_alpha_dux40        1
-#define SYS_NAME       "alpha_dux50"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux50
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-#define AFSLITTLE_ENDIAN        1
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_dux51.h b/src/config/param.alpha_dux51.h
index 01b16de04b2dc4cf85c4984d5b1a730093b51540..e83730aae3661597bbff1ef0490f4c1bce709606 100644 (file)
--- a/src/config/param.alpha_dux51.h
+++ b/src/config/param.alpha_dux51.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -117,3 +120,77 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_64BIT_ENV          1
+#define AFS_ENV                        1
+#define AFS_USR_OSF_ENV                1
+#define AFS_USR_DUX40_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             232
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_alpha_dux40        1
+#define SYS_NAME       "alpha_dux51"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux51
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+#define AFSLITTLE_ENDIAN        1
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_dux51_usr.h b/src/config/param.alpha_dux51_usr.h
index 7aa8d0aaa76cdcc693f5b2d9290edd35386c2f53..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_dux51_usr.h
+++ b/src/config/param.alpha_dux51_usr.h
@@ -1,67 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_64BIT_ENV          1
-#define AFS_ENV                        1
-#define AFS_USR_OSF_ENV                1
-#define AFS_USR_DUX40_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             232
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_alpha_dux40        1
-#define SYS_NAME       "alpha_dux51"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_dux51
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-#define AFSLITTLE_ENDIAN        1
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_linux_22.h b/src/config/param.alpha_linux_22.h
index 252d68fb9864c263951639d10102cec9322d19d9..a35dbe53726ffdfe541dbe2bfad5299d833f417b 100644 (file)
--- a/src/config/param.alpha_linux_22.h
+++ b/src/config/param.alpha_linux_22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef _PARAM_ALPHA_LINUX2216_22_H_
 #define _PARAM_ALPHA_LINUX2216_22_H_
 
@@ -71,3 +74,64 @@
 #endif /* KERNEL */
 
 #endif /* _PARAM_ALPHA_LINUX2216_22_H_ */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef _PARAM_ALPHA_LINUX2216_22_USR_H_
+#define _PARAM_ALPHA_LINUX2216_22_USR_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 338
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_64BIT_ENV       1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "alpha_linux_22"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_22
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* _PARAM_ALPHA_LINUX2216_22_USR_H_ */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_linux_22_usr.h b/src/config/param.alpha_linux_22_usr.h
index e1d1667518a9fc635fb4bb8b7e822ce48555f081..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_linux_22_usr.h
+++ b/src/config/param.alpha_linux_22_usr.h
@@ -1,54 +1 @@
-#ifndef _PARAM_ALPHA_LINUX2216_22_USR_H_
-#define _PARAM_ALPHA_LINUX2216_22_USR_H_
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc64 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 338
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_64BIT_ENV       1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_22"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_22
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* _PARAM_ALPHA_LINUX2216_22_USR_H_ */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_linux_24.h b/src/config/param.alpha_linux_24.h
index 2bf32a9a170c2fb27f3d7ac73258c4aeff71cbcb..9d2845d88aff825a9724670bd830ba58928532a0 100644 (file)
--- a/src/config/param.alpha_linux_24.h
+++ b/src/config/param.alpha_linux_24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef _PARAM_ALPHA_LINUX_24_H_
 #define _PARAM_ALPHA_LINUX_24_H_
 
@@ -73,3 +76,65 @@
 #endif /* KERNEL */
 
 #endif /* _PARAM_ALPHA_LINUX_24_H_ */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef _PARAM_ALPHA_LINUX_24_USR_H_
+#define _PARAM_ALPHA_LINUX_24_USR_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 338
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_64BIT_ENV       1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "alpha_linux_24"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_24
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* _PARAM_ALPHA_LINUX_24_USR_H_ */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_linux_24_usr.h b/src/config/param.alpha_linux_24_usr.h
index 3795484b3b71921a1fac041d6724cca7e4359b72..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_linux_24_usr.h
+++ b/src/config/param.alpha_linux_24_usr.h
@@ -1,55 +1 @@
-#ifndef _PARAM_ALPHA_LINUX_24_USR_H_
-#define _PARAM_ALPHA_LINUX_24_USR_H_
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc64 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 338
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_64BIT_ENV       1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_24"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_24
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* _PARAM_ALPHA_LINUX_24_USR_H_ */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_nbsd15.h b/src/config/param.alpha_nbsd15.h
index 40e87774b7372270a6fbba7833d2232cd92ae376..9f5ba106effe2a8b049658667726b417c88a7565 100644 (file)
--- a/src/config/param.alpha_nbsd15.h
+++ b/src/config/param.alpha_nbsd15.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -13,3 +16,67 @@
 #define AFSLITTLE_ENDIAN 1
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_NBSD_ENV           1
+#define AFS_NBSD15_ENV         1
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_nbsd15"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_nbsd15_usr.h b/src/config/param.alpha_nbsd15_usr.h
index be3942081539404297703c9072a8298030cc68ef..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_nbsd15_usr.h
+++ b/src/config/param.alpha_nbsd15_usr.h
@@ -1,57 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_NBSD_ENV           1
-#define AFS_NBSD15_ENV         1
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_nbsd15"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.alpha_nbsd16.h b/src/config/param.alpha_nbsd16.h
index a0b35ece745a20f7a96df137e992e6b56bfa4fcc..3890a4cf7f7d52ba790b2fbc243f7bd86d01b984 100644 (file)
--- a/src/config/param.alpha_nbsd16.h
+++ b/src/config/param.alpha_nbsd16.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -13,3 +16,67 @@
 #define AFSLITTLE_ENDIAN 1
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_NBSD_ENV           1
+#define AFS_NBSD15_ENV         1
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_nbsd16"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd16
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.alpha_nbsd16_usr.h b/src/config/param.alpha_nbsd16_usr.h
index 51f3ace434e49fc8e69f29f99b17f6e9cfb8e6c4..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.alpha_nbsd16_usr.h
+++ b/src/config/param.alpha_nbsd16_usr.h
@@ -1,57 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_NBSD_ENV           1
-#define AFS_NBSD15_ENV         1
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_nbsd16"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd16
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.hp_ux102.h b/src/config/param.hp_ux102.h
index 0a69d60e8617f7c63c891848debf39a1a7d81bde..88e1b226591cb35cb846c399d83212c4a16ed96e 100644 (file)
--- a/src/config/param.hp_ux102.h
+++ b/src/config/param.hp_ux102.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -87,3 +90,74 @@ struct uio;
 #endif
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_HPUX_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_SYSCALL   48 /* slot reserved for AFS */
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define SYS_NAME       "hp_ux102"
+#define SYS_NAME_ID    SYS_NAME_ID_hp_ux102
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     CLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.hp_ux102_usr.h b/src/config/param.hp_ux102_usr.h
index fdcc12c0ba290351ef47d1ac070dc0b5bf8127dd..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.hp_ux102_usr.h
+++ b/src/config/param.hp_ux102_usr.h
@@ -1,64 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_HPUX_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_SYSCALL   48 /* slot reserved for AFS */
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define SYS_NAME       "hp_ux102"
-#define SYS_NAME_ID    SYS_NAME_ID_hp_ux102
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     CLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h
index 79b59785b987d490d8af998a06ccfe8fb3e736c7..2eb382157e41a42d2b7522c9d6ae2d814563c3ca 100644 (file)
--- a/src/config/param.hp_ux110.h
+++ b/src/config/param.hp_ux110.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -95,3 +98,74 @@ struct uio;
 #endif
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_HPUX_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_SYSCALL   48 /* slot reserved for AFS */
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define SYS_NAME       "hp_ux110"
+#define SYS_NAME_ID    SYS_NAME_ID_hp_ux110
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     CLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.hp_ux110_usr.h b/src/config/param.hp_ux110_usr.h
index f0120636098459440b93e479037a96be726876a3..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.hp_ux110_usr.h
+++ b/src/config/param.hp_ux110_usr.h
@@ -1,64 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_HPUX_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_SYSCALL   48 /* slot reserved for AFS */
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define SYS_NAME       "hp_ux110"
-#define SYS_NAME_ID    SYS_NAME_ID_hp_ux110
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     CLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_djgpp.h b/src/config/param.i386_djgpp.h
index efd5f780332f8a45696342cb1c740e781c47e7df..27421cd6a3c285c378b1635ec74cefcbab00ac06 100644 (file)
--- a/src/config/param.i386_djgpp.h
+++ b/src/config/param.i386_djgpp.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -31,3 +34,72 @@
 #define AFS_VM_RDWR_ENV        1       /* read/write implemented via VM */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously i386 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_linux22
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_djgpp_usr.h b/src/config/param.i386_djgpp_usr.h
index 9f53f9532e35491d922c28897219d33d7ceb3429..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_djgpp_usr.h
+++ b/src/config/param.i386_djgpp_usr.h
@@ -1,62 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously i386 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_linux22
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_fbsd_42.h b/src/config/param.i386_fbsd_42.h
index 04612e18beb0d0015e8e3cbefcf4e994a1e4f949..31622c3c962efe2b94e5528c3290f0b88ea71783 100644 (file)
--- a/src/config/param.i386_fbsd_42.h
+++ b/src/config/param.i386_fbsd_42.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -113,3 +116,69 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_USR_FBSD40_ENV     1
+#define AFS_USR_FBSD42_ENV     1
+#define AFS_USR_FBSD_ENV       1
+#define AFS_NONFSTRANS 1
+
+#define O_SYNC O_FSYNC
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_fbsd_42"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_42
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_42_usr.h b/src/config/param.i386_fbsd_42_usr.h
index b9abf7d4d49ff1f4a58702838d1bacb6cb20f1b0..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_fbsd_42_usr.h
+++ b/src/config/param.i386_fbsd_42_usr.h
@@ -1,59 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_USR_FBSD40_ENV     1
-#define AFS_USR_FBSD42_ENV     1
-#define AFS_USR_FBSD_ENV       1
-#define AFS_NONFSTRANS 1
-
-#define O_SYNC O_FSYNC
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_fbsd_42"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_42
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_fbsd_43.h b/src/config/param.i386_fbsd_43.h
index 3f84a33e89931492a6c49a27c99593e275f4de24..dc9dd697b7f5fb59139b9563868c8c9f7dd25e1d 100644 (file)
--- a/src/config/param.i386_fbsd_43.h
+++ b/src/config/param.i386_fbsd_43.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -115,3 +118,70 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_USR_FBSD40_ENV     1
+#define AFS_USR_FBSD42_ENV     1
+#define AFS_USR_FBSD43_ENV     1
+#define AFS_USR_FBSD_ENV       1
+#define AFS_NONFSTRANS 1
+
+#define O_SYNC O_FSYNC
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_fbsd_43"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_43
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_43_usr.h b/src/config/param.i386_fbsd_43_usr.h
index dc06748f74869bf858442a5288ef4bf0753c6c04..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_fbsd_43_usr.h
+++ b/src/config/param.i386_fbsd_43_usr.h
@@ -1,60 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_USR_FBSD40_ENV     1
-#define AFS_USR_FBSD42_ENV     1
-#define AFS_USR_FBSD43_ENV     1
-#define AFS_USR_FBSD_ENV       1
-#define AFS_NONFSTRANS 1
-
-#define O_SYNC O_FSYNC
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_fbsd_43"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_43
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_fbsd_44.h b/src/config/param.i386_fbsd_44.h
index de509e05b751333c7b3ce1330a2eeac13df3d8b8..116fc3a92a63cd48c3f49f12b93539c6612ac87c 100644 (file)
--- a/src/config/param.i386_fbsd_44.h
+++ b/src/config/param.i386_fbsd_44.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -117,3 +120,71 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_USR_FBSD40_ENV     1
+#define AFS_USR_FBSD42_ENV     1
+#define AFS_USR_FBSD43_ENV     1
+#define AFS_USR_FBSD44_ENV     1
+#define AFS_USR_FBSD_ENV       1
+#define AFS_NONFSTRANS 1
+
+#define O_SYNC O_FSYNC
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_fbsd_44"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_44
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_44_usr.h b/src/config/param.i386_fbsd_44_usr.h
index 201a46cc30487251c31e2efe9b9702bf90bd7fab..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_fbsd_44_usr.h
+++ b/src/config/param.i386_fbsd_44_usr.h
@@ -1,61 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_USR_FBSD40_ENV     1
-#define AFS_USR_FBSD42_ENV     1
-#define AFS_USR_FBSD43_ENV     1
-#define AFS_USR_FBSD44_ENV     1
-#define AFS_USR_FBSD_ENV       1
-#define AFS_NONFSTRANS 1
-
-#define O_SYNC O_FSYNC
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_fbsd_44"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_44
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_fbsd_45.h b/src/config/param.i386_fbsd_45.h
index 7e9975061c338d2d4b2123bfb84a41153184e413..d3653e51828069d2b37ae017966bdb1d2171b041 100644 (file)
--- a/src/config/param.i386_fbsd_45.h
+++ b/src/config/param.i386_fbsd_45.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -118,3 +121,72 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_USR_FBSD40_ENV     1
+#define AFS_USR_FBSD42_ENV     1
+#define AFS_USR_FBSD43_ENV     1
+#define AFS_USR_FBSD44_ENV     1
+#define AFS_USR_FBSD45_ENV     1
+#define AFS_USR_FBSD_ENV       1
+#define AFS_NONFSTRANS 1
+
+#define O_SYNC O_FSYNC
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_fbsd_45"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_45
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_45_usr.h b/src/config/param.i386_fbsd_45_usr.h
index d1bcbae4a692d88a47a4ebc8f1f15c2af4f80e0b..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_fbsd_45_usr.h
+++ b/src/config/param.i386_fbsd_45_usr.h
@@ -1,62 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_USR_FBSD40_ENV     1
-#define AFS_USR_FBSD42_ENV     1
-#define AFS_USR_FBSD43_ENV     1
-#define AFS_USR_FBSD44_ENV     1
-#define AFS_USR_FBSD45_ENV     1
-#define AFS_USR_FBSD_ENV       1
-#define AFS_NONFSTRANS 1
-
-#define O_SYNC O_FSYNC
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_fbsd_45"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_45
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_fbsd_46.h b/src/config/param.i386_fbsd_46.h
index e78d4dc8f62ac3f44db481d0fad89158d24b6e02..6d834cac0958016dde7d6e918bbb04defefe03e3 100644 (file)
--- a/src/config/param.i386_fbsd_46.h
+++ b/src/config/param.i386_fbsd_46.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -119,3 +122,73 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_USR_FBSD40_ENV     1
+#define AFS_USR_FBSD42_ENV     1
+#define AFS_USR_FBSD43_ENV     1
+#define AFS_USR_FBSD44_ENV     1
+#define AFS_USR_FBSD45_ENV     1
+#define AFS_USR_FBSD46_ENV     1
+#define AFS_USR_FBSD_ENV       1
+#define AFS_NONFSTRANS 1
+
+#define O_SYNC O_FSYNC
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_fbsd_46"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_46
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_46_usr.h b/src/config/param.i386_fbsd_46_usr.h
index 0f78ce8fe835853a737c7f88ef19d05c9a097a42..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_fbsd_46_usr.h
+++ b/src/config/param.i386_fbsd_46_usr.h
@@ -1,63 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_USR_FBSD40_ENV     1
-#define AFS_USR_FBSD42_ENV     1
-#define AFS_USR_FBSD43_ENV     1
-#define AFS_USR_FBSD44_ENV     1
-#define AFS_USR_FBSD45_ENV     1
-#define AFS_USR_FBSD46_ENV     1
-#define AFS_USR_FBSD_ENV       1
-#define AFS_NONFSTRANS 1
-
-#define O_SYNC O_FSYNC
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_fbsd_46"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_fbsd_46
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h
index 0a845bcf29d178fbd424e1b3c30a4629dd0db3a5..84b10cc514a3987f592cee10af05e7008ef3d16d 100644 (file)
--- a/src/config/param.i386_linux22.h
+++ b/src/config/param.i386_linux22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -79,3 +82,72 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously i386 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_linux22
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_linux22_usr.h b/src/config/param.i386_linux22_usr.h
index 9f53f9532e35491d922c28897219d33d7ceb3429..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_linux22_usr.h
+++ b/src/config/param.i386_linux22_usr.h
@@ -1,62 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously i386 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_linux22
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h
index 2d4ab16e0baa9a3b2f923c00b6200a7fae1c14f4..46067a33f2a4c01f7759d8a1dd32aa4c57bd363f 100644 (file)
--- a/src/config/param.i386_linux24.h
+++ b/src/config/param.i386_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -75,3 +78,64 @@
 #endif /* AFS_PARAM_H */
 
 
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously i386 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_linux24
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_linux24_usr.h b/src/config/param.i386_linux24_usr.h
index 715fee0039dfb98f77ce6cabf09f03cbafa999a8..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_linux24_usr.h
+++ b/src/config/param.i386_linux24_usr.h
@@ -1,54 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously i386 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_linux24
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_nbsd15.h b/src/config/param.i386_nbsd15.h
index 0ec64cd8857237606a58cf3c17643b44137d02ac..745892947b971eea5bef9f36d65ec2ad1bd2c15b 100644 (file)
--- a/src/config/param.i386_nbsd15.h
+++ b/src/config/param.i386_nbsd15.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -13,3 +16,67 @@
 #define AFSLITTLE_ENDIAN 1
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_NBSD_ENV           1
+#define AFS_NBSD15_ENV         1
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_nbsd15"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_nbsd15_usr.h b/src/config/param.i386_nbsd15_usr.h
index be3942081539404297703c9072a8298030cc68ef..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_nbsd15_usr.h
+++ b/src/config/param.i386_nbsd15_usr.h
@@ -1,57 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_NBSD_ENV           1
-#define AFS_NBSD15_ENV         1
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_nbsd15"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_nbsd16.h b/src/config/param.i386_nbsd16.h
index 23f13dda29b2a4da87ee52cfba97b1d16cd9556c..2bc33a01ebffab9466e72b2a60f08705a5d207bd 100644 (file)
--- a/src/config/param.i386_nbsd16.h
+++ b/src/config/param.i386_nbsd16.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -13,3 +16,67 @@
 #define AFSLITTLE_ENDIAN 1
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_NBSD_ENV           1
+#define AFS_NBSD15_ENV         1
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_nbsd16"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd16
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_nbsd16_usr.h b/src/config/param.i386_nbsd16_usr.h
index 51f3ace434e49fc8e69f29f99b17f6e9cfb8e6c4..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_nbsd16_usr.h
+++ b/src/config/param.i386_nbsd16_usr.h
@@ -1,57 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define AFS_NBSD_ENV           1
-#define AFS_NBSD15_ENV         1
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_nbsd16"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd16
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_nt40.h b/src/config/param.i386_nt40.h
index 72a926f4577512eaa0fd5757f52740b4f56bfdc5..43e7d1c7f8ed540d6947c2790605c8b32b62b0c5 100644 (file)
--- a/src/config/param.i386_nt40.h
+++ b/src/config/param.i386_nt40.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -61,3 +64,10 @@ typedef char * caddr_t;
 
 #define snprintf                _snprintf
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_obsd29.h b/src/config/param.i386_obsd29.h
index 32d292e9878bb13ff5907a2c11d682da94c675b9..61351ab889c722371503ed3d1eb68463d14f8603 100644 (file)
--- a/src/config/param.i386_obsd29.h
+++ b/src/config/param.i386_obsd29.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Jim Rees, University of Michigan CITI
  */
@@ -113,3 +116,70 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Jim Rees, University of Michigan CITI
+ */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define        AFS_OBSD_ENV    1
+#define AFS_386i_ENV   1       /* 386 Architecture--for lwp stuff */
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_obsd29"
+#define SYS_NAME_ID    2002
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MB_CLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_obsd29_usr.h b/src/config/param.i386_obsd29_usr.h
index 30458959daf561d05c1923ed42481ac79057765a..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_obsd29_usr.h
+++ b/src/config/param.i386_obsd29_usr.h
@@ -1,60 +1 @@
-/*
- * Jim Rees, University of Michigan CITI
- */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define        AFS_OBSD_ENV    1
-#define AFS_386i_ENV   1       /* 386 Architecture--for lwp stuff */
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_obsd29"
-#define SYS_NAME_ID    2002
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MB_CLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_obsd31.h b/src/config/param.i386_obsd31.h
index df0d7844d431fe9a2e7380fec6c173497bb62526..b2264684c67784600828fa8be036e017ad3edcc5 100644 (file)
--- a/src/config/param.i386_obsd31.h
+++ b/src/config/param.i386_obsd31.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Jim Rees, University of Michigan CITI
  */
@@ -104,3 +107,70 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Jim Rees, University of Michigan CITI
+ */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define        AFS_OBSD_ENV    1
+#define AFS_386i_ENV   1       /* 386 Architecture--for lwp stuff */
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_obsd31"
+#define SYS_NAME_ID    2002
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MB_CLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_obsd31_usr.h b/src/config/param.i386_obsd31_usr.h
index 7893d6ec61ec7c038addf5e711da57efefbec035..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.i386_obsd31_usr.h
+++ b/src/config/param.i386_obsd31_usr.h
@@ -1,60 +1 @@
-/*
- * Jim Rees, University of Michigan CITI
- */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_VFSINCL_ENV         1
-#define        AFS_OBSD_ENV    1
-#define AFS_386i_ENV   1       /* 386 Architecture--for lwp stuff */
-#define AFS_NONFSTRANS 1
-#define AFS_KERBEROS_ENV
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 210
-#define AFS_NAMEI_ENV         1   /* User space interface to file system */
-#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV      1
-#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
-
-/* Machine / Operating system information */
-#define SYS_NAME       "i386_obsd31"
-#define SYS_NAME_ID    2002
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MB_CLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.i386_win95.h b/src/config/param.i386_win95.h
index 355714b5d1a268efcfbc3a6c35a0efcd588c1314..cea42b96bff4e08e188240a14b79450882b1df5b 100644 (file)
--- a/src/config/param.i386_win95.h
+++ b/src/config/param.i386_win95.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -60,3 +63,10 @@ typedef char * caddr_t;
 
 #define pipe(fdp)               _pipe(fdp, 4096, _O_BINARY)
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ia64_linux24.h b/src/config/param.ia64_linux24.h
index 58d31d9a8bb549103e707f0f0c3b1c7f87d5519d..49e05432734b00b31ca1ef87e88106e9dab6d2a4 100644 (file)
--- a/src/config/param.ia64_linux24.h
+++ b/src/config/param.ia64_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -78,3 +81,69 @@
 #define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_IA64_LINUX20_H_ */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously ia64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 1141
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "ia64_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_ia64_linux24
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#define USE_UCONTEXT           /* should be in afsconfig.h */
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ia64_linux24_usr.h b/src/config/param.ia64_linux24_usr.h
index 377971baf18bed00b3d026ef22e50656af1fa056..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ia64_linux24_usr.h
+++ b/src/config/param.ia64_linux24_usr.h
@@ -1,59 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously ia64 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 1141
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "ia64_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_ia64_linux24
-#define AFSLITTLE_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#define USE_UCONTEXT           /* should be in afsconfig.h */
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.nbsd15.h b/src/config/param.nbsd15.h
index 8af39cbb51b5aee3e02c8e1a5d49e433cd3c70bd..8cb1e7834e410421f826d98671f9c9091ffb5f59 100644 (file)
--- a/src/config/param.nbsd15.h
+++ b/src/config/param.nbsd15.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 
 #ifndef        AFS_PARAM_COMMON_H
 #define        AFS_PARAM_COMMON_H
@@ -106,3 +109,10 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_COMMON_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.nbsd16.h b/src/config/param.nbsd16.h
index 33398e6f6136aac8bdd94149832ffe88c601c779..73892136a22c6595e9ece8d4f42a849fb2ae7529 100644 (file)
--- a/src/config/param.nbsd16.h
+++ b/src/config/param.nbsd16.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 
 #ifndef        AFS_PARAM_COMMON_H
 #define        AFS_PARAM_COMMON_H
@@ -107,3 +110,10 @@ enum vcexcl {NONEXCL, EXCL};
 #endif /* _KERNEL */
 
 #endif /* AFS_PARAM_COMMON_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.parisc_linux24.h b/src/config/param.parisc_linux24.h
index 1c181bff6857ba6dc4eebf00f72b74b4aded2f92..8275b4371acdf02464bf66e410c08b9ecf8ea309 100644 (file)
--- a/src/config/param.parisc_linux24.h
+++ b/src/config/param.parisc_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -65,3 +68,64 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously ppc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "parisc_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_parisc_linux24
+#define AFSBIG_ENDIAN       1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.parisc_linux24_usr.h b/src/config/param.parisc_linux24_usr.h
index 56b37eb4975589325145f17a8c425fcb28b8fa8d..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.parisc_linux24_usr.h
+++ b/src/config/param.parisc_linux24_usr.h
@@ -1,54 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously ppc specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "parisc_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_parisc_linux24
-#define AFSBIG_ENDIAN       1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_darwin_12.h b/src/config/param.ppc_darwin_12.h
index de44b567c1557898bad305096c6625e4a68510e3..49d5c998e5a2f0f4d6ce353bec8a01169ed45e96 100644 (file)
--- a/src/config/param.ppc_darwin_12.h
+++ b/src/config/param.ppc_darwin_12.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -56,3 +59,56 @@
 
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
+#define AFS_ENV                 1
+#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
+#define AFS_PPC_ENV 1
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_NONFSTRANS 
+#define AFS_SYSCALL             230
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS    "afs"
+
+/* Machine / Operating system information */
+#define sys_ppc_darwin_12   1
+#define SYS_NAME        "ppc_darwin_12"
+#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_12
+#define AFSBIG_ENDIAN   1
+#define AFS_HAVE_FFS    1       /* Use system's ffs. */
+
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+
+#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV          1
+
+#define AFS_VFS34       1       /* What is VFS34??? */
+#define afsio_iov       uio_iov
+#define afsio_iovcnt    uio_iovcnt
+#define afsio_offset    uio_offset
+#define afsio_seg       uio_segflg
+#define afsio_resid     uio_resid
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_darwin_12_usr.h b/src/config/param.ppc_darwin_12_usr.h
index 2a1c7e777d7d19d6ced39dc62d8baa8cc8546782..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_darwin_12_usr.h
+++ b/src/config/param.ppc_darwin_12_usr.h
@@ -1,46 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
-#define AFS_ENV                 1
-#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_NONFSTRANS 
-#define AFS_SYSCALL             230
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS    "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12   1
-#define SYS_NAME        "ppc_darwin_12"
-#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_12
-#define AFSBIG_ENDIAN   1
-#define AFS_HAVE_FFS    1       /* Use system's ffs. */
-
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-
-#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV          1
-
-#define AFS_VFS34       1       /* What is VFS34??? */
-#define afsio_iov       uio_iov
-#define afsio_iovcnt    uio_iovcnt
-#define afsio_offset    uio_offset
-#define afsio_seg       uio_segflg
-#define afsio_resid     uio_resid
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_darwin_13.h b/src/config/param.ppc_darwin_13.h
index b2df4fa5cae70a35ae0233d1882e458f5510b296..3e27f8914cc1e244c0cc247f6598e266bd85ce64 100644 (file)
--- a/src/config/param.ppc_darwin_13.h
+++ b/src/config/param.ppc_darwin_13.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -58,3 +61,58 @@
 
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
+#define AFS_ENV                 1
+#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
+#define AFS_PPC_ENV 1
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_USR_DARWIN13_ENV
+#define AFS_NONFSTRANS 
+#define AFS_SYSCALL             230
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS    "afs"
+
+/* Machine / Operating system information */
+#define sys_ppc_darwin_12   1
+#define sys_ppc_darwin_13   1
+#define SYS_NAME        "ppc_darwin_13"
+#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_13
+#define AFSBIG_ENDIAN   1
+#define AFS_HAVE_FFS    1       /* Use system's ffs. */
+
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+
+#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV          1
+
+#define AFS_VFS34       1       /* What is VFS34??? */
+#define afsio_iov       uio_iov
+#define afsio_iovcnt    uio_iovcnt
+#define afsio_offset    uio_offset
+#define afsio_seg       uio_segflg
+#define afsio_resid     uio_resid
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_darwin_13_usr.h b/src/config/param.ppc_darwin_13_usr.h
index 7a70c4858969f204d7270c0c6171688f9b0b0ea4..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_darwin_13_usr.h
+++ b/src/config/param.ppc_darwin_13_usr.h
@@ -1,48 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
-#define AFS_ENV                 1
-#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_NONFSTRANS 
-#define AFS_SYSCALL             230
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS    "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12   1
-#define sys_ppc_darwin_13   1
-#define SYS_NAME        "ppc_darwin_13"
-#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_13
-#define AFSBIG_ENDIAN   1
-#define AFS_HAVE_FFS    1       /* Use system's ffs. */
-
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-
-#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV          1
-
-#define AFS_VFS34       1       /* What is VFS34??? */
-#define afsio_iov       uio_iov
-#define afsio_iovcnt    uio_iovcnt
-#define afsio_offset    uio_offset
-#define afsio_seg       uio_segflg
-#define afsio_resid     uio_resid
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_darwin_14.h b/src/config/param.ppc_darwin_14.h
index 8a6ed1779f5a31dba2d8c71675f5b92a95a57e41..7bed52d212004584c8270559b4ad78c2c32b4e9c 100644 (file)
--- a/src/config/param.ppc_darwin_14.h
+++ b/src/config/param.ppc_darwin_14.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -61,3 +64,60 @@
 
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
+#define AFS_ENV                 1
+#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
+#define AFS_PPC_ENV 1
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_USR_DARWIN13_ENV
+#define AFS_USR_DARWIN14_ENV
+#define AFS_NONFSTRANS 
+#define AFS_SYSCALL             230
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS    "afs"
+
+/* Machine / Operating system information */
+#define sys_ppc_darwin_12   1
+#define sys_ppc_darwin_13   1
+#define sys_ppc_darwin_14   1
+#define SYS_NAME        "ppc_darwin_14"
+#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_14
+#define AFSBIG_ENDIAN   1
+#define AFS_HAVE_FFS    1       /* Use system's ffs. */
+
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+
+#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV          1
+
+#define AFS_VFS34       1       /* What is VFS34??? */
+#define afsio_iov       uio_iov
+#define afsio_iovcnt    uio_iovcnt
+#define afsio_offset    uio_offset
+#define afsio_seg       uio_segflg
+#define afsio_resid     uio_resid
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_darwin_14_usr.h b/src/config/param.ppc_darwin_14_usr.h
index ca107f5236d08167b172ee679e523ddb7171569b..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_darwin_14_usr.h
+++ b/src/config/param.ppc_darwin_14_usr.h
@@ -1,50 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
-#define AFS_ENV                 1
-#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_NONFSTRANS 
-#define AFS_SYSCALL             230
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS    "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12   1
-#define sys_ppc_darwin_13   1
-#define sys_ppc_darwin_14   1
-#define SYS_NAME        "ppc_darwin_14"
-#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_14
-#define AFSBIG_ENDIAN   1
-#define AFS_HAVE_FFS    1       /* Use system's ffs. */
-
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-
-#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV          1
-
-#define AFS_VFS34       1       /* What is VFS34??? */
-#define afsio_iov       uio_iov
-#define afsio_iovcnt    uio_iovcnt
-#define afsio_offset    uio_offset
-#define afsio_seg       uio_segflg
-#define afsio_resid     uio_resid
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_darwin_60.h b/src/config/param.ppc_darwin_60.h
index acaec06410bf9419729da8044560a324bcadcb9d..b5f1c7b73322c3ca3680201c3803cc506c0846fa 100644 (file)
--- a/src/config/param.ppc_darwin_60.h
+++ b/src/config/param.ppc_darwin_60.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -63,3 +66,62 @@
 
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
+#define AFS_ENV                 1
+#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
+#define AFS_PPC_ENV 1
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_USR_DARWIN13_ENV
+#define AFS_USR_DARWIN14_ENV
+#define AFS_USR_DARWIN60_ENV
+#define AFS_NONFSTRANS 
+#define AFS_SYSCALL             230
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS    "afs"
+
+/* Machine / Operating system information */
+#define sys_ppc_darwin_12   1
+#define sys_ppc_darwin_13   1
+#define sys_ppc_darwin_14   1
+#define sys_ppc_darwin_60   1
+#define SYS_NAME        "ppc_darwin_60"
+#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_60
+#define AFSBIG_ENDIAN   1
+#define AFS_HAVE_FFS    1       /* Use system's ffs. */
+
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+
+#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV          1
+
+#define AFS_VFS34       1       /* What is VFS34??? */
+#define afsio_iov       uio_iov
+#define afsio_iovcnt    uio_iovcnt
+#define afsio_offset    uio_offset
+#define afsio_seg       uio_segflg
+#define afsio_resid     uio_resid
+#define AFS_UIOSYS      UIO_SYSSPACE
+#define AFS_UIOUSER     UIO_USERSPACE
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_darwin_60_usr.h b/src/config/param.ppc_darwin_60_usr.h
index e615381191e5aec41ccf27e43184ca31a2b6829f..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_darwin_60_usr.h
+++ b/src/config/param.ppc_darwin_60_usr.h
@@ -1,52 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
-#define AFS_ENV                 1
-#define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
-#define AFS_NONFSTRANS 
-#define AFS_SYSCALL             230
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS    "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12   1
-#define sys_ppc_darwin_13   1
-#define sys_ppc_darwin_14   1
-#define sys_ppc_darwin_60   1
-#define SYS_NAME        "ppc_darwin_60"
-#define SYS_NAME_ID     SYS_NAME_ID_ppc_darwin_60
-#define AFSBIG_ENDIAN   1
-#define AFS_HAVE_FFS    1       /* Use system's ffs. */
-
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-
-#define AFS_GCPAGS                0       /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV          1
-
-#define AFS_VFS34       1       /* What is VFS34??? */
-#define afsio_iov       uio_iov
-#define afsio_iovcnt    uio_iovcnt
-#define afsio_offset    uio_offset
-#define afsio_seg       uio_segflg
-#define afsio_resid     uio_resid
-#define AFS_UIOSYS      UIO_SYSSPACE
-#define AFS_UIOUSER     UIO_USERSPACE
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h
index e1a48cc783fa01f7dd4327ee6d0767bd3caf4af2..0197da8bccf63ede76421d2fa5d7f1ff021e5a3e 100644 (file)
--- a/src/config/param.ppc_linux22.h
+++ b/src/config/param.ppc_linux22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -66,3 +69,63 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously ppc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "ppc_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_ppc_linux22
+#define AFSBIG_ENDIAN       1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_linux22_usr.h b/src/config/param.ppc_linux22_usr.h
index 4e38287a141c5eaf76db27460eb7d9098a2740eb..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_linux22_usr.h
+++ b/src/config/param.ppc_linux22_usr.h
@@ -1,53 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously ppc specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "ppc_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_ppc_linux22
-#define AFSBIG_ENDIAN       1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h
index c5161af295a820a6b6c6e1a8071bc72282b88674..53574343b55e2e22abedd4e1cd843ec22efc6f79 100644 (file)
--- a/src/config/param.ppc_linux24.h
+++ b/src/config/param.ppc_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
@@ -67,3 +70,64 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously ppc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "ppc_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_ppc_linux24
+#define AFSBIG_ENDIAN       1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.ppc_linux24_usr.h b/src/config/param.ppc_linux24_usr.h
index d21d75def13e072e2c3c464c696f90d845fa063e..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.ppc_linux24_usr.h
+++ b/src/config/param.ppc_linux24_usr.h
@@ -1,54 +1 @@
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously ppc specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "ppc_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_ppc_linux24
-#define AFSBIG_ENDIAN       1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h
index 327fd01167cc02cd2dfb6fd8341113e091c1958b..2780b2af986167debe21f95592f2b29888f7f4ac 100644 (file)
--- a/src/config/param.rs_aix42.h
+++ b/src/config/param.rs_aix42.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -74,3 +77,89 @@
 #endif /* !_KERNEL     */
 #define        AFS_DIRENT
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_64BIT_ENV           1
+#define AFS_64BIT_CLIENT        1
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#ifdef KERNEL
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_AIX_ENV                1
+#define AFS_USR_AIX41_ENV      1
+#define AFS_USR_AIX42_ENV      1
+
+#else  /* KERNEL */
+
+#define        AFS_AIX_ENV             1
+#define        AFS_AIX32_ENV           1
+#define        AFS_AIX41_ENV           1
+#define AFS_AIX42_ENV          1
+
+#endif /* KERNEL */
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             105
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   4
+
+/* Machine / Operating system information */
+#define sys_rs_aix42   1
+#define SYS_NAME       "rs_aix42"
+#define SYS_NAME_ID    SYS_NAME_ID_rs_aix42
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.rs_aix42_usr.h b/src/config/param.rs_aix42_usr.h
index f375544e38da6e05eed2a15d7ad41ade586f9258..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.rs_aix42_usr.h
+++ b/src/config/param.rs_aix42_usr.h
@@ -1,79 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_64BIT_ENV           1
-#define AFS_64BIT_CLIENT        1
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#ifdef KERNEL
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_AIX_ENV                1
-#define AFS_USR_AIX41_ENV      1
-#define AFS_USR_AIX42_ENV      1
-
-#else  /* KERNEL */
-
-#define        AFS_AIX_ENV             1
-#define        AFS_AIX32_ENV           1
-#define        AFS_AIX41_ENV           1
-#define AFS_AIX42_ENV          1
-
-#endif /* KERNEL */
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             105
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   4
-
-/* Machine / Operating system information */
-#define sys_rs_aix42   1
-#define SYS_NAME       "rs_aix42"
-#define SYS_NAME_ID    SYS_NAME_ID_rs_aix42
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h
index 230a27e15b8a8769319b506e4c3ecd7e48eae30e..a80d7f82782f33500c98dc40c343627aebebd1c4 100644 (file)
--- a/src/config/param.rs_aix51.h
+++ b/src/config/param.rs_aix51.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -74,3 +77,95 @@
 #endif /* !_KERNEL     */
 #define        AFS_DIRENT
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_64BIT_ENV           1
+#define AFS_64BIT_CLIENT        1
+#define AFS_NAMEI_ENV           1
+#ifdef AFS_NAMEI_ENV
+#define AFS_64BIT_IOPS_ENV     1
+#endif
+#define BITMAP_LATER            1
+#define FAST_RESTART            1
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#ifdef KERNEL
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_AIX_ENV                1
+#define AFS_USR_AIX41_ENV      1
+#define AFS_USR_AIX42_ENV      1
+
+#else  /* KERNEL */
+
+#define        AFS_AIX_ENV             1
+#define        AFS_AIX32_ENV           1
+#define        AFS_AIX41_ENV           1
+#define AFS_AIX42_ENV          1
+
+#endif /* KERNEL */
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             105
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   4
+
+/* Machine / Operating system information */
+#define sys_rs_aix42   1
+#define SYS_NAME       "rs_aix42"
+#define SYS_NAME_ID    SYS_NAME_ID_rs_aix42
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.rs_aix51_usr.h b/src/config/param.rs_aix51_usr.h
index 62d3d1f8aa28611def5f9f6d5c80b012651f6b23..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.rs_aix51_usr.h
+++ b/src/config/param.rs_aix51_usr.h
@@ -1,85 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_64BIT_ENV           1
-#define AFS_64BIT_CLIENT        1
-#define AFS_NAMEI_ENV           1
-#ifdef AFS_NAMEI_ENV
-#define AFS_64BIT_IOPS_ENV     1
-#endif
-#define BITMAP_LATER            1
-#define FAST_RESTART            1
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#ifdef KERNEL
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_AIX_ENV                1
-#define AFS_USR_AIX41_ENV      1
-#define AFS_USR_AIX42_ENV      1
-
-#else  /* KERNEL */
-
-#define        AFS_AIX_ENV             1
-#define        AFS_AIX32_ENV           1
-#define        AFS_AIX41_ENV           1
-#define AFS_AIX42_ENV          1
-
-#endif /* KERNEL */
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             105
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   4
-
-/* Machine / Operating system information */
-#define sys_rs_aix42   1
-#define SYS_NAME       "rs_aix42"
-#define SYS_NAME_ID    SYS_NAME_ID_rs_aix42
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.s390_linux22.h b/src/config/param.s390_linux22.h
index 1dcb8fed4c324d25f76440920e93ae8355231665..cc1374d59da60ff628109490886277f93ea66150 100644 (file)
--- a/src/config/param.s390_linux22.h
+++ b/src/config/param.s390_linux22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -72,3 +75,66 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously s390 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV     1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "s390_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_s390_linux22
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.s390_linux22_usr.h b/src/config/param.s390_linux22_usr.h
index 1712eb57a2c4bef192d883e385c83f935bc9c552..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.s390_linux22_usr.h
+++ b/src/config/param.s390_linux22_usr.h
@@ -1,56 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously s390 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV     1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "s390_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_s390_linux22
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.s390_linux24.h b/src/config/param.s390_linux24.h
index c80aebb6494d3717839d3caa31814fded566d00b..71c351683184a106e4006adc6af20dcd0d9628f9 100644 (file)
--- a/src/config/param.s390_linux24.h
+++ b/src/config/param.s390_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -72,3 +75,67 @@
 #endif /* KERNEL */
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously s390 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV     1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "s390_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_s390_linux24
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.s390_linux24_usr.h b/src/config/param.s390_linux24_usr.h
index d8d56fe59e9e23f8bf983984a6287180fd406b85..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.s390_linux24_usr.h
+++ b/src/config/param.s390_linux24_usr.h
@@ -1,57 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously s390 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV     1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 137
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "s390_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_s390_linux24
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sgi_62.h b/src/config/param.sgi_62.h
index 20e8934d1059bb430e43e443dd73b7df0d74faee..da0a3f63eb9e6d4e60f9e96652a33875a59460ee 100644 (file)
--- a/src/config/param.sgi_62.h
+++ b/src/config/param.sgi_62.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -105,3 +108,77 @@
 #define CMSERVERPREF
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SGI_ENV                1
+#define AFS_USR_SGI62_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_PIOCTL    64+1000
+#define AFS_SYSCALL   73+1000
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sgi_62         1
+#define SYS_NAME       "sgi_62"
+#define SYS_NAME_ID    SYS_NAME_ID_sgi_62
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sgi_62_usr.h b/src/config/param.sgi_62_usr.h
index f6a919a3d16991e534a6cfac418d689959cabc92..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sgi_62_usr.h
+++ b/src/config/param.sgi_62_usr.h
@@ -1,67 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SGI_ENV                1
-#define AFS_USR_SGI62_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_PIOCTL    64+1000
-#define AFS_SYSCALL   73+1000
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sgi_62         1
-#define SYS_NAME       "sgi_62"
-#define SYS_NAME_ID    SYS_NAME_ID_sgi_62
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sgi_63.h b/src/config/param.sgi_63.h
index 6f01cab4deade37dd63f2dc73b50db2ddac6158d..003f84fe550523203ff777ac6c643e410973b6af 100644 (file)
--- a/src/config/param.sgi_63.h
+++ b/src/config/param.sgi_63.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -97,3 +100,78 @@
 #define CMSERVERPREF
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY33_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SGI_ENV                1
+#define AFS_USR_SGI62_ENV      1
+#define AFS_USR_SGI63_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_PIOCTL    64+1000
+#define AFS_SYSCALL   73+1000
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sgi_63         1
+#define SYS_NAME       "sgi_63"
+#define SYS_NAME_ID    SYS_NAME_ID_sgi_63
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sgi_63_usr.h b/src/config/param.sgi_63_usr.h
index 3f4995080769f0808d86655a75692ced8d989531..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sgi_63_usr.h
+++ b/src/config/param.sgi_63_usr.h
@@ -1,68 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY33_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SGI_ENV                1
-#define AFS_USR_SGI62_ENV      1
-#define AFS_USR_SGI63_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_PIOCTL    64+1000
-#define AFS_SYSCALL   73+1000
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sgi_63         1
-#define SYS_NAME       "sgi_63"
-#define SYS_NAME_ID    SYS_NAME_ID_sgi_63
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sgi_64.h b/src/config/param.sgi_64.h
index 9e2b2d8aaf13af6d514aa86633a612f999cd4155..589e268258b2c1af931a87d7a424d6bb3e3c7745 100644 (file)
--- a/src/config/param.sgi_64.h
+++ b/src/config/param.sgi_64.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -112,3 +115,79 @@
 #define CMSERVERPREF
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SGI_ENV                1
+#define AFS_USR_SGI62_ENV      1
+#define AFS_USR_SGI63_ENV      1
+#define AFS_USR_SGI64_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_PIOCTL    64+1000
+#define AFS_SYSCALL   73+1000
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sgi_64         1
+#define SYS_NAME       "sgi_64"
+#define SYS_NAME_ID    SYS_NAME_ID_sgi_64
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sgi_64_usr.h b/src/config/param.sgi_64_usr.h
index 308d57b2d924fadd4d7d1d4a30b65dd805408b5d..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sgi_64_usr.h
+++ b/src/config/param.sgi_64_usr.h
@@ -1,69 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SGI_ENV                1
-#define AFS_USR_SGI62_ENV      1
-#define AFS_USR_SGI63_ENV      1
-#define AFS_USR_SGI64_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_PIOCTL    64+1000
-#define AFS_SYSCALL   73+1000
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sgi_64         1
-#define SYS_NAME       "sgi_64"
-#define SYS_NAME_ID    SYS_NAME_ID_sgi_64
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h
index 63afdd23e440f3eb5d95876c5f4249c09b7de7ab..9a82b8daf43087b92a7b94981b201c84b516d0ea 100644 (file)
--- a/src/config/param.sgi_65.h
+++ b/src/config/param.sgi_65.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -120,3 +123,81 @@
 #define CMSERVERPREF
 #endif
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SGI_ENV                1
+#define AFS_USR_SGI62_ENV      1
+#define AFS_USR_SGI63_ENV      1
+#define AFS_USR_SGI64_ENV      1
+#define AFS_USR_SGI65_ENV      1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+
+#define AFS_PIOCTL    64+1000
+#define AFS_SYSCALL   73+1000
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sgi_65         1
+#define SYS_NAME       "sgi_65"
+#define SYS_NAME_ID    SYS_NAME_ID_sgi_65
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sgi_65_usr.h b/src/config/param.sgi_65_usr.h
index eb32d0ea2db1a6a85807ea04bb3bc318096de76b..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sgi_65_usr.h
+++ b/src/config/param.sgi_65_usr.h
@@ -1,71 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SGI_ENV                1
-#define AFS_USR_SGI62_ENV      1
-#define AFS_USR_SGI63_ENV      1
-#define AFS_USR_SGI64_ENV      1
-#define AFS_USR_SGI65_ENV      1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-
-#define AFS_PIOCTL    64+1000
-#define AFS_SYSCALL   73+1000
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sgi_65         1
-#define SYS_NAME       "sgi_65"
-#define SYS_NAME_ID    SYS_NAME_ID_sgi_65
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sparc64_linux22.h b/src/config/param.sparc64_linux22.h
index c4010e231ed67825aa08756726622632540cb78f..15beefafbff314da9a1751bf7111dd0a62238f7b 100644 (file)
--- a/src/config/param.sparc64_linux22.h
+++ b/src/config/param.sparc64_linux22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -84,3 +87,66 @@
 #endif
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc64_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux22
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sparc64_linux22_usr.h b/src/config/param.sparc64_linux22_usr.h
index c61fd9c67849dc64db090bbb13f6e2781370042d..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sparc64_linux22_usr.h
+++ b/src/config/param.sparc64_linux22_usr.h
@@ -1,56 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc64 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 227
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "sparc64_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux22
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sparc64_linux24.h b/src/config/param.sparc64_linux24.h
index 1406385264046da537e89905f3121250ec6af044..f70920193afc36bb8de2c0917d0e333dd1b3948b 100644 (file)
--- a/src/config/param.sparc64_linux24.h
+++ b/src/config/param.sparc64_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -83,3 +86,67 @@
 #endif
 
 #endif /* _PARAM_SPARC64_LINUX24_H_ */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef _PARAM_USR_SPARC64_LINUX24_H_
+#define _PARAM_USR_SPARC64_LINUX24_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc64 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc64_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux24
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* _PARAM_USR_SPARC64_LINUX24_H_ */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sparc64_linux24_usr.h b/src/config/param.sparc64_linux24_usr.h
index 45129502db1e41412d19fe7a881a74bf1a294260..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sparc64_linux24_usr.h
+++ b/src/config/param.sparc64_linux24_usr.h
@@ -1,57 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef _PARAM_USR_SPARC64_LINUX24_H_
-#define _PARAM_USR_SPARC64_LINUX24_H_
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc64 specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 227
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "sparc64_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_sparc64_linux24
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* _PARAM_USR_SPARC64_LINUX24_H_ */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h
index 56cf4b5e5e53ddadf28ed9953e2644fe0fa6be4e..a86168f966362777aafca9cb6f9ec682fad6f564 100644 (file)
--- a/src/config/param.sparc_linux22.h
+++ b/src/config/param.sparc_linux22.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -85,3 +88,66 @@
 #endif
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc_linux22
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sparc_linux22_usr.h b/src/config/param.sparc_linux22_usr.h
index 77ef74e28ddfd69c20d66d1d730edd043d459a2e..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sparc_linux22_usr.h
+++ b/src/config/param.sparc_linux22_usr.h
@@ -1,56 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 227
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "sparc_linux22"
-#define SYS_NAME_ID    SYS_NAME_ID_sparc_linux22
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sparc_linux24.h b/src/config/param.sparc_linux24.h
index 3dcdc5362111cf11e1c3e398695d37cc8e0a4428..3d2df95f44c28c1dd7e6f793a27ed98798ebc0fb 100644 (file)
--- a/src/config/param.sparc_linux24.h
+++ b/src/config/param.sparc_linux24.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /* Copyright (C) 1998 by Transarc Corporation */
 
 
@@ -87,3 +90,67 @@
 #endif
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously sparc specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_USR_LINUX20_ENV    1
+#define AFS_USR_LINUX22_ENV    1
+#define AFS_USR_LINUX24_ENV    1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 227
+#define AFS_64BIT_IOPS_ENV  1
+#define AFS_NAMEI_ENV     1   /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME       "sparc_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_sparc_linux24
+#define AFSBIG_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sparc_linux24_usr.h b/src/config/param.sparc_linux24_usr.h
index 49c6d7ab92bc955e9ba3f445fd958d0e94c293ff..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sparc_linux24_usr.h
+++ b/src/config/param.sparc_linux24_usr.h
@@ -1,57 +1 @@
-/* Copyright (C) 1998 by Transarc Corporation */
-
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
- * it's a judgment call. If something is obviously sparc specific, use that
- * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
- * in the sysname is the current version of the client. This takes into
- * account the perferred OS user space configuration as well as the kernel.
- */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_ENV                        1
-#define AFS_USR_LINUX20_ENV    1
-#define AFS_USR_LINUX22_ENV    1
-#define AFS_USR_LINUX24_ENV    1
-#define AFS_NONFSTRANS 1
-
-#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
-#define AFS_SYSCALL 227
-#define AFS_64BIT_IOPS_ENV  1
-#define AFS_NAMEI_ENV     1   /* User space interface to file system */
-#include <afs/afs_sysnames.h>
-
-#define AFS_USERSPACE_IP_ADDR 1
-#define RXK_LISTENER_ENV 1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-
-/* Machine / Operating system information */
-#define SYS_NAME       "sparc_linux24"
-#define SYS_NAME_ID    SYS_NAME_ID_sparc_linux24
-#define AFSBIG_ENDIAN    1
-#define AFS_HAVE_FFS        1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
-#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
-
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4_413.h b/src/config/param.sun4_413.h
index c714e01667aef5d157c67fcabf40b6a239ac3efc..60d24e763c71f37b01404899214e0e14265f29e7 100644 (file)
--- a/src/config/param.sun4_413.h
+++ b/src/config/param.sun4_413.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*\r
  * Copyright 2000, International Business Machines Corporation and others.\r
  * All Rights Reserved.\r
@@ -67,3 +70,68 @@
 #endif\r
 \r
 #endif /* AFS_PARAM_H */\r
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*\r
+ * Copyright 2000, International Business Machines Corporation and others.\r
+ * All Rights Reserved.\r
+ * \r
+ * This software has been released under the terms of the IBM Public\r
+ * License.  For details, see the LICENSE file in the top-level source\r
+ * directory or online at http://www.openafs.org/dl/license10.html\r
+ */\r
+\r
+#ifndef        AFS_PARAM_H\r
+#define        AFS_PARAM_H\r
+\r
+#define UKERNEL\r
+#define AFS_ENV                        1\r
+/* define AFS_USR_XXX_ENV XXX */\r
+\r
+#include <afs/afs_sysnames.h>\r
+\r
+#define RXK_LISTENER_ENV        1\r
+#define AFS_USERSPACE_IP_ADDR   1\r
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */\r
+\r
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */\r
+#define        AFS_SYSCALL             31\r
+\r
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */\r
+#define AFS_MOUNT_AFS   1\r
+\r
+/* Machine / Operating system information */\r
+#define sys_sun4_413   1\r
+#define SYS_NAME       "sun4_413"\r
+#define SYS_NAME_ID    SYS_NAME_ID_sun4_411\r
+#define AFSBIG_ENDIAN  1\r
+#define AFS_HAVE_FFS    1       /* Use system's ffs. */\r
+#define AFS_HAVE_STATVFS 0\r
+\r
+/* Extra kernel definitions (from kdefs file) */\r
+#ifdef KERNEL\r
+/* sun definitions here */\r
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */\r
+#define        afsio_iov               uio_iov\r
+#define        afsio_iovcnt    uio_iovcnt\r
+#define        afsio_offset    uio_offset\r
+#define        afsio_seg               uio_segflg\r
+#define        afsio_fmode     uio_fmode\r
+#define        afsio_resid     uio_resid\r
+#define        AFS_UIOSYS      1\r
+#define        AFS_UIOUSER     UIO_USERSPACE\r
+#define        AFS_CLBYTES     MCLBYTES\r
+#define        AFS_MINCHANGE   2\r
+#define        VATTR_NULL      usr_vattr_null\r
+#endif /* KERNEL */\r
+#define        AFS_DIRENT      \r
+#ifndef CMSERVERPREF\r
+#define CMSERVERPREF\r
+#endif\r
+\r
+#endif /* AFS_PARAM_H */\r
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4_413_usr.h b/src/config/param.sun4_413_usr.h
index 1fc7f4a0926f293369b3e3fa9ab7f853d08108ce..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4_413_usr.h
+++ b/src/config/param.sun4_413_usr.h
@@ -1,58 +1 @@
-/*\r
- * Copyright 2000, International Business Machines Corporation and others.\r
- * All Rights Reserved.\r
- * \r
- * This software has been released under the terms of the IBM Public\r
- * License.  For details, see the LICENSE file in the top-level source\r
- * directory or online at http://www.openafs.org/dl/license10.html\r
- */\r
-\r
-#ifndef        AFS_PARAM_H\r
-#define        AFS_PARAM_H\r
-\r
-#define UKERNEL\r
-#define AFS_ENV                        1\r
-/* define AFS_USR_XXX_ENV XXX */\r
-\r
-#include <afs/afs_sysnames.h>\r
-\r
-#define RXK_LISTENER_ENV        1\r
-#define AFS_USERSPACE_IP_ADDR   1\r
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */\r
-\r
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */\r
-#define        AFS_SYSCALL             31\r
-\r
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */\r
-#define AFS_MOUNT_AFS   1\r
-\r
-/* Machine / Operating system information */\r
-#define sys_sun4_413   1\r
-#define SYS_NAME       "sun4_413"\r
-#define SYS_NAME_ID    SYS_NAME_ID_sun4_411\r
-#define AFSBIG_ENDIAN  1\r
-#define AFS_HAVE_FFS    1       /* Use system's ffs. */\r
-#define AFS_HAVE_STATVFS 0\r
-\r
-/* Extra kernel definitions (from kdefs file) */\r
-#ifdef KERNEL\r
-/* sun definitions here */\r
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */\r
-#define        afsio_iov               uio_iov\r
-#define        afsio_iovcnt    uio_iovcnt\r
-#define        afsio_offset    uio_offset\r
-#define        afsio_seg               uio_segflg\r
-#define        afsio_fmode     uio_fmode\r
-#define        afsio_resid     uio_resid\r
-#define        AFS_UIOSYS      1\r
-#define        AFS_UIOUSER     UIO_USERSPACE\r
-#define        AFS_CLBYTES     MCLBYTES\r
-#define        AFS_MINCHANGE   2\r
-#define        VATTR_NULL      usr_vattr_null\r
-#endif /* KERNEL */\r
-#define        AFS_DIRENT      \r
-#ifndef CMSERVERPREF\r
-#define CMSERVERPREF\r
-#endif\r
-\r
-#endif /* AFS_PARAM_H */\r
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4x_55.h b/src/config/param.sun4x_55.h
index 443957b91b5808055d80bd166b858b11fc2e6601..1911cbe88bece18b9b7a51f2b0357d0eed14d4e4 100644 (file)
--- a/src/config/param.sun4x_55.h
+++ b/src/config/param.sun4x_55.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -88,3 +91,75 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             105
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_55   1
+#define SYS_NAME       "sun4x_55"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4x_55_usr.h b/src/config/param.sun4x_55_usr.h
index 105847e2a642eeddb490a1cd2ec25cb921b6c113..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4x_55_usr.h
+++ b/src/config/param.sun4x_55_usr.h
@@ -1,65 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             105
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_55   1
-#define SYS_NAME       "sun4x_55"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4x_56.h b/src/config/param.sun4x_56.h
index 3492a22a8e52ef7822da840c5252f442f2c05a20..396ffb3218135bfe4c1b8eb08c927db47294dec2 100644 (file)
--- a/src/config/param.sun4x_56.h
+++ b/src/config/param.sun4x_56.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -87,3 +90,76 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             105
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_55   1
+#define SYS_NAME       "sun4x_55"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4x_56_usr.h b/src/config/param.sun4x_56_usr.h
index b616e4bfe796f6c7c2ee51236ff2da39e4692a15..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4x_56_usr.h
+++ b/src/config/param.sun4x_56_usr.h
@@ -1,66 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-/*#define AFS_GLOBAL_SUNLOCK   1*/     /* For global locking */
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             105
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_55   1
-#define SYS_NAME       "sun4x_55"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS       0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4x_57.h b/src/config/param.sun4x_57.h
index 4e56aaf99f9c196b83eef400197bae368bd6394f..0d6e348867d94e4a0d8e46af488c74d18145aff8 100644 (file)
--- a/src/config/param.sun4x_57.h
+++ b/src/config/param.sun4x_57.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -113,3 +116,78 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+#ifdef undef
+#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
+#endif
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             73
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_55   1
+#define SYS_NAME       "sun4x_55"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4x_57_usr.h b/src/config/param.sun4x_57_usr.h
index 0e020e5bc2f3629714c81074dda3f19a6f2a1dcf..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4x_57_usr.h
+++ b/src/config/param.sun4x_57_usr.h
@@ -1,68 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-#ifdef undef
-#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
-#endif
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             73
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_55   1
-#define SYS_NAME       "sun4x_55"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h
index e943d151d5da98d579625ddb5bef253b228a06fe..badc6454dae8ed66f5de5c73f376aa7302dfce86 100644 (file)
--- a/src/config/param.sun4x_58.h
+++ b/src/config/param.sun4x_58.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -110,3 +113,73 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+#define AFS_USR_SUN7_ENV       1
+#define AFS_USR_SUN8_ENV       1
+
+#define AFS_64BIT_ENV          1
+
+#include <afs/afs_sysnames.h>
+
+#if 0
+#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
+#endif
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             65
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_58   1
+#define SYS_NAME       "sun4x_58"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_58
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4x_58_usr.h b/src/config/param.sun4x_58_usr.h
index 51597732b51ea375a594f88ec20af5b1b1a453f5..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4x_58_usr.h
+++ b/src/config/param.sun4x_58_usr.h
@@ -1,63 +1 @@
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-#define AFS_USR_SUN7_ENV       1
-#define AFS_USR_SUN8_ENV       1
-
-#define AFS_64BIT_ENV          1
-
-#include <afs/afs_sysnames.h>
-
-#if 0
-#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
-#endif
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             65
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_58   1
-#define SYS_NAME       "sun4x_58"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_58
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h
index 60a07e57d6328e260adec1d0bb6ac56c9e43cd06..edb847a0056d176a108328f4afa917302d825b54 100644 (file)
--- a/src/config/param.sun4x_59.h
+++ b/src/config/param.sun4x_59.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
@@ -111,3 +114,74 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+#define AFS_USR_SUN7_ENV       1
+#define AFS_USR_SUN8_ENV       1
+#define AFS_USR_SUN9_ENV       1
+
+#define AFS_64BIT_ENV          1
+
+#include <afs/afs_sysnames.h>
+
+#if 0
+#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
+#endif
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             65
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_59   1
+#define SYS_NAME       "sun4x_59"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_59
+#define AFSBIG_ENDIAN  1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sun4x_59_usr.h b/src/config/param.sun4x_59_usr.h
index 30e38d0193220275eaba996f205c7cdfac1b0c6b..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sun4x_59_usr.h
+++ b/src/config/param.sun4x_59_usr.h
@@ -1,64 +1 @@
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-#define AFS_USR_SUN7_ENV       1
-#define AFS_USR_SUN8_ENV       1
-#define AFS_USR_SUN9_ENV       1
-
-#define AFS_64BIT_ENV          1
-
-#include <afs/afs_sysnames.h>
-
-#if 0
-#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
-#endif
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             65
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_59   1
-#define SYS_NAME       "sun4x_59"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_59
-#define AFSBIG_ENDIAN  1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sunx86_54.h b/src/config/param.sunx86_54.h
index 10c0d2839ebb6d0b5c7a92df099d98d960f49fd4..29ffa171ef53089dbcdadc267b972103cdf8b59f 100644 (file)
--- a/src/config/param.sunx86_54.h
+++ b/src/config/param.sunx86_54.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -73,3 +76,10 @@
 
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sunx86_57.h b/src/config/param.sunx86_57.h
index 3c6fb87f5e4ed48d6e33838962c47f7da6aee7a5..5fb943a795cbb305f39f671fca158348098a17c8 100644 (file)
--- a/src/config/param.sunx86_57.h
+++ b/src/config/param.sunx86_57.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -114,3 +117,78 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+#if 0
+#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
+#endif
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             73
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_55   1
+#define SYS_NAME       "sun4x_55"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
+#define AFSLITTLE_ENDIAN       1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sunx86_57_usr.h b/src/config/param.sunx86_57_usr.h
index 3dace32b4f21a774c77c90f484e9834b574b5273..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sunx86_57_usr.h
+++ b/src/config/param.sunx86_57_usr.h
@@ -1,68 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-#if 0
-#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
-#endif
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             73
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_55   1
-#define SYS_NAME       "sun4x_55"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
-#define AFSLITTLE_ENDIAN       1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h
index 74b029bac7c7ea7cc1f3a0e64cc31c9f364d68b5..31ec5744ce3e5b1dde718f9399763e8291a2fc7d 100644 (file)
--- a/src/config/param.sunx86_58.h
+++ b/src/config/param.sunx86_58.h
@@ -1,3 +1,6 @@
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
@@ -120,3 +123,78 @@
 #define        ROOTINO         UFSROOTINO
 
 #endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#define AFS_VFS_ENV    1
+/* Used only in vfsck code; is it needed any more???? */
+#define RXK_LISTENER_ENV       1
+#define AFS_USERSPACE_IP_ADDR  1
+#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
+#define AFS_ENV                        1
+#define AFS_USR_SUN5_ENV       1
+#define AFS_USR_SUN6_ENV       1
+
+#include <afs/afs_sysnames.h>
+
+#if 0
+#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
+#endif
+
+#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#define        AFS_SYSCALL             65
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS   1
+
+/* Machine / Operating system information */
+#define sys_sun4x_55   1
+#define SYS_NAME       "sun4x_55"
+#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
+#define AFSLITTLE_ENDIAN       1
+#define AFS_HAVE_FFS            1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef KERNEL
+#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
+#define        AFS_SYSVLOCK            1       /* sys v locking supported */
+/*#define      AFS_USEBUFFERS  1*/
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+#endif /* KERNEL */
+#define        AFS_DIRENT      
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+#define        ROOTINO         UFSROOTINO
+
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */

diff --git a/src/config/param.sunx86_58_usr.h b/src/config/param.sunx86_58_usr.h
index a0520686ddaea97300db444c77619a5bef0d5405..5f39e4cb2570dfd8517040988276cae895981f90 100644 (file)
--- a/src/config/param.sunx86_58_usr.h
+++ b/src/config/param.sunx86_58_usr.h
@@ -1,68 +1 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#define AFS_VFS_ENV    1
-/* Used only in vfsck code; is it needed any more???? */
-#define RXK_LISTENER_ENV       1
-#define AFS_USERSPACE_IP_ADDR  1
-#define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
-
-#define UKERNEL                        1       /* user space kernel */
-#define AFS_GREEDY43_ENV       1       /* Used only in rx/rx_user.c */
-#define AFS_ENV                        1
-#define AFS_USR_SUN5_ENV       1
-#define AFS_USR_SUN6_ENV       1
-
-#include <afs/afs_sysnames.h>
-
-#if 0
-#define AFS_GLOBAL_SUNLOCK     1       /* For global locking */
-#endif
-
-#define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
-#define        AFS_SYSCALL             65
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS   1
-
-/* Machine / Operating system information */
-#define sys_sun4x_55   1
-#define SYS_NAME       "sun4x_55"
-#define SYS_NAME_ID    SYS_NAME_ID_sun4x_55
-#define AFSLITTLE_ENDIAN       1
-#define AFS_HAVE_FFS            1       /* Use system's ffs. */
-#define AFS_HAVE_STATVFS      0       /* System doesn't support statvfs */
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef KERNEL
-#define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
-#define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
-#define        afsio_iov       uio_iov
-#define        afsio_iovcnt    uio_iovcnt
-#define        afsio_offset    uio_offset
-#define        afsio_seg       uio_segflg
-#define        afsio_fmode     uio_fmode
-#define        afsio_resid     uio_resid
-#define        AFS_UIOSYS      1
-#define        AFS_UIOUSER     UIO_USERSPACE
-#define        AFS_CLBYTES     MCLBYTES
-#define        AFS_MINCHANGE   2
-#define        VATTR_NULL      usr_vattr_null
-#endif /* KERNEL */
-#define        AFS_DIRENT      
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-#define        ROOTINO         UFSROOTINO
-
-#endif /* AFS_PARAM_H */
+#error This file is deprecated, do not use or maintain.

diff --git a/src/config/stds.h b/src/config/stds.h
index 73c766f5fe437bfaf069f39dbdd108b58f720633..822d2910dfdcc09ef994b9a541f4aa3d84d71e59 100644 (file)
--- a/src/config/stds.h
+++ b/src/config/stds.h
@@ -186,15 +186,6 @@ typedef struct afs_hyper_t { /* unsigned 64 bit integers */
 /*#define abs(x)                  ((x) >= 0 ? (x) : -(x))*/
 #endif
 
-#if defined(AFS_LINUX20_ENV) && defined(KERNEL)
-/* This is here instead of osi_machdep.h so fcrypt.c can pick it up. */
-#include "../h/string.h"
-#if 0
-#define bcopy(F, T, C) memcpy((T), (F), (C))
-#endif
-#endif
-
-
 /* minumum length of string to pass to int_to_base64 */
 typedef char b64_string_t[8];
 #if defined(AFS_HPUX_ENV) || defined(AFS_USR_HPUX_ENV) || (defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV))

diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in
index 41985e8dd6e74cc4d94971b3ab2f28c146f2e612..f7e3d0f40b96e14ec226b6f13068933f2abd087a 100644 (file)
--- a/src/dauth/Makefile.in
+++ b/src/dauth/Makefile.in
@@ -38,9 +38,6 @@ USNS=         cellname
 
 include ../config/Makefile.version
 
-ukinstall webinstall:
-               echo No $@ source here
-
 noversion:     install
 
 all: dlog dpass

diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index 43e3bf2acbb74cd9c2584a4889f1b6cdf0673130..00dc088db13816df507f1f4dcb75e6e97dc26b3c 100644 (file)
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -44,7 +44,7 @@ OBJS = \
        crypt.o \
        util.o
 
-all: ukinstall \
+all: \
        ${TOP_LIBDIR}/libdes.a \
        ${TOP_INCDIR}/des.h \
        ${TOP_INCDIR}/des_prototypes.h \
@@ -179,27 +179,6 @@ ${DEST}/include/mit-cpyright.h: mit-cpyright.h
 ${DEST}/include/des_odd.h: odd.h
        ${INSTALL} $? $@
 
-ukinstall: \
-       ${UKERNELDIR}/des/libdes.a \
-       ${UKERNELDIR}/des/des.h \
-       ${UKERNELDIR}/des/des_prototypes.h \
-       ${UKERNELDIR}/des/mit-cpyright.h 
-
-${UKERNELDIR}/des:
-       mkdir -p $?
-
-${UKERNELDIR}/des/libdes.a: libdes.a
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/des/des.h: des.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/des/des_prototypes.h: des_prototypes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/des/mit-cpyright.h: mit-cpyright.h
-       ${INSTALL} $? $@
-
 #
 # Misc. targets
 #

diff --git a/src/des/des.h b/src/des/des.h
index eb0ea1f4389aebe7493b4bb979c4973d691de94a..b2cdb63d34e6805471d83c219e88b9e419722410 100644 (file)
--- a/src/des/des.h
+++ b/src/des/des.h
@@ -12,7 +12,7 @@
 #define DES_DEFS
 
 #if defined(UKERNEL)
-#include "../des/mit-cpyright.h"
+#include "des/mit-cpyright.h"
 #else /* defined(UKERNEL) */
 #include <mit-cpyright.h>
 #endif /* defined(UKERNEL) */

diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in
index 15baf7298bd6b89624df8ba30600398bb9c437e5..ca9996ad559f4821cb825390a5198f22fa6eff85 100644 (file)
--- a/src/des/test/Makefile.in
+++ b/src/des/test/Makefile.in
@@ -21,9 +21,6 @@ clean:
 
 install:
 
-kinstall:
-       @echo No kernel source here.
-
 testit: testit.o 
        ${CC} ${CFLAGS} testit.o ${LIBS} ${LDFLAGS} -o testit
 verify: verify.o ../libdes.a

diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in
index 4e0fafa610565087c36fb17d3211cccdf1cfcd6f..af7212ccbe34a613ebb5fd798b1ecf30fa4fe0d6 100644 (file)
--- a/src/dir/Makefile.in
+++ b/src/dir/Makefile.in
@@ -13,13 +13,10 @@ CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
 
 all: \
        ${TOP_LIBDIR}/libdir.a \
-       ${TOP_INCDIR}/afs/dir.h \
-       ${KERNELDIR}/afs \
-       ${KERNELDIR}/afs/dir.h \
-       ${KERNELDIR}/afs/afs_dir.c \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/dir.h \
-       ${UKERNELDIR}/afs/afs_dir.c
+       depinstall
+
+depinstall: \
+       ${TOP_INCDIR}/afs/dir.h 
 
 libdir.a: buffer.o dir.o salvage.o AFS_component_version_number.o
        $(RM) -f $@
@@ -45,24 +42,6 @@ ${TOP_INCDIR}/afs/dir.h: dir.h
 ${TOP_LIBDIR}/libdir.a: libdir.a
        ${INSTALL} $? $@
 
-${KERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${KERNELDIR}/afs/dir.h: dir.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/afs_dir.c: dir.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/dir.h: dir.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/afs_dir.c: dir.c
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${libdir}/afs/libdir.a \
        ${DESTDIR}${includedir}/afs/dir.h

diff --git a/src/dir/dir.c b/src/dir/dir.c
index 21239f9155669c04a6abc020cc4f03f3a682595d..00fffaac57b1202825358d022a8711ff471c9b8a 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -14,40 +14,40 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #if !defined(UKERNEL)
-#include "../h/types.h"
-#include "../h/param.h"
+#include "h/types.h"
+#include "h/param.h"
 #ifdef AFS_AUX_ENV
-#include "../h/mmu.h"
-#include "../h/seg.h"
-#include "../h/sysmacros.h"
-#include "../h/signal.h"
-#include "../h/errno.h"
+#include "h/mmu.h"
+#include "h/seg.h"
+#include "h/sysmacros.h"
+#include "h/signal.h"
+#include "h/errno.h"
 #endif
-#include "../h/time.h"
+#include "h/time.h"
 #if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
-#include "../h/errno.h"
+#include "h/errno.h"
 #else
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV)
-#include "../h/kernel.h"
+#include "h/kernel.h"
 #endif
 #endif
 #if    defined(AFS_SUN56_ENV) || defined(AFS_HPUX_ENV)
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #endif
 #if defined(AFS_FBSD_ENV)
-#include "../h/lock.h"
-#include "../vm/vm.h"
-#include "../vm/vm_extern.h"
-#include "../vm/pmap.h"
-#include "../vm/vm_map.h"
+#include "h/lock.h"
+#include "vm/vm.h"
+#include "vm/vm_extern.h"
+#include "vm/pmap.h"
+#include "vm/vm_map.h"
 #endif /* AFS_FBSD_ENV */
 #if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../h/user.h"
+#include "h/user.h"
 #endif /* AFS_SGI64_ENV */
-#include "../h/uio.h"
+#include "h/uio.h"
 #ifdef AFS_DEC_ENV
-#include "../afs/gfs_vfs.h"
-#include "../afs/gfs_vnode.h"
+#include "afs/gfs_vfs.h"
+#include "afs/gfs_vnode.h"
 #else
 #ifdef AFS_MACH_ENV
 #ifdef  NeXT
@@ -74,22 +74,22 @@ RCSID("$Header$");
 #endif
 #endif
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV)
-#include "../h/mbuf.h"
+#include "h/mbuf.h"
 #endif
 #ifndef AFS_LINUX20_ENV
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #endif
 #else /* !defined(UKERNEL) */
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h"
+#include "afs/stds.h"
+#include "afs/sysincludes.h"
 #endif /* !defined(UKERNEL) */
-#include "../afs/afs_osi.h"
+#include "afs/afs_osi.h"
 
-#include "../afs/dir.h"
+#include "afs/dir.h"
 
-#include "../afs/longc_procs.h"
+#include "afs/longc_procs.h"
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
+#include "h/string.h"
 #endif
 
 /* generic renaming */

diff --git a/src/export/Makefile.in b/src/export/Makefile.in
index bedb6e4d38b16fc80cdd0e3e886388d5218a7465..81f3f1b47c15301659d415113ee95d195aceb2fe 100644 (file)
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@@ -18,20 +18,16 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 include ../config/Makefile.version
 
-all: kinstall ukinstall ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs
-
-noversion system: install
-
-install: ${DESTDIR}${libdir}/afs/export.exp ${DESTDIR}${libdir}/afs/extras.exp  
-
-kinstall:
+all: ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs
        ${INSTALL} ${srcdir}/export.h ${KERNELDIR}
        ${INSTALL} ${srcdir}/export.exp ${KERNELDIR}
-
-ukinstall webinstall:
        ${INSTALL} ${srcdir}/export.h ${UKERNELDIR}
        ${INSTALL} ${srcdir}/export.exp ${UKERNELDIR}
 
+noversion system: install
+
+install: ${DESTDIR}${libdir}/afs/export.exp ${DESTDIR}${libdir}/afs/extras.exp  
+
 export.ext: ${KOBJ}
        case ${SYS_NAME} in \
        rs_aix4* ) \

diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in
index e1ebeb64ad303c6d22df7de9d9ce112755bcde41..045c2281cbd1dc6f4d529b5c6cebe7bfd439559e 100644 (file)
--- a/src/fsint/Makefile.in
+++ b/src/fsint/Makefile.in
@@ -11,38 +11,13 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
 CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
-KSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c \
-       afscbint.h afsint.h afsaux.c
-UKSRCS=${KSRCS}
-
 all: \
-       ${TOP_LIBDIR}/libafsint.a \
+       ${TOP_LIBDIR}/libafsint.a depinstall
+
+depinstall: \
        ${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/afscbint.h \
-       ${KERNELDIR}/afsint \
-       ${KERNELDIR}/afsint/rxgen_consts.h \
-       ${KERNELDIR}/afsint/rx.h \
-       ${KERNELDIR}/afsint/afscbint.h \
-       ${UKERNELDIR}/afsint \
-       ${UKERNELDIR}/afsint/rxgen_consts.h \
-       ${UKERNELDIR}/afsint/rx.h \
-       ${UKERNELDIR}/afsint/afscbint.h \
-       ${KERNELDIR}/afsint/Kcallback.ss.c \
-       ${KERNELDIR}/afsint/Kcallback.h \
-       ${KERNELDIR}/afsint/Kvice.cs.c \
-       ${KERNELDIR}/afsint/Kvice.h \
-       ${KERNELDIR}/afsint/Kvice.xdr.c \
-       ${KERNELDIR}/afsint/afscbint.h \
-       ${KERNELDIR}/afsint/afsint.h \
-       ${KERNELDIR}/afsint/afsaux.c \
-       ${UKERNELDIR}/afsint/Kcallback.ss.c \
-       ${UKERNELDIR}/afsint/Kcallback.h \
-       ${UKERNELDIR}/afsint/Kvice.cs.c \
-       ${UKERNELDIR}/afsint/Kvice.h \
-       ${UKERNELDIR}/afsint/Kvice.xdr.c \
-       ${UKERNELDIR}/afsint/afscbint.h \
-       ${UKERNELDIR}/afsint/afsint.h \
-       ${UKERNELDIR}/afsint/afsaux.c
+       Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h afsint.h 
 
 libafsint.a: ${OBJS} AFS_component_version_number.o
        -$(RM) -f $@
@@ -111,78 +86,6 @@ ${TOP_INCDIR}/afs/afsint.h: afsint.h
 ${TOP_INCDIR}/afs/afscbint.h: afscbint.h
        ${INSTALL} $? $@
 
-${KERNELDIR}/afsint/rxgen_consts.h: ${TOP_INCDIR}/afs/rxgen_consts.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/rx.h: ${KERNELDIR}/rx/rx.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/afscbint.h: afscbint.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint:
-       mkdir -p $@
-
-${UKERNELDIR}/afsint:
-       mkdir -p $@
-
-${UKERNELDIR}/afsint/rxgen_consts.h: ${TOP_INCDIR}/afs/rxgen_consts.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/rx.h: ${UKERNELDIR}/rx/rx.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/afscbint.h: afscbint.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kcallback.ss.c: Kcallback.ss.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kcallback.h: Kcallback.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kvice.cs.c: Kvice.cs.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kvice.h: Kvice.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kvice.xdr.c: Kvice.xdr.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/afscbint.h: afscbint.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/afsint.h: afsint.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/afsaux.c: afsaux.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kcallback.ss.c: Kcallback.ss.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kcallback.h: Kcallback.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kvice.cs.c: Kvice.cs.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kvice.h: Kvice.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kvice.xdr.c: Kvice.xdr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/afscbint.h: afscbint.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/afsint.h: afsint.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/afsaux.c: afsaux.c
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${libdir}/afs/libafsint.a \
        ${DESTDIR}${includedir}/afs/afsint.h \

diff --git a/src/fsint/afsaux.c b/src/fsint/afsaux.c
index 15ce9f0c93ad53fac48f36f66668f4f28ca8f1c6..8be1d1e43c3e260ac88f130cddfc803e449faa5f 100644 (file)
--- a/src/fsint/afsaux.c
+++ b/src/fsint/afsaux.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -18,17 +18,17 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/xdr.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rx/xdr.h"
 #else /* defined(UKERNEL) */
 #if defined(AFS_ALPHA_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #else
-#include "../h/types.h"
-#include "../rpc/types.h"
-#include "../rx/xdr.h"
+#include "h/types.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 #endif
 #if !defined(AFS_ALPHA_ENV)
 #ifndef        XDR_GETINT32
@@ -39,7 +39,7 @@ RCSID("$Header$");
 #endif
 #endif
 #endif /* defined(UKERNEL) */
-#include "../afsint/afsint.h"
+#include "afsint.h"
 #else /* KERNEL */
 # include <rx/xdr.h>
 # include "afsint.h"

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index d2981dde98cc35af67bcae4a5f124e7aabad37f1..7281f876edd3eae2aad4d1f10b111e9c4d9c8c92 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -57,22 +57,13 @@ KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kal
 all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \
        ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libkauth.krb.a \
+       depinstall
+
+depinstall: \
+       kaerrors.c kauth.cs.c kauth.xdr.c \
        ${TOP_INCDIR}/afs/kautils.h \
        ${TOP_INCDIR}/afs/kauth.h \
-       ${TOP_INCDIR}/afs/kaport.h \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afsint \
-       ${UKERNELDIR}/afsint/kauth.h \
-       ${UKERNELDIR}/afsint/kauth.cs.c \
-       ${UKERNELDIR}/afsint/kauth.xdr.c \
-       ${UKERNELDIR}/afs/authclient.c \
-       ${UKERNELDIR}/afs/user.c \
-       ${UKERNELDIR}/afs/kautils.h \
-       ${UKERNELDIR}/afs/kaaux.c \
-       ${UKERNELDIR}/afs/token.c \
-       ${UKERNELDIR}/afs/kalocalcell.c \
-       ${UKERNELDIR}/afs/client.c \
-       ${UKERNELDIR}/afs/kaerrors.c
+       ${TOP_INCDIR}/afs/kaport.h 
 
 test tests: all
        cd test; $(MAKE)
@@ -235,45 +226,6 @@ ${TOP_INCDIR}/afs/kauth.h: kauth.h
 ${TOP_INCDIR}/afs/kaport.h: kaport.h
        ${INSTALL} $? $@
 
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afsint:
-       mkdir -p $@
-
-${UKERNELDIR}/afs/authclient.c: authclient.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/user.c: user.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/kautils.h: kautils.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/kaaux.c: kaaux.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/token.c: token.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/kalocalcell.c: kalocalcell.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/client.c: client.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/kaerrors.c: kaerrors.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/kauth.h: Kkauth.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/kauth.xdr.c: Kkauth.xdr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/kauth.cs.c: Kkauth.cs.c
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${afssrvlibexecdir}/kaserver \
        ${DESTDIR}${sbindir}/kas \

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index fedc7549aa95e8ab4e6e9f45f22e863777e6c313..d1f7fd295cfcd53abdcf1ec1449baddd5295a7fa 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -19,21 +19,21 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_usrops.h"
-#include "../afs/stds.h"
-#include "../afs/pthread_glock.h"
-#include "../rx/rxkad.h"
-#include "../afs/cellconfig.h"
-#include "../afs/ubik.h"
-#include "../afs/auth.h"
-#include "../des/des.h"
-#include "../afs/afsutil.h"
-
-#include "../afsint/kauth.h"
-#include "../afs/kautils.h"
-#include "../afs/pthread_glock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs_usrops.h"
+#include "afs/stds.h"
+#include "afs/pthread_glock.h"
+#include "rx/rxkad.h"
+#include "afs/cellconfig.h"
+#include "ubik.h"
+#include "afs/auth.h"
+#include "des/des.h"
+#include "afs/afsutil.h"
+
+#include "afs/kauth.h"
+#include "afs/kautils.h"
+#include "afs/pthread_glock.h"
 
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 1351ae8cefa4983903176dec3722d1d8906ac6c0..176b951cc31eb58beb3a6cbe64ec2e34d2494853 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,17 +17,17 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../afs/pthread_glock.h"
-#include "../afs/cellconfig.h"
-#include "../afs/afsutil.h"
-#include "../afs/auth.h"
-#include "../afsint/kauth.h"
-#include "../afs/kautils.h"
-#include "../afs/pthread_glock.h"
-#include "../des/des.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "afs/pthread_glock.h"
+#include "afs/cellconfig.h"
+#include "afs/afsutil.h"
+#include "afs/auth.h"
+#include "afs/kauth.h"
+#include "afs/kautils.h"
+#include "afs/pthread_glock.h"
+#include "des/des.h"
 
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>

diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c
index e69ca4f9e574bce8bc6f655eda88fd4903d56baf..6b97dc8d65c9e22582d5d636b3651573f002ee02 100644 (file)
--- a/src/kauth/kaaux.c
+++ b/src/kauth/kaaux.c
@@ -13,8 +13,8 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../rx/xdr.h"
-#include "../afsint/kauth.h"
+#include "rx/xdr.h"
+#include "afs/kauth.h"
 #else /* defined(UKERNEL) */
 #include <rx/xdr.h>
 #include "kauth.h"

diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 8b01262030b8aebef51541e20fb909f961f067e4..435768f98872295c9dbb8ee80055673a6421c104 100644 (file)
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,17 +17,17 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/pthread_glock.h"
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_usrops.h"
-#include "../afs/cellconfig.h"
-#include "../afs/pthread_glock.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../afsint/kauth.h"
-#include "../afs/kautils.h"
-#include "../afs/afsutil.h"
+#include "afs/pthread_glock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs_usrops.h"
+#include "afs/cellconfig.h"
+#include "afs/pthread_glock.h"
+#include "rx/xdr.h"
+#include "rx/rx.h"
+#include "afs/kauth.h"
+#include "afs/kautils.h"
+#include "afs/afsutil.h"
 #else /* defined(UKERNEL) */
 #include <afs/pthread_glock.h>
 #include <sys/types.h>

diff --git a/src/kauth/kautils.p.h b/src/kauth/kautils.p.h
index d0a15a70f6b7b605bbc8b4ded065bf5801d1f82e..99aa34772e30d1352d53ef81a7912d9af11af309 100644 (file)
--- a/src/kauth/kautils.p.h
+++ b/src/kauth/kautils.p.h
@@ -40,9 +40,9 @@
 #include <afs/afsutil.h>
 
 #else
-#include "../afs/ubik.h"
-#include "../afs/auth.h"
-#include "../afs/cellconfig.h"
+#include "ubik.h"
+#include "afs/auth.h"
+#include "afs/cellconfig.h"
 #endif /* !defined(UKERNEL) */
 
 

diff --git a/src/kauth/token.c b/src/kauth/token.c
index ba6e426b123ade5a0e9a8ad093ad396eb3ea8304..8fe488f4f9f092817c2fe86953f109990c2e5a80 100644 (file)
--- a/src/kauth/token.c
+++ b/src/kauth/token.c
@@ -13,7 +13,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -21,17 +21,17 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../afs/pthread_glock.h"
-#include "../afs/lock.h"
-#include "../afs/ubik.h"
-#include "../afsint/kauth.h"
-#include "../afs/kautils.h"
-#include "../afs/auth.h"
-#include "../afs/pthread_glock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "rx/xdr.h"
+#include "afs/pthread_glock.h"
+#include "afs/lock.h"
+#include "ubik.h"
+#include "afs/kauth.h"
+#include "afs/kautils.h"
+#include "afs/auth.h"
+#include "afs/pthread_glock.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>

diff --git a/src/kauth/user.c b/src/kauth/user.c
index 20ed0d9622e089dfe3e29ca2871a70efb9e934c1..d6390c29834df5258ed4252f5ebec593ed76ed12 100644 (file)
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -12,7 +12,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -20,21 +20,21 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../afs/com_err.h"
-#include "../afs/cellconfig.h"
-#include "../afs/auth.h"
-#include "../afsint/ptint.h"
-#include "../afs/pterror.h"
-#include "../afs/ptserver.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../rx/rxkad.h"
-#include "../afsint/kauth.h"
-#include "../afs/kautils.h"
-#include "../afs/afsutil.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "afs/com_err.h"
+#include "afs/cellconfig.h"
+#include "afs/auth.h"
+#include "afs/ptint.h"
+#include "afs/pterror.h"
+#include "afs/ptserver.h"
+#include "rx/rx.h"
+#include "rx/rx_globals.h"
+#include "rx/rxkad.h"
+#include "afs/kauth.h"
+#include "afs/kautils.h"
+#include "afs/afsutil.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <signal.h>

diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in
index f0458d092804c275519669755cd79580504e6050..0e64e941e70d6d9c5116f9c140234eb7dccd1acd 100644 (file)
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@@ -16,12 +16,11 @@ CFLAGS = ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \
 #
 all: \
        ${TOP_LIBDIR}/libacl.a \
+       depinstall
+
+depinstall: \
        ${TOP_INCDIR}/afs/acl.h \
-       ${TOP_INCDIR}/afs/prs_fs.h \
-       ${KERNELDIR}/afs \
-       ${KERNELDIR}/afs/prs_fs.h \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/prs_fs.h
+       ${TOP_INCDIR}/afs/prs_fs.h 
 
 libacl.a: aclprocs.o netprocs.o AFS_component_version_number.o
        $(RM) -f $@
@@ -45,18 +44,6 @@ ${TOP_INCDIR}/afs/acl.h: acl.h
 ${TOP_INCDIR}/afs/prs_fs.h: prs_fs.h
        ${INSTALL} $? $@
 
-${KERNELDIR}/afs:
-       mkdir -p $? $@
-
-${KERNELDIR}/afs/prs_fs.h: prs_fs.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs:
-       mkdir -p $? $@
-
-${UKERNELDIR}/afs/prs_fs.h: prs_fs.h
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${libdir}/afs/libacl.a \
        ${DESTDIR}${includedir}/afs/acl.h \

diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index 7828f7ba1794954f9060ce293de6e183b5965e89..40552831c328e4dc69838579744df6fab18be069 100644 (file)
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -9,24 +9,51 @@
 #
 SHELL=/bin/sh
 INCLUDE= -I.  -I/usr/include -I${TOP_OBJDIR}/src/config
-AFS    =../afs
-RX     =../rx
-AFSINT =../afsint
+
+TOP_OBJ_FSINT = ${TOP_OBJDIR}/src/fsint
+TOP_OBJ_RXSTAT = ${TOP_OBJDIR}/src/rxstat
+TOP_OBJ_VLSERVER = ${TOP_OBJDIR}/src/vlserver
+
+TOP_SRC_AFS = ${TOP_SRCDIR}/afs
+TOP_SRC_RXSTAT = ${TOP_SRCDIR}/rxstat
+TOP_SRC_FSINT = ${TOP_SRCDIR}/fsint
+TOP_SRC_RX = ${TOP_SRCDIR}/rx
+TOP_SRC_VNOPS = ${TOP_SRCDIR}/afs/VNOPS
+TOP_SRC_RXKAD = ${TOP_SRCDIR}/rxkad
+
+COMMON_INCLUDE = -I. -I.. -I../nfs \
+       -I${TOP_SRCDIR} \
+       -I${TOP_SRCDIR}/afs \
+       -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
+       -I${TOP_SRCDIR}/config \
+       -I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \
+       -I${TOP_SRCDIR}/rxkad \
+       -I${TOP_SRCDIR}/rxkad/domestic \
+       -I${TOP_SRCDIR}/util \
+       -I${TOP_OBJDIR}/src \
+       -I${TOP_OBJDIR}/src/afs \
+       -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
+       -I${TOP_OBJDIR}/src/util \
+       -I${TOP_OBJDIR}/src/rxkad \
+       -I${TOP_OBJDIR}/src/config \
+       -I${TOP_OBJDIR}/src/fsint \
+       -I${TOP_OBJDIR}/src/vlserver \
+       -I${TOP_INCDIR} \
+       -I${TOP_INCDIR}/afs \
 
 # Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
 .c.i:
-       $(CC) $(CFLAGS) -P -c $<
+       $(CC) $(COMMON_INCLUDE) $(CFLAGS) -P -c $<
 
 .c.o:
-       $(CC) $(CFLAGS) -c $<
-CRULE1=        $(CC) $(CFLAGS) -c $?
-CRULE2=        $(CC) $(OPTF) $(CFLAGS) -c $?
-CRULE3=        $(CC) $(OPTF2) $(CFLAGS) -c $?
-CRULE4=        $(CC) $(DBG) $(CFLAGS) -c $?
+       $(CC) $(COMMON_INCLUDE) $(CFLAGS) -c $<
+CRULE1=        $(CC) $(COMMON_INCLUDE) $(CFLAGS) -c $?
+CRULE2=        $(CC) $(COMMON_INCLUDE) $(OPTF) $(CFLAGS) -c $?
+CRULE3=        $(CC) $(COMMON_INCLUDE) $(OPTF2) $(CFLAGS) -c $?
+CRULE4=        $(CC) $(COMMON_INCLUDE) $(DBG) $(CFLAGS) -c $?
 
 system:        all
 
-kinstall:      install
 install:       all $(INSTDIRS)
 dest:          all $(DESTDIRS)
 
@@ -37,10 +64,13 @@ single_compdir single_instdir single_destdir:
        echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \
        $(MAKE) DESTDIR=${DESTDIR}  $@_libafs
 
-single_compdir_libafs: libafs
+single_compdir_libafs: depsrcs libafs
 single_instdir_libafs: install_libafs
 single_destdir_libafs: dest_libafs
 
+# placeholder for any sources that are built prior to compiling libafs
+depsrcs: 
+
 AFSAOBJS = \
        afs_atomlist.o \
        afs_lhash.o \
@@ -141,211 +171,233 @@ AFSNONFSOBJS = \
 
 # Compilation rules
 # These files are to be optimized
-afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE2)
-afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE2)
-afs_analyze.o: $(AFS)/afs_analyze.c
+afs_base64.o: $(TOP_SRC_AFS)/afs_base64.c
+       $(CRULE1)
+afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
        $(CRULE2)
-afs_axscache.o: $(AFS)/afs_axscache.c
+afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
        $(CRULE2)
-afs_buffer.o: $(AFS)/afs_buffer.c
+afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
        $(CRULE2)
-afs_cell.o: $(AFS)/afs_cell.c
+afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE2)
-afs_conn.o: $(AFS)/afs_conn.c
+afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE2)
-afs_dcache.o: $(AFS)/afs_dcache.c
+afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE2)
-afs_dynroot.o:         $(AFS)/afs_dynroot.c
+afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
        $(CRULE2)
-afs_init.o: $(AFS)/afs_init.c
+afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE2)
-afs_mariner.o: $(AFS)/afs_mariner.c
+afs_dynroot.o:         $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE2)
-afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+afs_init.o: $(TOP_SRC_AFS)/afs_init.c
        $(CRULE2)
-afs_osi.o:     $(AFS)/afs_osi.c
+afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
        $(CRULE2)
-afs_osi_alloc.o: $(AFS)/afs_osi_alloc.c
+afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
        $(CRULE2)
-afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+afs_osi.o:     $(TOP_SRC_AFS)/afs_osi.c
        $(CRULE2)
-afs_osi_sleep.o: $(AFS)/afs_osi_sleep.c
+afs_osi_alloc.o: $(TOP_SRC_AFS)/afs_osi_alloc.c
        $(CRULE2)
-afs_osi_vnhold.o: $(AFS)/afs_osi_vnhold.c
+afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c
        $(CRULE2)
-afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE2)
-afs_osi_vget.o: $(AFS)/afs_osi_vget.c
+afs_osi_vget.o: $(TOP_SRC_AFS)/afs_osi_vget.c
        $(CRULE1)
-afs_segments.o: $(AFS)/afs_segments.c
+afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE2)
-afs_server.o: $(AFS)/afs_server.c
+afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE2)
-afs_user.o: $(AFS)/afs_user.c
+afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE2)
-afs_util.o: $(AFS)/afs_util.c
+afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE2)
-afs_vcache.o: $(AFS)/afs_vcache.c
+afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE2)
-afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
        $(CRULE1)
-afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c
        $(CRULE1)
-afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c
        $(CRULE1)
-afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c
        $(CRULE1)
-afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c
        $(CRULE1)
-afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c
        $(CRULE1)
-afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c
        $(CRULE1)
-afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c
        $(CRULE1)
-afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c
        $(CRULE1)
-afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c
        $(CRULE1)
-afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c
        $(CRULE1)
-afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c
        $(CRULE1)
-afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c
        $(CRULE1)
-afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c
        $(CRULE1)
-afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c
        $(CRULE1)
-afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c
        $(CRULE1)
-afs_volume.o: $(AFS)/afs_volume.c
+afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
        $(CRULE2)
-rx_rdwr.o: $(RX)/rx_rdwr.c
+rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
        $(CRULE2)
-afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE2)
-xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
+afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
+       $(CRULE2) -o afs_uuid.o
+xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE2)
 
 # these files are not to be optimized - subject to change.
-afs_cbqueue.o: $(AFS)/afs_cbqueue.c
-       $(CRULE1)
-afs_callback.o: $(AFS)/afs_callback.c
+afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
        $(CRULE1)
-afs_chunk.o: $(AFS)/afs_chunk.c
+afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c
        $(CRULE1)
-afs_daemons.o: $(AFS)/afs_daemons.c
+afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c
        $(CRULE1)
-afs_dir.o:     $(AFS)/afs_dir.c
+afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
        $(CRULE1)
-AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+afs_dir.o:     $(TOP_SRCDIR)/dir/dir.c
+       $(CRULE1) -o afs_dir.o
+AFS_component_version_number.o: AFS_component_version_number.c
        $(CRULE1)
-afs_lock.o: $(AFS)/afs_lock.c
+afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
        $(CRULE1)
-afs_memcache.o: $(AFS)/afs_memcache.c
+afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
-afs_stat.o: $(AFS)/afs_stat.c
+afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-fcrypt.o:      $(AFS)/fcrypt.c
+fcrypt.o:      $(TOP_SRC_RXKAD)/domestic/fcrypt.c
        $(CRULE1)
-crypt_conn.o: $(AFS)/crypt_conn.c
+crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE1)
-rxkad_client.o: $(AFS)/rxkad_client.c
+rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
-rxkad_common.o: $(AFS)/rxkad_common.c
+rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
        $(CRULE1)
-afs_exporter.o: $(AFS)/afs_exporter.c
+afs_exporter.o: $(TOP_SRC_AFS)/afs_exporter.c
        $(CRULE1)
-afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
        $(CRULE1)
-afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c
        $(CRULE1)
-rx.o: $(RX)/rx.c
+rx.o: $(TOP_SRC_RX)/rx.c
        $(CRULE1)
-rx_clock.o: $(RX)/rx_clock.c
+rx_clock.o: $(TOP_SRC_RX)/rx_clock.c
        $(CRULE1)
-rx_event.o: $(RX)/rx_event.c
+rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE1)
-rx_globals.o: $(RX)/rx_globals.c
+rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE1)
-rx_misc.o: $(RX)/rx_misc.c
+rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE1)
-rx_null.o: $(RX)/rx_null.c
+rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE1)
-rx_getaddr.o: $(RX)/rx_getaddr.c
+rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE1)
-rx_packet.o: $(RX)/rx_packet.c
+rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
-xdr_rx.o: $(RX)/xdr_rx.c
+xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
-afs_ncrops.o: $(AFS)/afs_ncrops.c
+Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE1)
-afs_aixops.o: $(AFS)/afs_aixops.c
+rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE1)
-afs_aix_subr.o: $(AFS)/afs_aix_subr.c
+Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE1)
-afs_hp_subr.o: $(AFS)/afs_hp_subr.c
+Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE1)
-afs_gfsops.o: $(AFS)/afs_gfsops.c
+Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
        $(CRULE1)
-afs_gfs_subr.o: $(AFS)/afs_gfs_subr.c
+Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c
        $(CRULE1)
-Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+afsaux.o: $(TOP_SRC_FSINT)/afsaux.c
        $(CRULE1)
-rxstat.o: $(AFSINT)/rxstat.c
+xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c
        $(CRULE1)
-Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+xdr_array.o: $(TOP_SRC_RX)/xdr_array.c
        $(CRULE1)
-Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
        $(CRULE1)
-Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
        $(CRULE1)
-Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+xdr.o: $(TOP_SRC_RX)/xdr.c
        $(CRULE1)
-afsaux.o: $(AFSINT)/afsaux.c
+Kvldbint.cs.o: ${TOP_OBJ_VLSERVER}/Kvldbint.cs.c
        $(CRULE1)
-xdr_arrayn.o: $(RX)/xdr_arrayn.c
-       $(CRULE1)
-xdr_array.o: $(RX)/xdr_array.c
-       $(CRULE1)
-xdr_int32.o: $(RX)/xdr_int32.c
-       $(CRULE1)
-xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1)
-xdr.o: $(RX)/xdr.c
-       $(CRULE1)
-Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
-       $(CRULE1)
-Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+Kvldbint.xdr.o: ${TOP_OBJ_VLSERVER}/Kvldbint.xdr.c
        $(CRULE1) -DAFS_UUID_XG
-afs_main.o: $(AFS)/afs_main.c
+rx_kmutex.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_kmutex.c
        $(CRULE1)
-rx_kmutex.o: $(RX)/rx_kmutex.c
+rx_knet.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c
        $(CRULE1)
-rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE1)
-rx_kcommon.o: $(RX)/rx_kcommon.c
+rx_kcommon.o: $(TOP_SRC_RX)/rx_kcommon.c
        $(CRULE1)
 
 # Files which do not contain NFS translator code.
-afs_call.o: $(AFS)/afs_call.c
+afs_call.o: $(TOP_SRC_AFS)/afs_call.c
        $(CRULE1) -DAFS_NONFSTRANS
-afs_pioctl.o: $(AFS)/afs_pioctl.c
+afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS
 
 # NFS Translator versions of the above code.
-afs_call_nfs.o:        $(AFS)/afs_call.c
+afs_call_nfs.o:        $(TOP_SRC_AFS)/afs_call.c
        $(CRULE1) -o afs_call_nfs.o
-afs_pioctl_nfs.o:      $(AFS)/afs_pioctl.c
+afs_pioctl_nfs.o:      $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE1) -o afs_pioctl_nfs.o
 
+# Files which are specific to particular architectures/targets
+# but have common build rules. Place here instead of duplicating
+# in the per-platform Makefiles.
+osi_groups.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_groups.c
+       $(CRULE1)
+osi_inode.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_inode.c
+       $(CRULE1)
+osi_file.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_file.c
+       $(CRULE1)
+osi_sleep.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_sleep.c
+       $(CRULE1)
+osi_misc.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_misc.c
+       $(CRULE1)
+osi_vfsops_nfs.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops_nfs.c
+       $(CRULE1) -o osi_vfsops_nfs.o
+osi_vfsops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops.c
+       $(CRULE1) -DAFS_NONFSTRANS
+osi_vm.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vm.c
+       $(CRULE1)
+osi_vnodeops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c
+       $(CRULE1)
+osi_debug.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_debug.c
+       $(CRULE4)
+osi_module.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_module.c
+       $(CRULE1)
+osi_sysctl.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_sysctl.c
+       $(CRULE1)
+osi_alloc.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_alloc.c
+       $(CRULE1)
+osi_cred.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_cred.c
+       $(CRULE1)
+osi_idbg.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_idbg.c
+       $(CRULE1)
+osi_config.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_config.c
+       $(CRULE1)
+osi_timeout.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_timeout.c
+       $(CRULE1)
+
 
 
 clean:
        -$(RM) -rf STATIC* MODLOAD*
        -$(RM) -rf  h net netinet rpc ufs machine inet nfs sys afs afsint asm asm-generic config rx linux
 
-
+include ${TOP_OBJDIR}/src/config/Makefile.version

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index 481e77c10d63cbdb0cd12d7fc4258b99b5e17fa4..7e5b5db0d786909279de92568fe3beece1542412 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -134,29 +134,8 @@ install_libafs: $(INST_LIBAFS) $(INST_LIBAFSIAUTH)
 dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH)
 
 
-osi_assem.o:   ${AFS}/osi_assem.s
-       ${AS} -o osi_assem.o ${AFS}/osi_assem.s
-osi_config.o: $(AFS)/osi_config.c
-       $(CRULE1)
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_timeout.o: $(AFS)/osi_timeout.c
-       $(CRULE1)
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1)
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)
-
+osi_assem.o:   $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_assem.s
+       ${AS} -o osi_assem.o $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_assem.s
 
 # Build rules for iauth objects.
 afs_call_iauth.o:      $(AFS)/afs_call.c
@@ -165,7 +144,7 @@ afs_nfsclnt_iauth.o:        $(AFS)/afs_nfsclnt.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o
 afs_pioctl_iauth.o:    $(AFS)/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o
-osi_vfsops_iauth.o: $(AFS)/osi_vfsops.c
+osi_vfsops_iauth.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c
        $(CRULE1) -DAFS_NONFSTRANS  -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o
-osi_vnodeops_iauth.o:  $(AFS)/osi_vnodeops.c
+osi_vnodeops_iauth.o:  $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c
        $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index be61239c254fb5bb174d11519e3eb0adcc58fdd6..94d35afe2a41a7919a00736d2e168b6c505a50aa 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -95,26 +95,3 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(LD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS}
-
-
-# Object build rules:
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)
-osi_module.o: $(AFS)/osi_module.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in
index 2cf8b5a20bc8c99b95940508f8dfd8a3d36ca9a4..7c8da62f2ed945015496db7bd7c600cc7c146008 100644 (file)
--- a/src/libafs/MakefileProto.DUX.in
+++ b/src/libafs/MakefileProto.DUX.in
@@ -115,23 +115,3 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
 
 ${AFSMOD}: ${LIBAFSNONFS}
        $(LD) -dc -r -o ${AFSMOD} ${LIBAFSNONFS}
-
-# Object build rules:
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index babc835e7a1beeaa8017c206e103f5d2a9e7d89a..9fbb81d3f1b60a55720cbc0c8065be5e96a3345f 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -118,26 +118,6 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
 
 
 # Object build rules:
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)
-osi_module.o: $(AFS)/osi_module.c
-       $(CRULE1)   
 setdef0.o: setdef0.c
        $(CRULE1)
 setdef1.o: setdef1.c

diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index ed3832df187b7c39082931b13074365b0de77a2c..1adb4d5de6a5dca03ed48fee7a2d2ad035f85980 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -58,13 +58,11 @@ KDEFS_64 = +DA2.0W +DS2.0 +M2 +W 478,530
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT -DHPONCPLUS
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I../h -I../nfs -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I../h -I../nfs -I../conf -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ=STATIC
 
-# This tells Makefile.common to use its single directory build target.
-#COMPDIRS = single_compdir
 # This is the hpux multiple directory target.
 COMPDIRS = hpux_compdirs
 INSTDIRS = hpux_instdirs
@@ -75,8 +73,9 @@ include Makefile.common
 BITS = 64 32
 
 setup:
-       -$(RM) -f  h net dux machine netinet nfs rpc s200 ufs sys
+       -$(RM) -f  h conf net dux machine netinet nfs rpc s200 ufs sys
        ln -fs /usr/include/sys h
+       ln -fs /etc/conf conf
        ln -fs /etc/conf/net net
        ln -fs /etc/conf/dux dux
        ln -fs /etc/conf/machine machine
@@ -117,7 +116,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        done; \
        fi
 
-hpux_compdirs_libafs: libafs
+hpux_compdirs_libafs: depsrcs libafs
 hpux_instdirs_libafs: install_libafs
 hpux_destdirs_libafs: dest_libafs
 
@@ -156,30 +155,3 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(AR) cru $@ $?
        $(RANLIB) $@
-
-
-# HP specific objects
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)
-
-# This is a list of header files compiled with the -g option. It allows
-# examination of AFS structures in a dump.
-osi_debug.o: $(AFS)/osi_debug.c
-       $(CRULE4)
-

diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in
index 89f0707c819b01eb1457d7bf9e46fb0e86e3cd1d..2ec741a3f26cc3827693bb7e169d7a0282bce905 100644 (file)
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@@ -354,8 +354,8 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        done
 <all>
 
-irix_compdirs_STATIC.libafs: STATIC.libafs
-irix_compdirs_MODLOAD.libafs: MODLOAD.libafs
+irix_compdirs_STATIC.libafs: depsrcs STATIC.libafs
+irix_compdirs_MODLOAD.libafs: depsrcs MODLOAD.libafs
 irix_instdirs_STATIC.libafs: install_STATIC.libafs
 irix_instdirs_MODLOAD.libafs: install_MODLOAD.libafs
 irix_destdirs_STATIC.libafs: dest_STATIC.libafs
@@ -460,30 +460,3 @@ dest_LINKFILES:
        ln -fs  libafs.IP20.o       ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP32.o
        ln -fs  libafs.IP20.nonfs.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP22.nonfs.o
        ln -fs  libafs.IP20.nonfs.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP32.nonfs.o
-<all>
-
-
-# Object build rules:
-# Common objects
-afs_base64.o: $(AFS)/afs_base64.c
-       $(CRULE1)
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_idbg.o: $(AFS)/osi_idbg.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 1c1664067ac82da73f8aec21c14f38f96178d00e..3bdcf84f45513094ff9045fa1c840cd678c070c5 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -155,10 +155,10 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                cd ../ ; \
        done
 
-linux_compdirs_libafs: libafs
-linux_compdirs_libafs.mp: libafs.mp
-linux_compdirs_libafs.ep: libafs.ep
-linux_compdirs_libafs.bm: libafs.bm
+linux_compdirs_libafs: depsrcs libafs
+linux_compdirs_libafs.mp: depsrcs libafs.mp
+linux_compdirs_libafs.ep: depsrcs libafs.ep
+linux_compdirs_libafs.bm: depsrcs libafs.bm
 linux_instdirs_libafs: install_libafs
 linux_instdirs_libafs.mp: install_libafs.mp
 linux_instdirs_libafs.ep: install_libafs.ep
@@ -262,30 +262,3 @@ $(DEST_LIBAFS_EP): $(LIBAFS_EP)
 
 $(DEST_LIBAFS_BM): $(LIBAFS_BM)
        ${INSTALL} -f $? $@
-
-
-# Linux specific objects
-osi_alloc.o: $(AFS)/osi_alloc.c
-       $(CRULE1)
-osi_cred.o: $(AFS)/osi_cred.c
-       $(CRULE1)
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_module.o: $(AFS)/osi_module.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_sysctl.o: $(AFS)/osi_sysctl.c
-       $(CRULE1)
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1)
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.NBSD.in b/src/libafs/MakefileProto.NBSD.in
index f88c06f56cd23238d219ebfa311fa41a0391c4a5..779790e5a4002ba6a95b6dc26da4f363ba004d95 100644 (file)
--- a/src/libafs/MakefileProto.NBSD.in
+++ b/src/libafs/MakefileProto.NBSD.in
@@ -104,24 +104,3 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(LD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS}
-
-
-# Object build rules:
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in
index 6ff0b1d44222444aba746c41e7e09e8944b9dfc5..9edb2fc05527f63dc6041f930df70376004bfa0c 100644 (file)
--- a/src/libafs/MakefileProto.OBSD.in
+++ b/src/libafs/MakefileProto.OBSD.in
@@ -95,24 +95,3 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(LD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS}
-
-
-# Object build rules:
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_misc.o: $(AFS)/osi_misc.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index a54f7abe66a75e454da96ef6547c609825799df8..1cb25c4f6ab783d513678df56fde73fe3e17e260 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -104,7 +104,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                cd ../ ;\
        done
 
-solaris_compdirs_libafs: libafs
+solaris_compdirs_libafs: depsrcs libafs
 solaris_instdirs_libafs: install_libafs
 solaris_destdirs_libafs: dest_libafs
 
@@ -161,23 +161,3 @@ install_libafs: ${LIBAFSNONFS} ${LIBAFS}
 dest_libafs: ${LIBAFSNONFS} ${LIBAFS}
        ${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
        ${INSTALL} -f ${LIBAFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o
-
-<all>
-
-# Solaris specific objects
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)

diff --git a/src/libafs/libafsdep b/src/libafs/libafsdep
new file mode 100644 (file)
index 0000000..3355afa
--- /dev/null
+++ b/src/libafs/libafsdep
@@ -0,0 +1,8 @@
+Makefile.common.in
+Makefile.extradefs
+*.plist
+afs.shutdown
+afs.startup
+redhat.sh
+sgi_master
+sgi_system

diff --git a/src/libafsdep b/src/libafsdep
new file mode 100644 (file)
index 0000000..565b12a
--- /dev/null
+++ b/src/libafsdep
@@ -0,0 +1,12 @@
+util/afs_lhash.c
+util/afs_atomlist.c
+util/uuid.c
+dir/dir.c
+fsint/afsaux.c
+fsint/K*.[ch]
+fsint/*.xg
+rxstat/K*.[ch]
+rxstat/*.xg
+rxstat/rxstat.[ch]
+vlserver/K*.[ch]
+vlserver/*.xg

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index 8d545ea15f1709387a1bdf25e44cb304b8d949c8..a80bb3160cac659fc4b0ef693a374f5fd04bbf11 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -20,6 +20,39 @@ DES  =../des
 LIB    =../lib
 NS_INCL =SRC/../afsweb/netscape_includes
 
+TOP_OBJ_FSINT = ${TOP_OBJDIR}/src/fsint
+TOP_OBJ_RXSTAT = ${TOP_OBJDIR}/src/rxstat
+TOP_OBJ_VLSERVER = ${TOP_OBJDIR}/src/vlserver
+
+TOP_SRC_AFS = ${TOP_SRCDIR}/afs
+TOP_SRC_RXSTAT = ${TOP_SRCDIR}/rxstat
+TOP_SRC_FSINT = ${TOP_SRCDIR}/fsint
+TOP_SRC_RX = ${TOP_SRCDIR}/rx
+TOP_SRC_VNOPS = ${TOP_SRCDIR}/afs/VNOPS
+TOP_SRC_RXKAD = ${TOP_SRCDIR}/rxkad
+
+COMMON_INCLUDE = -I. -I.. -I../nfs \
+        -I${TOP_SRCDIR} \
+        -I${TOP_SRCDIR}/afs \
+        -I${TOP_SRCDIR}/afs/UKERNEL \
+        -I${TOP_SRCDIR}/config \
+        -I${TOP_SRCDIR}/rx \
+        -I${TOP_SRCDIR}/rx/UKERNEL \
+        -I${TOP_SRCDIR}/rxkad \
+        -I${TOP_SRCDIR}/rxkad/domestic \
+        -I${TOP_SRCDIR}/util \
+        -I${TOP_OBJDIR}/src \
+        -I${TOP_OBJDIR}/src/afs/UKERNEL \
+        -I${TOP_OBJDIR}/src/afs \
+        -I${TOP_OBJDIR}/src/util \
+        -I${TOP_OBJDIR}/src/rxkad \
+        -I${TOP_OBJDIR}/src/config \
+        -I${TOP_OBJDIR}/src/fsint \
+        -I${TOP_OBJDIR}/src/vlserver \
+       -I${TOP_OBJDIR}/src/libuafs \
+        -I${TOP_INCDIR} \
+        -I${TOP_INCDIR}/afs \
+
 # Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
 
 all: ${TOP_LIBDIR}/$(LIBJUAFS) ${TOP_LIBDIR}/$(LIBUAFS) linktest
@@ -28,10 +61,8 @@ webinstall: all \
        ${TOP_LIBDIR}/$(LIBAFSWEB) \
        ${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
 
-linktest: UAFS/$(LIBUAFS) des/libdes.a
-       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -I. UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS)
-
-ukinstall: install
+linktest: UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a
+       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a $(TEST_LIBS) $(XLIBS)
 
 install: \
        ${DESTDIR}${libdir}/$(LIBUAFS) \
@@ -49,8 +80,8 @@ dest: \
        ${DEST}/root.perf/lib/$(LIBJUAFS)
 
 
-CRULE1=        $(CC) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
-CRULE2=        $(CC) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULE1=        $(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULE2=        $(CC) $(COMMON_INCLUDE) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
 
 UAFSOBJ = \
        $(UOBJ)/afs_atomlist.o \
@@ -103,6 +134,7 @@ UAFSOBJ = \
        $(UOBJ)/afs_usrops.o \
        $(UOBJ)/xdr_afsuuid.o \
        $(UOBJ)/afs_uuid.o \
+       $(UOBJ)/assert.o \
        $(UOBJ)/osi_vnodeops.o \
        $(UOBJ)/osi_vm.o \
        $(UOBJ)/osi_groups.o \
@@ -222,6 +254,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/afs_usrops.o \
        $(WEBOBJ)/xdr_afsuuid.o \
        $(WEBOBJ)/afs_uuid.o \
+       $(WEBOBJ)/assert.o \
        $(WEBOBJ)/osi_vnodeops.o \
        $(WEBOBJ)/osi_vm.o \
        $(WEBOBJ)/osi_groups.o \
@@ -458,6 +491,7 @@ JUAFSOBJ = \
        $(JUAFS)/afs_usrops.o \
        $(JUAFS)/xdr_afsuuid.o \
        $(JUAFS)/afs_uuid.o \
+       $(JUAFS)/assert.o \
        $(JUAFS)/osi_vnodeops.o \
        $(JUAFS)/osi_vm.o \
        $(JUAFS)/osi_groups.o \
@@ -528,750 +562,744 @@ JUAFSOBJ = \
 
 # These files are for the user space library
 
-$(UOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE1)
-$(UOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
+$(UOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
        $(CRULE1)
-$(UOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
+$(UOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
        $(CRULE1)
-$(UOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
+$(UOBJ)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
        $(CRULE1)
-$(UOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
+$(UOBJ)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE1)
-$(UOBJ)/afs_cell.o: $(AFS)/afs_cell.c
+$(UOBJ)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE1)
-$(UOBJ)/afs_conn.o: $(AFS)/afs_conn.c
+$(UOBJ)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE1)
-$(UOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
+$(UOBJ)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
        $(CRULE1)
-$(UOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
+$(UOBJ)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE1)
-$(UOBJ)/afs_init.o: $(AFS)/afs_init.c
+$(UOBJ)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE1)
-$(UOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
+$(UOBJ)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c
        $(CRULE1)
-$(UOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+$(UOBJ)/afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
        $(CRULE1)
-$(UOBJ)/afs_osi.o:     $(AFS)/afs_osi.c
+$(UOBJ)/afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
        $(CRULE1)
-$(UOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+$(UOBJ)/afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c
        $(CRULE1)
-$(UOBJ)/afs_segments.o: $(AFS)/afs_segments.c
+$(UOBJ)/afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c
        $(CRULE1)
-$(UOBJ)/afs_server.o: $(AFS)/afs_server.c
+$(UOBJ)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE1)
-$(UOBJ)/afs_user.o: $(AFS)/afs_user.c
+$(UOBJ)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE1)
-$(UOBJ)/afs_util.o: $(AFS)/afs_util.c
+$(UOBJ)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE1)
-$(UOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
+$(UOBJ)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE1)
-$(UOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+$(UOBJ)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+$(UOBJ)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+$(UOBJ)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+$(UOBJ)/afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+$(UOBJ)/afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+$(UOBJ)/afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+$(UOBJ)/afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+$(UOBJ)/afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+$(UOBJ)/afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+$(UOBJ)/afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+$(UOBJ)/afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+$(UOBJ)/afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+$(UOBJ)/afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+$(UOBJ)/afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+$(UOBJ)/afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+$(UOBJ)/afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c
        $(CRULE1)
-$(UOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+$(UOBJ)/afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c
        $(CRULE1)
-$(UOBJ)/afs_volume.o: $(AFS)/afs_volume.c
+$(UOBJ)/afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c
        $(CRULE1)
-$(UOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
+$(UOBJ)/afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
        $(CRULE1)
-$(UOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
+$(UOBJ)/rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
        $(CRULE1)
-$(UOBJ)/afs_callback.o: $(AFS)/afs_callback.c
+$(UOBJ)/afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
        $(CRULE1)
-$(UOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
+$(UOBJ)/afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c
        $(CRULE1)
-$(UOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
+$(UOBJ)/afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c
        $(CRULE1)
-$(UOBJ)/afs_dir.o:     $(AFS)/afs_dir.c
+$(UOBJ)/afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
        $(CRULE1)
-$(UOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+$(UOBJ)/afs_dir.o:     $(TOP_SRCDIR)/dir/dir.c
+       $(CRULE1) -o afs_dir.o
+$(UOBJ)/AFS_component_version_number.o: AFS_component_version_number.c
        $(CRULE1)
-$(UOBJ)/afs_lock.o: $(AFS)/afs_lock.c
+$(UOBJ)/afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
        $(CRULE1)
-$(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
+$(UOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
-$(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c
+$(UOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-$(UOBJ)/fcrypt.o:      $(AFS)/fcrypt.c
+$(UOBJ)/fcrypt.o:      $(TOP_SRC_RXKAD)/domestic/fcrypt.c
        $(CRULE1)
-$(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE1)
-$(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
+$(UOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
-$(UOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
+$(UOBJ)/rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
        $(CRULE1)
-$(UOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
+$(UOBJ)/afs_exporter.o: $(TOP_SRCDIR)/afs/afs_exporter.c
        $(CRULE1)
-$(UOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+$(UOBJ)/afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
        $(CRULE1)
-$(UOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+$(UOBJ)/afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c
        $(CRULE1)
-$(UOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
+$(UOBJ)/rx.o: $(TOP_SRC_RX)/rx.c
        $(CRULE1)
-$(UOBJ)/rx.o: $(RX)/rx.c
+$(UOBJ)/rx_clock.o: $(TOP_SRC_RX)/rx_clock.c
        $(CRULE1)
-$(UOBJ)/rx_clock.o: $(RX)/rx_clock.c
+$(UOBJ)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE1)
-$(UOBJ)/rx_event.o: $(RX)/rx_event.c
+$(UOBJ)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE1)
-$(UOBJ)/rx_globals.o: $(RX)/rx_globals.c
+$(UOBJ)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE1)
-$(UOBJ)/rx_misc.o: $(RX)/rx_misc.c
+$(UOBJ)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE1)
-$(UOBJ)/rx_null.o: $(RX)/rx_null.c
+$(UOBJ)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE1)
-$(UOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
+$(UOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
-$(UOBJ)/rx_packet.o: $(RX)/rx_packet.c
+$(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE1)
-$(UOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
+$(UOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
-$(UOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
+$(UOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
        $(CRULE1)
-$(UOBJ)/xdr_int32.o: $(RX)/xdr_int32.c
+$(UOBJ)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
        $(CRULE1)
-$(UOBJ)/xdr_int64.o: $(RX)/xdr_int64.c
+$(UOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
        $(CRULE1)
-$(UOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
+$(UOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
+       $(CRULE1) -o afs_uuid.o
+$(UOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
        $(CRULE1)
-$(UOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
+$(UOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE1)
-$(UOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
+$(UOBJ)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
        $(CRULE1)
-$(UOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
+$(UOBJ)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
        $(CRULE1)
-$(UOBJ)/osi_vm.o: $(AFS)/osi_vm.c
+$(UOBJ)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
        $(CRULE1)
-$(UOBJ)/osi_groups.o: $(AFS)/osi_groups.c
+$(UOBJ)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE1)
-$(UOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+$(UOBJ)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
        $(CRULE1)
-$(UOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+$(UOBJ)/Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c
        $(CRULE1)
-$(UOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+$(UOBJ)/afsaux.o: $(TOP_SRC_FSINT)/afsaux.c
        $(CRULE1)
-$(UOBJ)/afsaux.o: $(AFSINT)/afsaux.c
+$(UOBJ)/xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c
        $(CRULE1)
-$(UOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
+$(UOBJ)/Kvldbint.cs.o: $(TOP_OBJ_VLSERVER)/Kvldbint.cs.c
        $(CRULE1)
-$(UOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
+$(UOBJ)/Kvldbint.xdr.o: $(TOP_OBJ_VLSERVER)/Kvldbint.xdr.c
        $(CRULE1)
-$(UOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+$(UOBJ)/rx_kmutex.o: $(TOP_SRC_RX)/UKERNEL/rx_kmutex.c
        $(CRULE1)
-$(UOBJ)/afs_main.o: $(AFS)/afs_main.c
+$(UOBJ)/rx_knet.o: $(TOP_SRC_RX)/UKERNEL/rx_knet.c
        $(CRULE1)
-$(UOBJ)/rx_kmutex.o: $(RX)/rx_kmutex.c
+$(UOBJ)/rx_kcommon.o: $(TOP_SRCDIR)/rx/rx_kcommon.c
        $(CRULE1)
-$(UOBJ)/rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE1)
-$(UOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
-       $(CRULE1)
-$(UOBJ)/afs_call.o: $(AFS)/afs_call.c
+$(UOBJ)/afs_call.o: $(TOP_SRC_AFS)/afs_call.c
        $(CRULE1) -DAFS_NONFSTRANS
-$(UOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
+$(UOBJ)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS
-$(UOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
+$(UOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS
-$(UOBJ)/ktc.o:         $(AFS)/ktc.c
+$(UOBJ)/ktc.o:         $(TOP_SRCDIR)/auth/ktc.c
        $(CRULE1)
-$(UOBJ)/ticket.o: $(AFS)/ticket.c
+$(UOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
        $(CRULE1)
-$(UOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
+$(UOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
        $(CRULE1)
-$(UOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
+$(UOBJ)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
        $(CRULE1)
-$(UOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
+$(UOBJ)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
        $(CRULE1)
-$(UOBJ)/ptuser.o: $(AFS)/ptuser.c
+$(UOBJ)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
        $(CRULE1)
-$(UOBJ)/pterror.o: $(AFS)/pterror.c
+$(UOBJ)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
        $(CRULE1)
-$(UOBJ)/ubikclient.o: $(AFS)/ubikclient.c
+$(UOBJ)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
        $(CRULE1)
-$(UOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
+$(UOBJ)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
        $(CRULE1)
-$(UOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
+$(UOBJ)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
        $(CRULE1)
-$(UOBJ)/authclient.o: $(AFS)/authclient.c
+$(UOBJ)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
        $(CRULE1)
-$(UOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
+$(UOBJ)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
        $(CRULE1)
-$(UOBJ)/client.o: $(AFS)/client.c
+$(UOBJ)/client.o: $(TOP_SRCDIR)/kauth/client.c
        $(CRULE1)
-$(UOBJ)/user.o: $(AFS)/user.c
+$(UOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
        $(CRULE1)
-$(UOBJ)/hostparse.o: $(AFS)/hostparse.c
+$(UOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
        $(CRULE1)
-$(UOBJ)/token.o: $(AFS)/token.c
+$(UOBJ)/token.o: $(TOP_SRCDIR)/kauth/token.c
        $(CRULE1)
-$(UOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
+$(UOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
        $(CRULE1)
-$(UOBJ)/kaaux.o: $(AFS)/kaaux.c
+$(UOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
        $(CRULE1)
-$(UOBJ)/authcon.o: $(AFS)/authcon.c
+$(UOBJ)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
        $(CRULE1)
-$(UOBJ)/cellconfig.o: $(AFS)/cellconfig.c
+$(UOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
-$(UOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
+$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
        $(CRULE1)
-$(UOBJ)/dirpath.o: $(AFS)/dirpath.c
+$(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
-$(UOBJ)/fileutil.o: $(AFS)/fileutil.c
+$(UOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULE1)
-$(UOBJ)/netutils.o: $(AFS)/netutils.c
+$(UOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
        $(CRULE1)
-$(UOBJ)/et_name.o: $(AFS)/et_name.c
+$(UOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
        $(CRULE1)
-$(UOBJ)/com_err.o: $(AFS)/com_err.c
+$(UOBJ)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
        $(CRULE1)
-$(UOBJ)/error_msg.o: $(AFS)/error_msg.c
+$(UOBJ)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
        $(CRULE1)
-$(UOBJ)/uerrors.o: $(AFS)/uerrors.c
+$(UOBJ)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
        $(CRULE1)
-$(UOBJ)/kaerrors.o: $(AFS)/kaerrors.c
+$(UOBJ)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
        $(CRULE1)
-$(UOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
+$(UOBJ)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
        $(CRULE1)
-$(UOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
+$(UOBJ)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
        $(CRULE1)
-$(UOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
+$(UOBJ)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
        $(CRULE1)
-$(UOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
+$(UOBJ)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
        $(CRULE1)
-$(UOBJ)/rxstat.o: $(AFSINT)/rxstat.c
+$(UOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE1)
-$(UOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+$(UOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE1)
-$(UOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+$(UOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE1)
 
 # These files are for the netscape plugin
 
-$(WEBOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE2)
-$(WEBOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE2)
-$(WEBOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
+$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util//afs_atomlist.c
        $(CRULE2)
-$(WEBOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
+$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
        $(CRULE2)
-$(WEBOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
+$(WEBOBJ)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
        $(CRULE2)
-$(WEBOBJ)/afs_cell.o: $(AFS)/afs_cell.c
+$(WEBOBJ)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE2)
-$(WEBOBJ)/afs_conn.o: $(AFS)/afs_conn.c
+$(WEBOBJ)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE2)
-$(WEBOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
+$(WEBOBJ)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE2)
-$(WEBOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
+$(WEBOBJ)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
        $(CRULE2)
-$(WEBOBJ)/afs_init.o: $(AFS)/afs_init.c
+$(WEBOBJ)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE2)
-$(WEBOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
+$(WEBOBJ)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE2)
-$(WEBOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+$(WEBOBJ)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c
        $(CRULE2)
-$(WEBOBJ)/afs_osi.o:   $(AFS)/afs_osi.c
+$(WEBOBJ)/afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
        $(CRULE2)
-$(WEBOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+$(WEBOBJ)/afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
        $(CRULE2)
-$(WEBOBJ)/afs_segments.o: $(AFS)/afs_segments.c
+$(WEBOBJ)/afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c
        $(CRULE2)
-$(WEBOBJ)/afs_server.o: $(AFS)/afs_server.c
+$(WEBOBJ)/afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c
        $(CRULE2)
-$(WEBOBJ)/afs_user.o: $(AFS)/afs_user.c
+$(WEBOBJ)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE2)
-$(WEBOBJ)/afs_util.o: $(AFS)/afs_util.c
+$(WEBOBJ)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE2)
-$(WEBOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
+$(WEBOBJ)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE2)
-$(WEBOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+$(WEBOBJ)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+$(WEBOBJ)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+$(WEBOBJ)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+$(WEBOBJ)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+$(WEBOBJ)/afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+$(WEBOBJ)/afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+$(WEBOBJ)/afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+$(WEBOBJ)/afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+$(WEBOBJ)/afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+$(WEBOBJ)/afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+$(WEBOBJ)/afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+$(WEBOBJ)/afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+$(WEBOBJ)/afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+$(WEBOBJ)/afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+$(WEBOBJ)/afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+$(WEBOBJ)/afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c
        $(CRULE2)
-$(WEBOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+$(WEBOBJ)/afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c
        $(CRULE2)
-$(WEBOBJ)/afs_volume.o: $(AFS)/afs_volume.c
+$(WEBOBJ)/afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c
        $(CRULE2)
-$(WEBOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
+$(WEBOBJ)/afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c
        $(CRULE2)
-$(WEBOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
+$(WEBOBJ)/afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
        $(CRULE2)
-$(WEBOBJ)/afs_callback.o: $(AFS)/afs_callback.c
+$(WEBOBJ)/rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
        $(CRULE2)
-$(WEBOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
+$(WEBOBJ)/afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
        $(CRULE2)
-$(WEBOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
+$(WEBOBJ)/afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c
        $(CRULE2)
-$(WEBOBJ)/afs_dir.o:   $(AFS)/afs_dir.c
+$(WEBOBJ)/afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c
        $(CRULE2)
-$(WEBOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+$(WEBOBJ)/afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
        $(CRULE2)
-$(WEBOBJ)/afs_lock.o: $(AFS)/afs_lock.c
+$(WEBOBJ)/afs_dir.o:   $(TOP_SRCDIR)/dir/dir.c
+       $(CRULE2) -o afs_dir.o
+$(WEBOBJ)/AFS_component_version_number.o: AFS_component_version_number.c
        $(CRULE2)
-$(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
+$(WEBOBJ)/afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
        $(CRULE2)
-$(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c
+$(WEBOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE2)
-$(WEBOBJ)/fcrypt.o:    $(AFS)/fcrypt.c
+$(WEBOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE2)
-$(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+$(WEBOBJ)/fcrypt.o:    $(TOP_SRC_RXKAD)/domestic/fcrypt.c
        $(CRULE2)
-$(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
+$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE2)
-$(WEBOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
+$(WEBOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE2)
-$(WEBOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
+$(WEBOBJ)/rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
        $(CRULE2)
-$(WEBOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+$(WEBOBJ)/afs_exporter.o: $(TOP_SRCDIR)/afs/afs_exporter.c
        $(CRULE2)
-$(WEBOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+$(WEBOBJ)/afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
        $(CRULE2)
-$(WEBOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
+$(WEBOBJ)/afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c
        $(CRULE2)
-$(WEBOBJ)/rx.o: $(RX)/rx.c
+$(WEBOBJ)/rx.o: $(TOP_SRC_RX)/rx.c
        $(CRULE2)
-$(WEBOBJ)/rx_clock.o: $(RX)/rx_clock.c
+$(WEBOBJ)/rx_clock.o: $(TOP_SRC_RX)/rx_clock.c
        $(CRULE2)
-$(WEBOBJ)/rx_event.o: $(RX)/rx_event.c
+$(WEBOBJ)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE2)
-$(WEBOBJ)/rx_globals.o: $(RX)/rx_globals.c
+$(WEBOBJ)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE2)
-$(WEBOBJ)/rx_misc.o: $(RX)/rx_misc.c
+$(WEBOBJ)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE2)
-$(WEBOBJ)/rx_null.o: $(RX)/rx_null.c
+$(WEBOBJ)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE2)
-$(WEBOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
+$(WEBOBJ)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE2)
-$(WEBOBJ)/rx_packet.o: $(RX)/rx_packet.c
+$(WEBOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE2)
-$(WEBOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
+$(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE2)
-$(WEBOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
+$(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE2)
-$(WEBOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
+$(WEBOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
        $(CRULE2)
-$(WEBOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
-       $(CRULE2)
-$(WEBOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
+$(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
+       $(CRULE2) -o afs_uuid.o
+$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+       $(CRULE1)
+$(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE2)
-$(WEBOBJ)/osi_vm.o: $(AFS)/osi_vm.c
+$(WEBOBJ)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
        $(CRULE2)
-$(WEBOBJ)/osi_groups.o: $(AFS)/osi_groups.c
+$(WEBOBJ)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
        $(CRULE2)
-$(WEBOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+$(WEBOBJ)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
        $(CRULE2)
-$(WEBOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+$(WEBOBJ)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE2)
-$(WEBOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+$(WEBOBJ)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
        $(CRULE2)
-$(WEBOBJ)/afsaux.o: $(AFSINT)/afsaux.c
+$(WEBOBJ)/Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c
        $(CRULE2)
-$(WEBOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
+$(WEBOBJ)/afsaux.o: $(TOP_SRC_FSINT)/afsaux.c
        $(CRULE2)
-$(WEBOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
+$(WEBOBJ)/xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c
        $(CRULE2)
-$(WEBOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+$(WEBOBJ)/Kvldbint.cs.o: $(TOP_OBJ_VLSERVER)/Kvldbint.cs.c
        $(CRULE2)
-$(WEBOBJ)/afs_main.o: $(AFS)/afs_main.c
+$(WEBOBJ)/Kvldbint.xdr.o: $(TOP_OBJ_VLSERVER)/Kvldbint.xdr.c
        $(CRULE2)
-$(WEBOBJ)/rx_kmutex.o: $(RX)/rx_kmutex.c
+$(WEBOBJ)/rx_kmutex.o: $(TOP_SRC_RX)/UKERNEL/rx_kmutex.c
        $(CRULE2)
-$(WEBOBJ)/rx_knet.o: $(RX)/rx_knet.c
+$(WEBOBJ)/rx_knet.o: $(TOP_SRC_RX)/UKERNEL/rx_knet.c
        $(CRULE2)
-$(WEBOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
+$(WEBOBJ)/rx_kcommon.o: $(TOP_SRCDIR)/rx/rx_kcommon.c
        $(CRULE2)
-$(WEBOBJ)/afs_call.o: $(AFS)/afs_call.c
+$(WEBOBJ)/afs_call.o: $(TOP_SRC_AFS)/afs_call.c
        $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
+$(WEBOBJ)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
+$(WEBOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/ktc.o:       $(AFS)/ktc.c
+$(WEBOBJ)/ktc.o:       $(TOP_SRCDIR)/auth/ktc.c
        $(CRULE2)
-$(WEBOBJ)/ktc.krb.o:   $(AFS)/ktc.c
+$(WEBOBJ)/ktc.krb.o:   $(TOP_SRCDIR)/auth/ktc.c
        $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC 
        mv ktc.o ktc.krb.o
-$(WEBOBJ)/securehash.o: $(AFS)/securehash.c
+$(WEBOBJ)/securehash.o: $(TOP_SRCDIR)/afsweb/securehash.c
        $(CRULE2)
-$(WEBOBJ)/nsafs.o: $(AFS)/nsafs.c
+$(WEBOBJ)/nsafs.o: $(TOP_SRCDIR)/afsweb/nsafs.c
        $(CRULE2)
-$(WEBOBJ)/ticket.o: $(AFS)/ticket.c
+$(WEBOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
        $(CRULE2)
-$(WEBOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
+$(WEBOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
        $(CRULE2)
-$(WEBOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
+$(WEBOBJ)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
        $(CRULE2)
-$(WEBOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
+$(WEBOBJ)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
        $(CRULE2)
-$(WEBOBJ)/ptuser.o: $(AFS)/ptuser.c
+$(WEBOBJ)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
        $(CRULE2)
-$(WEBOBJ)/pterror.o: $(AFS)/pterror.c
+$(WEBOBJ)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
        $(CRULE2)
-$(WEBOBJ)/ubikclient.o: $(AFS)/ubikclient.c
+$(WEBOBJ)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
        $(CRULE2)
-$(WEBOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
+$(WEBOBJ)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
        $(CRULE2)
-$(WEBOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
+$(WEBOBJ)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
        $(CRULE2)
-$(WEBOBJ)/authclient.o: $(AFS)/authclient.c
+$(WEBOBJ)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
        $(CRULE2)
-$(WEBOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
+$(WEBOBJ)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
        $(CRULE2)
-$(WEBOBJ)/client.o: $(AFS)/client.c
+$(WEBOBJ)/client.o: $(TOP_SRCDIR)/kauth/client.c
        $(CRULE2)
-$(WEBOBJ)/user.o: $(AFS)/user.c
+$(WEBOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
        $(CRULE2)
-$(WEBOBJ)/hostparse.o: $(AFS)/hostparse.c
+$(WEBOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
        $(CRULE2)
-$(WEBOBJ)/token.o: $(AFS)/token.c
+$(WEBOBJ)/token.o: $(TOP_SRCDIR)/kauth/token.c
        $(CRULE2)
-$(WEBOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
+$(WEBOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
        $(CRULE2)
-$(WEBOBJ)/kaaux.o: $(AFS)/kaaux.c
+$(WEBOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
        $(CRULE2)
-$(WEBOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
+$(WEBOBJ)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
        $(CRULE2)
-$(WEBOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
+$(WEBOBJ)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
        $(CRULE2)
-$(WEBOBJ)/authcon.o: $(AFS)/authcon.c
+$(WEBOBJ)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
        $(CRULE2)
-$(WEBOBJ)/cellconfig.o: $(AFS)/cellconfig.c
+$(WEBOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE2)
-$(WEBOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
+$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
        $(CRULE1)
-$(WEBOBJ)/dirpath.o: $(AFS)/dirpath.c
+$(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
-$(WEBOBJ)/fileutil.o: $(AFS)/fileutil.c
+$(WEBOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULE1)
-$(WEBOBJ)/netutils.o: $(AFS)/netutils.c
+$(WEBOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
        $(CRULE1)
-$(WEBOBJ)/et_name.o: $(AFS)/et_name.c
+$(WEBOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
        $(CRULE2)
-$(WEBOBJ)/com_err.o: $(AFS)/com_err.c
+$(WEBOBJ)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
        $(CRULE2)
-$(WEBOBJ)/error_msg.o: $(AFS)/error_msg.c
+$(WEBOBJ)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
        $(CRULE2)
-$(WEBOBJ)/uerrors.o: $(AFS)/uerrors.c
+$(WEBOBJ)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
        $(CRULE2)
-$(WEBOBJ)/kaerrors.o: $(AFS)/kaerrors.c
+$(WEBOBJ)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
        $(CRULE2)
-$(WEBOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
+$(WEBOBJ)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
        $(CRULE2)
-$(WEBOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
+$(WEBOBJ)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
        $(CRULE2)
-$(WEBOBJ)/rxstat.o: $(AFSINT)/rxstat.c
+$(WEBOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE2)
-$(WEBOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+$(WEBOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE2)
-$(WEBOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+$(WEBOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE2)
 
 # These are for libjuafs.a 
 # Used for linking with libafsauthent and libafsrpc
 
-$(JUAFS)/afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE1);
-$(JUAFS)/afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE1);
-$(JUAFS)/afs_analyze.o: $(AFS)/afs_analyze.c
-       $(CRULE1);
-$(JUAFS)/afs_axscache.o: $(AFS)/afs_axscache.c
-       $(CRULE1);
-$(JUAFS)/afs_buffer.o: $(AFS)/afs_buffer.c
-       $(CRULE1);
-$(JUAFS)/afs_cell.o: $(AFS)/afs_cell.c
-       $(CRULE1);
-$(JUAFS)/afs_conn.o: $(AFS)/afs_conn.c
-       $(CRULE1);
-$(JUAFS)/afs_dcache.o: $(AFS)/afs_dcache.c
-       $(CRULE1);
-$(JUAFS)/afs_dynroot.o: $(AFS)/afs_dynroot.c
-       $(CRULE1);
-$(JUAFS)/afs_init.o: $(AFS)/afs_init.c
-       $(CRULE1);
-$(JUAFS)/afs_mariner.o: $(AFS)/afs_mariner.c
-       $(CRULE1);
-$(JUAFS)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
-       $(CRULE1);
-$(JUAFS)/afs_osi.o:    $(AFS)/afs_osi.c
-       $(CRULE1);
-$(JUAFS)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
-       $(CRULE1);
-$(JUAFS)/afs_segments.o: $(AFS)/afs_segments.c
-       $(CRULE1);
-$(JUAFS)/afs_server.o: $(AFS)/afs_server.c
-       $(CRULE1);
-$(JUAFS)/afs_user.o: $(AFS)/afs_user.c
-       $(CRULE1);
-$(JUAFS)/afs_util.o: $(AFS)/afs_util.c
-       $(CRULE1);
-$(JUAFS)/afs_vcache.o: $(AFS)/afs_vcache.c
-       $(CRULE1);
-$(JUAFS)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
-       $(CRULE1);
-$(JUAFS)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
-       $(CRULE1);
-$(JUAFS)/afs_volume.o: $(AFS)/afs_volume.c
-       $(CRULE1);
-$(JUAFS)/rx_rdwr.o: $(RX)/rx_rdwr.c
-       $(CRULE1);
-$(JUAFS)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
-       $(CRULE1);
-$(JUAFS)/afs_callback.o: $(AFS)/afs_callback.c
-       $(CRULE1);
-$(JUAFS)/afs_chunk.o: $(AFS)/afs_chunk.c
-       $(CRULE1);
-$(JUAFS)/afs_daemons.o: $(AFS)/afs_daemons.c
-       $(CRULE1);
-$(JUAFS)/afs_dir.o:    $(AFS)/afs_dir.c
-       $(CRULE1);
-$(JUAFS)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
-       $(CRULE1);
-$(JUAFS)/afs_lock.o: $(AFS)/afs_lock.c
-       $(CRULE1);
-$(JUAFS)/afs_memcache.o: $(AFS)/afs_memcache.c
-       $(CRULE1);
-$(JUAFS)/afs_stat.o: $(AFS)/afs_stat.c
-       $(CRULE1);
-$(JUAFS)/fcrypt.o:     $(AFS)/fcrypt.c
-       $(CRULE1);
-$(JUAFS)/crypt_conn.o: $(AFS)/crypt_conn.c
-       $(CRULE1);
-$(JUAFS)/rxkad_client.o: $(AFS)/rxkad_client.c
-       $(CRULE1);
-$(JUAFS)/rxkad_common.o: $(AFS)/rxkad_common.c
-       $(CRULE1);
-$(JUAFS)/afs_exporter.o: $(AFS)/afs_exporter.c
-       $(CRULE1);
-$(JUAFS)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
-       $(CRULE1);
-$(JUAFS)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
-       $(CRULE1);
-$(JUAFS)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
-       $(CRULE1);
-$(JUAFS)/rx.o: $(RX)/rx.c
-       $(CRULE1);
-$(JUAFS)/rx_clock.o: $(RX)/rx_clock.c
-       $(CRULE1);
-$(JUAFS)/rx_event.o: $(RX)/rx_event.c
-       $(CRULE1);
-$(JUAFS)/rx_globals.o: $(RX)/rx_globals.c
-       $(CRULE1);
-$(JUAFS)/rx_misc.o: $(RX)/rx_misc.c
-       $(CRULE1);
-$(JUAFS)/rx_null.o: $(RX)/rx_null.c
-       $(CRULE1);
-$(JUAFS)/rx_getaddr.o: $(RX)/rx_getaddr.c
-       $(CRULE1);
-$(JUAFS)/rx_packet.o: $(RX)/rx_packet.c
-       $(CRULE1);
-$(JUAFS)/rx_conncache.o: $(RX)/rx_conncache.c
-       $(CRULE1);
-$(JUAFS)/xdr_rx.o: $(RX)/xdr_rx.c
-       $(CRULE1);
-$(JUAFS)/xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
-$(JUAFS)/afs_usrops.o: $(AFS)/afs_usrops.c
-       $(CRULE1);
-$(JUAFS)/afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE1);
-$(JUAFS)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
-       $(CRULE1);
-$(JUAFS)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
-$(JUAFS)/osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
-$(JUAFS)/osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
-$(JUAFS)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
-       $(CRULE1);
-$(JUAFS)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
-       $(CRULE1);
-$(JUAFS)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
-       $(CRULE1);
-$(JUAFS)/afsaux.o: $(AFSINT)/afsaux.c
-       $(CRULE1);
-$(JUAFS)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
-       $(CRULE1);
-$(JUAFS)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
-       $(CRULE1);
-$(JUAFS)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
-       $(CRULE1);
-$(JUAFS)/afs_main.o: $(AFS)/afs_main.c
-       $(CRULE1);
-$(JUAFS)/rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE1);
-$(JUAFS)/rx_kcommon.o: $(RX)/rx_kcommon.c
-       $(CRULE1);
-$(JUAFS)/afs_call.o: $(AFS)/afs_call.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(JUAFS)/afs_pioctl.o: $(AFS)/afs_pioctl.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(JUAFS)/osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(JUAFS)/ktc.o:        $(AFS)/ktc.c
-       $(CRULE1);
-$(JUAFS)/ticket.o: $(AFS)/ticket.c
-       $(CRULE1);
-$(JUAFS)/rxkad_server.o: $(AFS)/rxkad_server.c
-       $(CRULE1);
-$(JUAFS)/ptint.cs.o: $(AFSINT)/ptint.cs.c
-       $(CRULE1);
-$(JUAFS)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
-       $(CRULE1);
-$(JUAFS)/ptuser.o: $(AFS)/ptuser.c
-       $(CRULE1);
-$(JUAFS)/pterror.o: $(AFS)/pterror.c
-       $(CRULE1);
-$(JUAFS)/ubikclient.o: $(AFS)/ubikclient.c
-       $(CRULE1);
-$(JUAFS)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
-       $(CRULE1);
-$(JUAFS)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
-       $(CRULE1);
-$(JUAFS)/authclient.o: $(AFS)/authclient.c
-       $(CRULE1);
-$(JUAFS)/kalocalcell.o: $(AFS)/kalocalcell.c
-       $(CRULE1);
-$(JUAFS)/client.o: $(AFS)/client.c
-       $(CRULE1);
-$(JUAFS)/user.o: $(AFS)/user.c
-       $(CRULE1);
-$(JUAFS)/hostparse.o: $(AFS)/hostparse.c
-       $(CRULE1);
-$(JUAFS)/token.o: $(AFS)/token.c
-       $(CRULE1);
-$(JUAFS)/acfg_errors.o: $(AFS)/acfg_errors.c
-       $(CRULE1);
-$(JUAFS)/kaaux.o: $(AFS)/kaaux.c
-       $(CRULE1);
-$(JUAFS)/authcon.o: $(AFS)/authcon.c
-       $(CRULE1);
-$(JUAFS)/cellconfig.o: $(AFS)/cellconfig.c
-       $(CRULE1);
-$(JUAFS)/casestrcpy.o: $(AFS)/casestrcpy.c
-       $(CRULE1);
-$(JUAFS)/dirpath.o: $(AFS)/dirpath.c
-       $(CRULE1);
-$(JUAFS)/fileutil.o: $(AFS)/fileutil.c
-       $(CRULE1);
-$(JUAFS)/netutils.o: $(AFS)/netutils.c
-       $(CRULE1);
-$(JUAFS)/et_name.o: $(AFS)/et_name.c
-       $(CRULE1);
-$(JUAFS)/com_err.o: $(AFS)/com_err.c
-       $(CRULE1);
-$(JUAFS)/error_msg.o: $(AFS)/error_msg.c
-       $(CRULE1);
-$(JUAFS)/uerrors.o: $(AFS)/uerrors.c
-       $(CRULE1);
-$(JUAFS)/kaerrors.o: $(AFS)/kaerrors.c
-       $(CRULE1);
-$(JUAFS)/ktc_errors.o: $(AFS)/ktc_errors.c
-       $(CRULE1);
-$(JUAFS)/rxkad_errs.o: $(AFS)/rxkad_errs.c
-       $(CRULE1);
-$(JUAFS)/kauth.cs.o: $(AFSINT)/kauth.cs.c
-       $(CRULE1);
-$(JUAFS)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
-       $(CRULE1);
-$(JUAFS)/rxstat.o: $(AFSINT)/rxstat.c
-       $(CRULE1);
-$(JUAFS)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
-       $(CRULE1);
-$(JUAFS)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
-       $(CRULE1);
+$(JUAFS)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
+       $(CRULE1)
+$(JUAFS)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
+       $(CRULE1)
+$(JUAFS)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
+       $(CRULE1)
+$(JUAFS)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
+       $(CRULE1)
+$(JUAFS)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
+       $(CRULE1)
+$(JUAFS)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
+       $(CRULE1)
+$(JUAFS)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
+       $(CRULE1)
+$(JUAFS)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
+       $(CRULE1)
+$(JUAFS)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
+       $(CRULE1)
+$(JUAFS)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c
+       $(CRULE1)
+$(JUAFS)/afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
+       $(CRULE1)
+$(JUAFS)/afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
+       $(CRULE1)
+$(JUAFS)/afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c
+       $(CRULE1)
+$(JUAFS)/afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c
+       $(CRULE1)
+$(JUAFS)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
+       $(CRULE1)
+$(JUAFS)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
+       $(CRULE1)
+$(JUAFS)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
+       $(CRULE1)
+$(JUAFS)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
+       $(CRULE1)
+$(JUAFS)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
+       $(CRULE1)
+$(JUAFS)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c
+       $(CRULE1)
+$(JUAFS)/afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c
+       $(CRULE1)
+$(JUAFS)/afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
+       $(CRULE1)
+$(JUAFS)/rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
+       $(CRULE1)
+$(JUAFS)/afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
+       $(CRULE1)
+$(JUAFS)/afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c
+       $(CRULE1)
+$(JUAFS)/afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c
+       $(CRULE1)
+$(JUAFS)/afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
+       $(CRULE1)
+$(JUAFS)/afs_dir.o:    $(TOP_SRCDIR)/dir/dir.c
+       $(CRULE1) -o afs_dir.o
+$(JUAFS)/AFS_component_version_number.o: AFS_component_version_number.c
+       $(CRULE1)
+$(JUAFS)/afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
+       $(CRULE1)
+$(JUAFS)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
+       $(CRULE1)
+$(JUAFS)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
+       $(CRULE1)
+$(JUAFS)/fcrypt.o:     $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+       $(CRULE1)
+$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
+       $(CRULE1)
+$(JUAFS)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
+       $(CRULE1)
+$(JUAFS)/rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
+       $(CRULE1)
+$(JUAFS)/afs_exporter.o: $(TOP_SRCDIR)/afs/afs_exporter.c
+       $(CRULE1)
+$(JUAFS)/afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
+       $(CRULE1)
+$(JUAFS)/afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c
+       $(CRULE1)
+$(JUAFS)/rx.o: $(TOP_SRC_RX)/rx.c
+       $(CRULE1)
+$(JUAFS)/rx_clock.o: $(TOP_SRC_RX)/rx_clock.c
+       $(CRULE1)
+$(JUAFS)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
+       $(CRULE1)
+$(JUAFS)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
+       $(CRULE1)
+$(JUAFS)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
+       $(CRULE1)
+$(JUAFS)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
+       $(CRULE1)
+$(JUAFS)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
+       $(CRULE1)
+$(JUAFS)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
+       $(CRULE1)
+$(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
+       $(CRULE1)
+$(JUAFS)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
+       $(CRULE1)
+$(JUAFS)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
+       $(CRULE1)
+$(JUAFS)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
+       $(CRULE1)
+$(JUAFS)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
+       $(CRULE1) -o afs_uuid.o
+$(JUAFS)/assert.o: $(TOP_SRCDIR)/util/assert.c
+       $(CRULE1)
+$(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
+       $(CRULE1)
+$(JUAFS)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
+       $(CRULE1)
+$(JUAFS)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
+       $(CRULE1)
+$(JUAFS)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
+       $(CRULE1)
+$(JUAFS)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
+       $(CRULE1)
+$(JUAFS)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
+       $(CRULE1)
+$(JUAFS)/Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c
+       $(CRULE1)
+$(JUAFS)/afsaux.o: $(TOP_SRC_FSINT)/afsaux.c
+       $(CRULE1)
+$(JUAFS)/xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c
+       $(CRULE1)
+$(JUAFS)/Kvldbint.cs.o: $(TOP_OBJ_VLSERVER)/Kvldbint.cs.c
+       $(CRULE1)
+$(JUAFS)/Kvldbint.xdr.o: $(TOP_OBJ_VLSERVER)/Kvldbint.xdr.c
+       $(CRULE1)
+$(JUAFS)/rx_knet.o: $(TOP_SRC_RX)/UKERNEL/rx_knet.c
+       $(CRULE1)
+$(JUAFS)/rx_kcommon.o: $(TOP_SRCDIR)/rx/rx_kcommon.c
+       $(CRULE1)
+$(JUAFS)/afs_call.o: $(TOP_SRC_AFS)/afs_call.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(JUAFS)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(JUAFS)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(JUAFS)/ktc.o:        $(TOP_SRCDIR)/auth/ktc.c
+       $(CRULE1)
+$(JUAFS)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
+       $(CRULE1)
+$(JUAFS)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
+       $(CRULE1)
+$(JUAFS)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
+       $(CRULE1)
+$(JUAFS)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
+       $(CRULE1)
+$(JUAFS)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
+       $(CRULE1)
+$(JUAFS)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
+       $(CRULE1)
+$(JUAFS)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
+       $(CRULE1)
+$(JUAFS)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
+       $(CRULE1)
+$(JUAFS)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
+       $(CRULE1)
+$(JUAFS)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
+       $(CRULE1)
+$(JUAFS)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
+       $(CRULE1)
+$(JUAFS)/client.o: $(TOP_SRCDIR)/kauth/client.c
+       $(CRULE1)
+$(JUAFS)/user.o: $(TOP_SRCDIR)/kauth/user.c
+       $(CRULE1)
+$(JUAFS)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
+       $(CRULE1)
+$(JUAFS)/token.o: $(TOP_SRCDIR)/kauth/token.c
+       $(CRULE1)
+$(JUAFS)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
+       $(CRULE1)
+$(JUAFS)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
+       $(CRULE1)
+$(JUAFS)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
+       $(CRULE1)
+$(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
+       $(CRULE1)
+$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+       $(CRULE1)
+$(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
+       $(CRULE1)
+$(JUAFS)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
+       $(CRULE1)
+$(JUAFS)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+       $(CRULE1)
+$(JUAFS)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
+       $(CRULE1)
+$(JUAFS)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
+       $(CRULE1)
+$(JUAFS)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
+       $(CRULE1)
+$(JUAFS)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
+       $(CRULE1)
+$(JUAFS)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
+       $(CRULE1)
+$(JUAFS)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
+       $(CRULE1)
+$(JUAFS)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
+       $(CRULE1)
+$(JUAFS)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
+       $(CRULE1)
+$(JUAFS)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
+       $(CRULE1)
+$(JUAFS)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
+       $(CRULE1)
+$(JUAFS)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
+       $(CRULE1)
+$(JUAFS)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
+       $(CRULE1)
 
 
 clean:
@@ -1311,25 +1339,25 @@ ${DEST}/root.afsweb/usr/lib/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
 ${DEST}/root.afsweb/usr/lib/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/param.h: afs/param.h
+${DEST}/root.perf/include/afs/param.h: $(TOP_INCDIR)/afs/param.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/stds.h: afs/stds.h
+${DEST}/root.perf/include/afs/stds.h: $(TOP_INCDIR)/afs/stds.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/afs_sysnames.h: afs/afs_sysnames.h
+${DEST}/root.perf/include/afs/afs_sysnames.h: $(TOP_INCDIR)/afs/afs_sysnames.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/afs_stats.h: afs/afs_stats.h
+${DEST}/root.perf/include/afs/afs_stats.h: $(TOP_INCDIR)/afs/afs_stats.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/sysincludes.h: afs/sysincludes.h
+${DEST}/root.perf/include/afs/sysincludes.h: $(TOP_SRCDIR)/afs/sysincludes.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/include/afs/afs_usrops.h: afs/afs_usrops.h
+${DEST}/root.perf/include/afs/afs_usrops.h: $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h
        ${INSTALL} $? $@
 
-${DEST}/root.perf/lib/libdes.a: des/libdes.a
+${DEST}/root.perf/lib/libdes.a: ${TOP_OBJDIR}/lib/libdes.a
        ${INSTALL} $? $@
 
 ${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS)
@@ -1338,4 +1366,63 @@ ${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS)
 ${DEST}/root.perf/lib/$(LIBJUAFS): JUAFS/$(LIBJUAFS)
        ${INSTALL} $? $@
 
+#
+# Common directory and other build targets
+#
+UAFS:
+       mkdir -p $@
+
+JUAFS:
+       mkdir -p $@
+
+AFSWEB:
+       mkdir -p $@
+
+setup_common:
+       -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net 
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: UAFS setup_common
+       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_juafs: JUAFS setup_common
+       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
+       ln -s ../Makefile JUAFS/Makefile
+       ln -s ../Makefile.common JUAFS/Makefile.common
+
+setup_nsafs: AFSWEB setup_common
+       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=; \
+       $(RANLIB) $(LIBUAFS)
+
+JUAFS/$(LIBJUAFS): setup_juafs
+       cd JUAFS; \
+       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS; \
+       $(RANLIB) $(LIBJUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}; \
+       $(RANLIB) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}; \
+       $(RANLIB) $(LIBAFSWEBKRB)
 
+include ${TOP_OBJDIR}/src/config/Makefile.version

diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in
index 0b47c2ff1a70e1b419306fd3965d26c04cf6fd68..86e81e53360bcc6eadac7d1c4c6a002913f75cdf 100644 (file)
--- a/src/libuafs/MakefileProto.AIX.in
+++ b/src/libuafs/MakefileProto.AIX.in
@@ -35,60 +35,6 @@ WEBOPTS = -I../nsapi -qarch=com -DNETSCAPE_NSAPI -DAIX -DNET_SSL -DXP_UNIX -DMCC
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(AFS)/afsl.exp

diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in
index bca384630ef98daac2e522cbc5aee46046dc89c1..ef58adaf50df66eb402659d8927f18719c290fbb 100644 (file)
--- a/src/libuafs/MakefileProto.DARWIN.in
+++ b/src/libuafs/MakefileProto.DARWIN.in
@@ -28,62 +28,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=; \
-       ranlib $(LIBUAFS)
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS; \
-       ranlib $(LIBJUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in
index 42ec8e9307e70658b16366a05c98a70857c64a51..ddf0aec348ac3674334a760161ed25ee2d54e7a2 100644 (file)
--- a/src/libuafs/MakefileProto.DUX.in
+++ b/src/libuafs/MakefileProto.DUX.in
@@ -27,60 +27,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-AFSWEB: 
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index a579b29feceaa48cb04afe6decb0b297d71a0615..35d419608f0ac7ed6b01ebe221d2fae8dd8c8d7d 100644 (file)
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -23,60 +23,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB: 
-       mkdir -p $@
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in
index 0337db868f4efd742139ba378c125f548e47bc39..19cb87b338b38bae29a445c30fe2f7bbe788e7bc 100644 (file)
--- a/src/libuafs/MakefileProto.HPUX.in
+++ b/src/libuafs/MakefileProto.HPUX.in
@@ -27,60 +27,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in
index 1e0494b41cad32ea9f268e9ef29dea57461bc532..de5f3f9b3d113ee8738456725aa5345e3f03c5b4 100644 (file)
--- a/src/libuafs/MakefileProto.IRIX.in
+++ b/src/libuafs/MakefileProto.IRIX.in
@@ -26,60 +26,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in
index 4b16477077aaaeee78452c60347f50057f7c143c..0c556e6718ad98f02bc8e9c25b45ebe75e580490 100644 (file)
--- a/src/libuafs/MakefileProto.LINUX.in
+++ b/src/libuafs/MakefileProto.LINUX.in
@@ -32,60 +32,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.NBSD.in b/src/libuafs/MakefileProto.NBSD.in
index 7c05c107779c71718c9c437ddab7581e0fe44169..667d04e76bf93f5fc1529cb7edcc571ce3d63cb3 100644 (file)
--- a/src/libuafs/MakefileProto.NBSD.in
+++ b/src/libuafs/MakefileProto.NBSD.in
@@ -22,60 +22,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB: 
-       mkdir -p $@
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)

diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in
index 5ecc7bf4959da8da18536b637c32a15da21418cf..14000a56913c1ae532bad67e16694838b993b0af 100644 (file)
--- a/src/libuafs/MakefileProto.SOLARIS.in
+++ b/src/libuafs/MakefileProto.SOLARIS.in
@@ -25,60 +25,6 @@ LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_juafs: JUAFS setup_common
-       -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
-       ln -s ../Makefile JUAFS/Makefile
-       ln -s ../Makefile.common JUAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-JUAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS=
-
-JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
@@ -91,7 +37,6 @@ $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
        -$(RM) -f $(LIBAFSWEB)
        ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
-
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
        -$(RM) -f $(LIBAFSWEBKRB)
        ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)

diff --git a/src/libuafs/linktest.c b/src/libuafs/linktest.c
index 85c56d4e0072f0a396a0b88bd57c8af0437d69d5..69dd8b0852d8f0065e4a1b6e37abe5777ccc9fa7 100644 (file)
--- a/src/libuafs/linktest.c
+++ b/src/libuafs/linktest.c
@@ -17,9 +17,13 @@
 
 RCSID("$Header$");
 
+#include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
+
 #include <rx/rx.h>
-#include <afs/afs_usrops.h>
+#include <afs/sysincludes.h>
+#include <afs_usrops.h>
 
 void uafs_Shutdown(void);
 

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 654a4305159f48524381443335c4480b616172e6..11bda3e2e7a0c7e8866ffb7556438fe8e8e37fe6 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -20,6 +20,9 @@ LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
 
 all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
 
+depinstall: ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
+       
+
 #
 # Build rules
 #

diff --git a/src/lwp/test/selclient.c b/src/lwp/test/selclient.c
index 10a8dbe4e314ba6e1da7112d0ee542e19dae840f..9fd0fc2f2ad0853d4f1c9efe28c2ba21bfdc5cf8 100644 (file)
--- a/src/lwp/test/selclient.c
+++ b/src/lwp/test/selclient.c
@@ -56,7 +56,7 @@
 RCSID("$Header$");
 
 
-#include "../lwp.h"
+#include "lwp.h"
 #include "seltest.h"
 
 /* Put this in lwp.h? */

diff --git a/src/lwp/test/selserver.c b/src/lwp/test/selserver.c
index ec500df36ddfb16e4337b5f2a40b51afa6c1aae3..31d9efbc68f5a7736eccda3f914ea07ecc7eb3ae 100644 (file)
--- a/src/lwp/test/selserver.c
+++ b/src/lwp/test/selserver.c
@@ -57,7 +57,7 @@
 RCSID("$Header$");
 
 
-#include "../lwp.h"
+#include "lwp.h"
 #include "seltest.h"
 
 extern int IOMGR_Select(int, fd_set *, fd_set *, fd_set *, struct timeval *);

diff --git a/src/lwp/test/selsubs.c b/src/lwp/test/selsubs.c
index d30a9de143c23e26eb23f72b11da93ecbe90d2dc..352b705b3d529f06e0332953be99ddd8d57a73e9 100644 (file)
--- a/src/lwp/test/selsubs.c
+++ b/src/lwp/test/selsubs.c
@@ -31,7 +31,7 @@
 RCSID("$Header$");
 
 
-#include "../lwp.h"
+#include "lwp.h"
 #include "seltest.h"
 
 #ifdef NEEDS_ALLOCFDSET

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 5df68fd2aa78112c3ab7c0abfa3b98073e43ea8e..081b1f0ba2532d2abaa71c201f290f7ec6e61966 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -38,7 +38,19 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libsys.a
 
 
-all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt
+all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \
+       depinstall readgroup readpwd testpt
+
+depinstall: \
+       ptint.cs.c ptint.xdr.c \
+       ${TOP_INCDIR}/afs/prclient.h \
+       ${TOP_INCDIR}/afs/prerror.h \
+       ${TOP_INCDIR}/afs/print.h \
+       ${TOP_INCDIR}/afs/prserver.h \
+       ${TOP_INCDIR}/afs/ptclient.h \
+       ${TOP_INCDIR}/afs/pterror.h \
+       ${TOP_INCDIR}/afs/ptint.h \
+       ${TOP_INCDIR}/afs/ptserver.h
 
 #
 # Build targets
@@ -143,16 +155,6 @@ prerror.h: pterror.h
 #
 # Installation targets
 #
-ukinstall: ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afsint/ptint.h \
-       ${UKERNELDIR}/afsint/ptint.cs.c \
-       ${UKERNELDIR}/afsint/ptint.xdr.c \
-       ${UKERNELDIR}/afs/ptuser.c \
-       ${UKERNELDIR}/afs/ptclient.h \
-       ${UKERNELDIR}/afs/pterror.c \
-       ${UKERNELDIR}/afs/pterror.h \
-       ${UKERNELDIR}/afs/ptserver.h
-
 install: \
        ${DESTDIR}${afssrvlibexecdir}/ptserver \
        ${DESTDIR}${afssrvbindir}/pts \
@@ -169,33 +171,6 @@ install: \
        ${DESTDIR}${includedir}/afs/ptint.h \
        ${DESTDIR}${includedir}/afs/ptserver.h
 
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afs/ptuser.c: ptuser.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ptclient.h: ptclient.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/pterror.c: pterror.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/pterror.h: pterror.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ptserver.h: ptserver.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/ptint.h: Kptint.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/ptint.cs.c: Kptint.cs.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/ptint.xdr.c: Kptint.xdr.c
-       ${INSTALL} $? $@
-
 ${DEST}/root.server/usr/afs/bin/ptserver: ptserver
        ${INSTALL} $? $@
 

diff --git a/src/ptserver/ptclient.h b/src/ptserver/ptclient.h
index 87898375f2d1b7f4f055e8d145c177454d487678..1956d2bc29c024cb04d2f292926e447d1f364f75 100644 (file)
--- a/src/ptserver/ptclient.h
+++ b/src/ptserver/ptclient.h
@@ -8,10 +8,10 @@
  */
 
 #if defined(UKERNEL)
-#include "../afs/lock.h"
-#include "../afs/ubik.h"
-#include "../afsint/ptint.h"
-#include "../afs/ptserver.h"
+#include "afs/lock.h"
+#include "ubik.h"
+#include "afs/ptint.h"
+#include "afs/ptserver.h"
 #else /* defined(UKERNEL) */
 #include <lock.h>
 #include <ubik.h>

diff --git a/src/ptserver/ptserver.h b/src/ptserver/ptserver.h
index 45e7f4688f8905cdcf21da616f2d499bc5dc1eb1..4dc03873fdb04950411a1356adcf6562287e8b0f 100644 (file)
--- a/src/ptserver/ptserver.h
+++ b/src/ptserver/ptserver.h
@@ -8,7 +8,7 @@
  */
 
 #if defined(UKERNEL)
-#include "../afsint/ptint.h"
+#include "afs/ptint.h"
 #else /* defined(UKERNEL) */
 #include "ptint.h"
 #endif /* defined(UKERNEL) */

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 3a10619e9f052b648e99f28dfb805b140b539a49..45a88a2cc14618fd1739dea38e3badb06655d1ca 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,18 +17,18 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afs_usrops.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/rx.h"
-#include "../rx/xdr.h"
-#include "../rx/rxkad.h"
-#include "../afs/auth.h"
-#include "../afs/cellconfig.h"
-#include "../afs/afsutil.h"
-#include "../afs/ptclient.h"
-#include "../afs/pterror.h"
+#include "afs/sysincludes.h"
+#include "afs_usrops.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "rx/rx.h"
+#include "rx/xdr.h"
+#include "rx/rxkad.h"
+#include "afs/auth.h"
+#include "afs/cellconfig.h"
+#include "afs/afsutil.h"
+#include "afs/ptclient.h"
+#include "afs/pterror.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <ctype.h>

diff --git a/src/rx/AIX/rx_kmutex.c b/src/rx/AIX/rx_kmutex.c
index 8f344f3e7a1b44f5415b4920377f139cbcc11717..969ec7ce1fbd353e7197ada97cb9bb6697cc7c0f 100644 (file)
--- a/src/rx/AIX/rx_kmutex.c
+++ b/src/rx/AIX/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/AIX/rx_knet.c b/src/rx/AIX/rx_knet.c
index 16a0648f0e58c03963ae07c7cab248f6639a67fb..4d1ecb206fd56415281652322ad84366296a749f 100644 (file)
--- a/src/rx/AIX/rx_knet.c
+++ b/src/rx/AIX/rx_knet.c
@@ -8,12 +8,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_AIX41_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 static struct protosw parent_proto;    /* udp proto switch */
 

diff --git a/src/rx/DARWIN/rx_kmutex.c b/src/rx/DARWIN/rx_kmutex.c
index 7aa430c65429c502add6f14ff42a2fe7aafc8d6f..68b3492a2255bc7cf0155d257e40af6586fdb7b2 100644 (file)
--- a/src/rx/DARWIN/rx_kmutex.c
+++ b/src/rx/DARWIN/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c
index abc1a72623ae6d15891700ac247af862a018d9eb..f02b0101cff296e70b53244d676df25825cf28f3 100644 (file)
--- a/src/rx/DARWIN/rx_knet.c
+++ b/src/rx/DARWIN/rx_knet.c
@@ -8,11 +8,11 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 int osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec,        
        int nvecs, int *alength)

diff --git a/src/rx/DUX/rx_kmutex.c b/src/rx/DUX/rx_kmutex.c
index e269509ed10d5f66165e1a52528ce445c18a4c03..efc3ffed4b2164f90ac246dad8e78cbe091adc4f 100644 (file)
--- a/src/rx/DUX/rx_kmutex.c
+++ b/src/rx/DUX/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/DUX/rx_knet.c b/src/rx/DUX/rx_knet.c
index 30dd0ddf89f5d65ad33b12f063d6f9b433987f91..54d2b6d518343ea273e7b7b06ec6d7efba6a83ed 100644 (file)
--- a/src/rx/DUX/rx_knet.c
+++ b/src/rx/DUX/rx_knet.c
@@ -8,12 +8,12 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_DUX40_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 
 static struct protosw parent_proto;    /* udp proto switch */

diff --git a/src/rx/FBSD/rx_kmutex.c b/src/rx/FBSD/rx_kmutex.c
index 0d756f4de7248082402fffb160d98bdd00ef732f..a4b77d328594c199c8ff07bcdb0da7aa7ad12d4b 100644 (file)
--- a/src/rx/FBSD/rx_kmutex.c
+++ b/src/rx/FBSD/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 1e39a94a223d418877c5a60a28e8a68dc482090e..d4883d7d4abf08a9fbebb41d1ebb9513d0988aa4 100644 (file)
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -21,12 +21,12 @@
 */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_FBSD40_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 
 #ifdef RXK_LISTENER_ENV

diff --git a/src/rx/HPUX/rx_kmutex.c b/src/rx/HPUX/rx_kmutex.c
index 2d5e40c4e80aa4b30bd68b5485f748d4626c17cd..8bc9a76f701b21d46243f8adb6ccf54e7638222f 100644 (file)
--- a/src/rx/HPUX/rx_kmutex.c
+++ b/src/rx/HPUX/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/HPUX/rx_knet.c b/src/rx/HPUX/rx_knet.c
index 6fd16c9838d5321679344a7c036715d8eb4ef75c..312f4e0adab8abf8be0d3c4d41d6c148e4994e47 100644 (file)
--- a/src/rx/HPUX/rx_knet.c
+++ b/src/rx/HPUX/rx_knet.c
@@ -3,15 +3,15 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../h/types.h"
-#include "../h/param.h"
-#include "../rx/rx_kcommon.h"
-#include "../h/user.h"
-#include "../h/tihdr.h"
+#include "h/types.h"
+#include "h/param.h"
+#include "rx/rx_kcommon.h"
+#include "h/user.h"
+#include "h/tihdr.h"
 #include <xti.h>
 
 /* Define this here, used externally */

diff --git a/src/rx/IRIX/rx_kmutex.c b/src/rx/IRIX/rx_kmutex.c
index 31b6296448b6a67268d4486c74368ccce87f792c..0fa8cd2ee7f59f80ba2c6906c24fd871ddc7bad4 100644 (file)
--- a/src/rx/IRIX/rx_kmutex.c
+++ b/src/rx/IRIX/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c
index e60681bb796efddc8f71ae1697cd2782bf54253e..09e385a71aa8905085bc2b8fa5639f69092f3932 100644 (file)
--- a/src/rx/IRIX/rx_knet.c
+++ b/src/rx/IRIX/rx_knet.c
@@ -8,14 +8,14 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
-#include "../h/tcp-param.h"
+#include "rx/rx_kcommon.h"
+#include "h/tcp-param.h"
 /* This must be loaded after proc.h to avoid macro collision with a variable*/
-#include "../netinet/udp_var.h"
+#include "netinet/udp_var.h"
 
 
 

diff --git a/src/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c
index 26d2f2fbbb1be88b4504ec9235797559ea13785a..98b90fa7bb7ff95244840b9f8f3e0cdfda5e77bc 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.c
+++ b/src/rx/LINUX/rx_kmutex.c
@@ -14,13 +14,13 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_kernel.h"
+#include "rx/rx_kcommon.h"
+#include "rx_kmutex.h"
+#include "rx/rx_kernel.h"
 
 #ifdef CONFIG_SMP
 

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index 4eb1df649a458da3cecf33156a38fc0bdbc8c73a..a9cf46c98318376e8bf64bb581799688c2423ac6 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -16,7 +16,7 @@
 #ifndef RX_KMUTEX_H_
 #define RX_KMUTEX_H_
 
-#include "../rx/rx_kernel.h"   /* for osi_Panic() */
+#include "rx/rx_kernel.h"      /* for osi_Panic() */
 
 /* AFS_GLOBAL_RXLOCK_KERNEL is defined so that the busy tq code paths are
  * used. The thread can sleep when sending packets.

diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index 331e874fb69006c7496a28a3ffcdec027ab8c5a4..d6a91f9108454f2079b76e74b6c3a167c1b57153 100644 (file)
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -13,14 +13,14 @@
  * Linux implementation.
  */
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_LINUX22_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 #if defined(AFS_LINUX24_ENV)
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
 #endif
 #include <asm/uaccess.h>
 

diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index 4258cf46f13689d2d08593d45a3b2694c52ac874..2ab7d65bace6a719e3f07587233db8469358f7d2 100644 (file)
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -41,20 +41,14 @@ BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
               ${TOP_LIBDIR}/util.a
 
-KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
-       rx_globals.c rx_globals.h rx_kernel.h rx_misc.h \
-       rx_null.c rx_null.h rx_queue.h rx_getaddr.c rx_packet.c rx_packet.h \
-       rx_multi.h rx_kcommon.h rx_kcommon.c rx_prototypes.h \
-       xdr.c xdr.h xdr_array.c xdr_arrayn.c xdr_rx.c rx_misc.c rx_rdwr.c \
-       xdr_afsuuid.c rx_trace.h xdr_int64.c xdr_int32.c xdr_prototypes.h
-UKSRCS = $(KSRCS) rx_conncache.c
-
 all: \
-       includes kinstall ukinstall \
+       includes \
        ${TOP_LIBDIR}/librx.a
 
+depinstall: includes
+
 install-djgpp: \
-       includes kinstall ukinstall \
+       includes \
        ${TOP_INCDIR}/rx/rx_xmit_nt.h \
        ${TOP_LIBDIR}/librx-djgpp.a
 
@@ -180,303 +174,6 @@ ${TOP_INCDIR}/rx/xdr_prototypes.h: xdr_prototypes.h
 ${TOP_INCDIR}/rx/rx_xmit_nt.h: rx_xmit_nt.h 
        ${INSTALL} $? $@
 
-kinstall: \
-       ${KERNELDIR}/rx \
-       ${KERNELDIR}/rx/rx.c \
-       ${KERNELDIR}/rx/rx_clock.c \
-       ${KERNELDIR}/rx/rx_clock.h \
-       ${KERNELDIR}/rx/rx_event.c \
-       ${KERNELDIR}/rx/rx_event.h \
-       ${KERNELDIR}/rx/rx_getaddr.c \
-       ${KERNELDIR}/rx/rx_globals.c \
-       ${KERNELDIR}/rx/rx_globals.h \
-       ${KERNELDIR}/rx/rx.h \
-       ${KERNELDIR}/rx/rx_kcommon.c \
-       ${KERNELDIR}/rx/rx_kcommon.h \
-       ${KERNELDIR}/rx/rx_kernel.h \
-       ${KERNELDIR}/rx/rx_kmutex.c \
-       ${KERNELDIR}/rx/rx_kmutex.h \
-       ${KERNELDIR}/rx/rx_knet.c \
-       ${KERNELDIR}/rx/rx_misc.c \
-       ${KERNELDIR}/rx/rx_misc.h \
-       ${KERNELDIR}/rx/rx_multi.h \
-       ${KERNELDIR}/rx/rx_null.c \
-       ${KERNELDIR}/rx/rx_null.h \
-       ${KERNELDIR}/rx/rx_packet.c \
-       ${KERNELDIR}/rx/rx_packet.h \
-       ${KERNELDIR}/rx/rx_prototypes.h \
-       ${KERNELDIR}/rx/rx_queue.h \
-       ${KERNELDIR}/rx/rx_rdwr.c \
-       ${KERNELDIR}/rx/rx_trace.h \
-       ${KERNELDIR}/rx/xdr_afsuuid.c \
-       ${KERNELDIR}/rx/xdr_array.c \
-       ${KERNELDIR}/rx/xdr_arrayn.c \
-       ${KERNELDIR}/rx/xdr.c \
-       ${KERNELDIR}/rx/xdr.h \
-       ${KERNELDIR}/rx/xdr_prototypes.h \
-       ${KERNELDIR}/rx/xdr_int32.c      \
-       ${KERNELDIR}/rx/xdr_int64.c      \
-       ${KERNELDIR}/rx/xdr_rx.c
-
-ukinstall: \
-       ${UKERNELDIR}/rx \
-       ${UKERNELDIR}/rx/rx.c \
-       ${UKERNELDIR}/rx/rx_clock.c \
-       ${UKERNELDIR}/rx/rx_clock.h \
-       ${UKERNELDIR}/rx/rx_conncache.c \
-       ${UKERNELDIR}/rx/rx_event.c \
-       ${UKERNELDIR}/rx/rx_event.h \
-       ${UKERNELDIR}/rx/rx_getaddr.c \
-       ${UKERNELDIR}/rx/rx_globals.c \
-       ${UKERNELDIR}/rx/rx_globals.h \
-       ${UKERNELDIR}/rx/rx.h \
-       ${UKERNELDIR}/rx/rx_kcommon.c \
-       ${UKERNELDIR}/rx/rx_kcommon.h \
-       ${UKERNELDIR}/rx/rx_kernel.h \
-       ${UKERNELDIR}/rx/rx_kmutex.c \
-       ${UKERNELDIR}/rx/rx_kmutex.h \
-       ${UKERNELDIR}/rx/rx_knet.c \
-       ${UKERNELDIR}/rx/rx_misc.c \
-       ${UKERNELDIR}/rx/rx_misc.h \
-       ${UKERNELDIR}/rx/rx_multi.h \
-       ${UKERNELDIR}/rx/rx_null.c \
-       ${UKERNELDIR}/rx/rx_null.h \
-       ${UKERNELDIR}/rx/rx_packet.c \
-       ${UKERNELDIR}/rx/rx_packet.h \
-       ${UKERNELDIR}/rx/rx_prototypes.h \
-       ${UKERNELDIR}/rx/rx_queue.h \
-       ${UKERNELDIR}/rx/rx_rdwr.c \
-       ${UKERNELDIR}/rx/rx_trace.h \
-       ${UKERNELDIR}/rx/xdr_afsuuid.c \
-       ${UKERNELDIR}/rx/xdr_array.c \
-       ${UKERNELDIR}/rx/xdr_arrayn.c \
-       ${UKERNELDIR}/rx/xdr.c \
-       ${UKERNELDIR}/rx/xdr.h \
-       ${UKERNELDIR}/rx/xdr_prototypes.h \
-       ${UKERNELDIR}/rx/xdr_int32.c \
-       ${UKERNELDIR}/rx/xdr_int64.c \
-       ${UKERNELDIR}/rx/xdr_rx.c
-
-
-${UKERNELDIR}/rx:
-       mkdir -p $@
-
-${KERNELDIR}/rx:
-       mkdir -p $@
-
-${KERNELDIR}/rx/rx.c: rx.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_clock.c: rx_clock.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_clock.h: rx_clock.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_event.c: rx_event.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_event.h: rx_event.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_getaddr.c: rx_getaddr.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_globals.c: rx_globals.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_globals.h: rx_globals.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx.h: rx.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_kcommon.c: rx_kcommon.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_kcommon.h: rx_kcommon.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_kernel.h: rx_kernel.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_kmutex.c: ${MKAFS_OSTYPE}/rx_kmutex.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_kmutex.h: ${MKAFS_OSTYPE}/rx_kmutex.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_knet.c: ${MKAFS_OSTYPE}/rx_knet.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_misc.c: rx_misc.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_misc.h: rx_misc.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_multi.h: rx_multi.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_null.c: rx_null.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_null.h: rx_null.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_packet.c: rx_packet.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_packet.h: rx_packet.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_prototypes.h: rx_prototypes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_queue.h: rx_queue.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_rdwr.c: rx_rdwr.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/rx_trace.h: rx_trace.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_afsuuid.c: xdr_afsuuid.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_array.c: xdr_array.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_arrayn.c: xdr_arrayn.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr.c: xdr.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr.h: xdr.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_prototypes.h: xdr_prototypes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_int32.c: xdr_int32.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_int64.c: xdr_int64.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/rx/xdr_rx.c: xdr_rx.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_clock.c: rx_clock.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_clock.h: rx_clock.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_conncache.c: rx_conncache.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx.c: rx.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_event.c: rx_event.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_event.h: rx_event.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_getaddr.c: rx_getaddr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_globals.c: rx_globals.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_globals.h: rx_globals.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx.h: rx.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_kcommon.c: rx_kcommon.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_kcommon.h: UKERNEL/rx_kcommon.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_kernel.h: rx_kernel.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_kmutex.c: UKERNEL/rx_kmutex.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_kmutex.h: UKERNEL/rx_kmutex.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_knet.c: UKERNEL/rx_knet.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_misc.c: rx_misc.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_misc.h : rx_misc.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_multi.h: rx_multi.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_null.c: rx_null.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_null.h: rx_null.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_packet.c: rx_packet.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_packet.h: rx_packet.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_prototypes.h: rx_prototypes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_queue.h: rx_queue.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_rdwr.c: rx_rdwr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rx_trace.h: rx_trace.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_afsuuid.c: xdr_afsuuid.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_array.c: xdr_array.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_arrayn.c: xdr_arrayn.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr.c: xdr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr.h: xdr.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_prototypes.h: xdr_prototypes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_int32.c: xdr_int32.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_int64.c: xdr_int64.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/xdr_rx.c: xdr_rx.c
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${libdir}/librx.a \
        ${DESTDIR}${includedir}/rx/rx_packet.h \

diff --git a/src/rx/NBSD/rx_knet.c b/src/rx/NBSD/rx_knet.c
index 12da423ddab18992efd92d45875e79c2e9376665..fb1a3e5e4d00f5d1b10373b78d5dc134d5d94c1a 100644 (file)
--- a/src/rx/NBSD/rx_knet.c
+++ b/src/rx/NBSD/rx_knet.c
@@ -8,11 +8,11 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 int osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec,
         int nvecs, int *alength)

diff --git a/src/rx/SOLARIS/rx_kmutex.c b/src/rx/SOLARIS/rx_kmutex.c
index 3e94727191fb9f14273059ea214bb36812a4c3eb..fa698e77f47aa25c5358e1a31b8e8a8c50c7adc5 100644 (file)
--- a/src/rx/SOLARIS/rx_kmutex.c
+++ b/src/rx/SOLARIS/rx_kmutex.c
@@ -14,15 +14,15 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #if defined(AFS_SUN5_ENV) && defined(KERNEL) 
 
-#include "../rx/rx_kcommon.h"
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_kernel.h"
+#include "rx/rx_kcommon.h"
+#include "rx_kmutex.h"
+#include "rx/rx_kernel.h"
 
 #include <errno.h>
 #include <sys/tiuser.h>

diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c
index 3625eea54cd729fcf7798e9f6050d6d4b4c1dfa9..9db15d920a76c1e1256ac0909430eed74b5f56c9 100644 (file)
--- a/src/rx/SOLARIS/rx_knet.c
+++ b/src/rx/SOLARIS/rx_knet.c
@@ -8,33 +8,33 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
 #ifdef AFS_SUN5_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 
 #ifdef AFS_SUN56_ENV
 
-#include "../inet/common.h"
-#include "../sys/tiuser.h"
-#include "../sys/t_kuser.h"
-#include "../sys/stropts.h"
-#include "../sys/stream.h"
-#include "../sys/tihdr.h"
-#include "../sys/fcntl.h"
+#include "inet/common.h"
+#include "sys/tiuser.h"
+#include "sys/t_kuser.h"
+#include "sys/stropts.h"
+#include "sys/stream.h"
+#include "sys/tihdr.h"
+#include "sys/fcntl.h"
 #ifdef AFS_SUN58_ENV
-#include "../netinet/ip6.h"
+#include "netinet/ip6.h"
 #define ipif_local_addr ipif_lcl_addr
 #ifndef V4_PART_OF_V6
 #define V4_PART_OF_V6(v6)       v6.s6_addr32[3]
 #endif
 #endif
-#include "../inet/ip.h"
-#include "../inet/ip_if.h"
-#include "../netinet/udp.h"
+#include "inet/ip.h"
+#include "inet/ip_if.h"
+#include "netinet/udp.h"
 
 /*
  * Function pointers for kernel socket routines
@@ -427,22 +427,22 @@ void osi_StopListener(void)
 
 #else /* AFS_SUN56_ENV */
 
-#include "../inet/common.h"
-#include "../sys/tiuser.h"
-#include "../sys/t_kuser.h"
-#include "../sys/ioctl.h"
-#include "../sys/stropts.h"
-#include "../sys/stream.h"
-#include "../sys/strsubr.h"
-#include "../sys/vnode.h"
-#include "../sys/stropts.h"
-#include "../sys/tihdr.h"
-#include "../sys/timod.h"
-#include "../sys/fcntl.h"
-#include "../sys/debug.h"
-#include "../inet/common.h"
-#include "../inet/mi.h"
-#include "../netinet/udp.h"
+#include "inet/common.h"
+#include "sys/tiuser.h"
+#include "sys/t_kuser.h"
+#include "sys/ioctl.h"
+#include "sys/stropts.h"
+#include "sys/stream.h"
+#include "sys/strsubr.h"
+#include "sys/vnode.h"
+#include "sys/stropts.h"
+#include "sys/tihdr.h"
+#include "sys/timod.h"
+#include "sys/fcntl.h"
+#include "sys/debug.h"
+#include "inet/common.h"
+#include "inet/mi.h"
+#include "netinet/udp.h"
 
 extern dev_t afs_udp_rdev;
 

diff --git a/src/rx/UKERNEL/rx_kcommon.h b/src/rx/UKERNEL/rx_kcommon.h
index 50e13d1d2cff85b1d44322acc0bdf7a11f34553b..765d7cea229077fefc4ebebc202c340fe073bad6 100644 (file)
--- a/src/rx/UKERNEL/rx_kcommon.h
+++ b/src/rx/UKERNEL/rx_kcommon.h
@@ -14,16 +14,16 @@
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/rx_globals.h"
-#include "../rx/rx_kmutex.h"
-#include "../afs/lock.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../afs/longc_procs.h"
-#include "../afs/afs_stats.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afsincludes.h"
+#include "rx/rx_globals.h"
+#include "rx_kmutex.h"
+#include "afs/lock.h"
+#include "rx/rx.h"
+#include "rx/rx_globals.h"
+#include "afs/longc_procs.h"
+#include "afs/afs_stats.h"
 
 extern struct usr_ifnet *usr_ifnet;
 extern struct usr_in_ifaddr *usr_in_ifaddr;

diff --git a/src/rx/UKERNEL/rx_kmutex.c b/src/rx/UKERNEL/rx_kmutex.c
index 6127dcee81d436a87cff0f738cab75107294f6b0..b1973ad7596c9f927f7d7f5045bed534de7bdc87 100644 (file)
--- a/src/rx/UKERNEL/rx_kmutex.c
+++ b/src/rx/UKERNEL/rx_kmutex.c
@@ -14,7 +14,7 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 

diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c
index 2b405677ed3cee188e0ee573e4986b1debe64063..4f2e2db8a8b41c85da3cc212d0a891cfa27b3fa3 100644 (file)
--- a/src/rx/UKERNEL/rx_knet.c
+++ b/src/rx/UKERNEL/rx_knet.c
@@ -8,11 +8,11 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 
 #define SECONDS_TO_SLEEP       0

diff --git a/src/rx/libafsdep b/src/rx/libafsdep
new file mode 100644 (file)
index 0000000..14911b9
--- /dev/null
+++ b/src/rx/libafsdep
@@ -0,0 +1,4 @@
+rx_*.[ch]
+rx.[ch]
+xdr*.[ch]
+MKAFS_OSTYPE/*.[ch]

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 54f0c79e18d5d6d275ed907a2f0d80679c30b3a7..7e85cbed8e17eafb32b7dbb01fb5b13fdd15635e 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -19,31 +19,31 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #ifndef UKERNEL
-#include "../h/types.h"
-#include "../h/time.h"
-#include "../h/stat.h"
+#include "h/types.h"
+#include "h/time.h"
+#include "h/stat.h"
 #ifdef AFS_OSF_ENV
 #include <net/net_globals.h>
 #endif /* AFS_OSF_ENV */
 #ifdef AFS_LINUX20_ENV
-#include "../h/socket.h"
+#include "h/socket.h"
 #endif
-#include "../netinet/in.h"
-#include "../afs/afs_args.h"
-#include "../afs/afs_osi.h"
+#include "netinet/in.h"
+#include "afs/afs_args.h"
+#include "afs/afs_osi.h"
 #if    (defined(AFS_AUX_ENV) || defined(AFS_AIX_ENV))
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
 #ifdef RXDEBUG
 #undef RXDEBUG     /* turn off debugging */
 #endif /* RXDEBUG */
 #if defined(AFS_SGI_ENV)
-#include "../sys/debug.h"
+#include "sys/debug.h"
 #endif
-#include "../afsint/afsint.h"
+#include "afsint.h"
 #ifdef AFS_ALPHA_ENV
 #undef kmem_alloc
 #undef kmem_free
@@ -52,27 +52,27 @@ RCSID("$Header$");
 #undef register
 #endif /* AFS_ALPHA_ENV */
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #endif /* !UKERNEL */
-#include "../afs/lock.h"
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_kernel.h"
-#include "../rx/rx_clock.h"
-#include "../rx/rx_queue.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../rx/rx_trace.h"
+#include "afs/lock.h"
+#include "rx_kmutex.h"
+#include "rx_kernel.h"
+#include "rx_clock.h"
+#include "rx_queue.h"
+#include "rx.h"
+#include "rx_globals.h"
+#include "rx_trace.h"
 #define        AFSOP_STOP_RXCALLBACK   210     /* Stop CALLBACK process */
 #define        AFSOP_STOP_AFS          211     /* Stop AFS process */
 #define        AFSOP_STOP_BKG          212     /* Stop BKG process */
-#include "../afsint/afsint.h"
+#include "afsint.h"
 extern afs_int32 afs_termState;
 #ifdef AFS_AIX41_ENV
 #include "sys/lockl.h"
 #include "sys/lock_def.h"
 #endif /* AFS_AIX41_ENV */
-# include "../afsint/rxgen_consts.h"
+# include "rxgen_consts.h"
 #else /* KERNEL */
 # include <sys/types.h>
 # include <errno.h>

diff --git a/src/rx/rx.h b/src/rx/rx.h
index 0a47548b043eae19ab4573608774256d5d2a22e0..4e0f1b5baa568582095fa745a27410905bdf60e2 100644 (file)
--- a/src/rx/rx.h
+++ b/src/rx/rx.h
@@ -30,21 +30,21 @@
 #endif
 
 #ifdef KERNEL
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_kernel.h"
-#include "../rx/rx_clock.h"
-#include "../rx/rx_event.h"
-#include "../rx/rx_queue.h"
-#include "../rx/rx_packet.h"
-#include "../rx/rx_misc.h"
-#include "../rx/rx_multi.h"
-#include "../netinet/in.h"
-#include "../sys/socket.h"
+#include "rx_kmutex.h"
+#include "rx_kernel.h"
+#include "rx_clock.h"
+#include "rx_event.h"
+#include "rx_queue.h"
+#include "rx_packet.h"
+#include "rx_misc.h"
+#include "rx_multi.h"
+#include "netinet/in.h"
+#include "sys/socket.h"
 #else /* KERNEL */
 # include <sys/types.h>
 # include <stdio.h>
 #ifdef AFS_PTHREAD_ENV
-# include <rx/rx_pthread.h>
+# include "rx_pthread.h"
 #else
 # include "rx_lwp.h"
 #endif
@@ -1003,7 +1003,7 @@ typedef struct rx_interface_stat {
 #endif /* _RX_  End of rx.h */
 
 #ifdef KERNEL
-#include "../rx/rx_prototypes.h"
+#include "rx/rx_prototypes.h"
 #else
 #include "rx_prototypes.h"
 #endif

diff --git a/src/rx/rx_clock.c b/src/rx/rx_clock.c
index 8cab6ba0bb29d33b0a1ba0e23bcbf8991ebf9711..633cc0f247c6679a5e8c8705ef435b489f70a6ff 100644 (file)
--- a/src/rx/rx_clock.c
+++ b/src/rx/rx_clock.c
@@ -11,7 +11,7 @@
 /* See rx_clock.h for calling conventions */
 
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -25,14 +25,14 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../rx/rx_clock.h"
-#include "../h/types.h"
-#include "../h/time.h"
+#include "rx/rx_clock.h"
+#include "h/types.h"
+#include "h/time.h"
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/rx.h"
-#include "../rx/rx_clock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rx/rx.h"
+#include "rx/rx_clock.h"
 #endif /* !UKERNEL */
 #else /* KERNEL */
 #include <sys/time.h>

diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h
index 1234f5244f2885f0850f7aa73d6a18c3159592fa..d1fe2a001d4f49e013119f3747cb879ac6adb3ed 100644 (file)
--- a/src/rx/rx_clock.h
+++ b/src/rx/rx_clock.h
@@ -15,8 +15,8 @@
 
 #ifdef KERNEL
 #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV)
-#include "../h/systm.h"
-#include "../h/time.h"
+#include "h/systm.h"
+#include "h/time.h"
 #endif /* System V */
 #else /* KERNEL */
 #ifndef AFS_NT40_ENV
@@ -85,7 +85,7 @@ extern int clock_nUpdates;
 #define        clock_Sec() ((!clock_haveCurrentTime)? clock_UpdateTime(), clock_now.sec:clock_now.sec)
 #endif /* AFS_USE_GETTIMEOFDAY || AFS_PTHREAD_ENV */
 #else /* KERNEL */
-#include "../afs/afs_osi.h"
+#include "afs/afs_osi.h"
 #define clock_Init()
 #if defined(AFS_SGI61_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL)
 #define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)cv)

diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c
index 25b3696e3dd1866bd98857b5055b0db0df47a2ca..5eb577d22f1d11f8bd1b08754c753a994bcb1fe4 100644 (file)
--- a/src/rx/rx_conncache.c
+++ b/src/rx/rx_conncache.c
@@ -12,7 +12,7 @@
  */
 
 #ifdef UKERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -21,9 +21,9 @@
 RCSID("$Header$");
 
 #ifdef UKERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/rx.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rx/rx.h"
 #else /* ! UKERNEL */
 #include <sys/types.h>
 #include <errno.h>

diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c
index a59fb4b443f0ad7b0e243e64d42df1788fa2b34d..994fb9ce023580b8392785e8e492bcd1a6e7ad5e 100644 (file)
--- a/src/rx/rx_event.c
+++ b/src/rx/rx_event.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -22,26 +22,26 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../afs/afs_osi.h"
+#include "afs/afs_osi.h"
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #endif /* !UKERNEL */
-#include "../rx/rx_clock.h"
-#include "../rx/rx_queue.h"
-#include "../rx/rx_event.h"
-#include "../rx/rx_kernel.h"
-#include "../rx/rx_kmutex.h"
+#include "rx/rx_clock.h"
+#include "rx/rx_queue.h"
+#include "rx/rx_event.h"
+#include "rx/rx_kernel.h"
+#include "rx_kmutex.h"
 #ifdef RX_ENABLE_LOCKS
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #endif /* RX_ENABLE_LOCKS */
-#include "../rx/rx_globals.h"
+#include "rx/rx_globals.h"
 #if defined(AFS_SGI_ENV)
-#include "../sys/debug.h"
+#include "sys/debug.h"
 /* These are necessary to get curproc (used by GLOCK asserts) to work. */
-#include "../h/proc.h"
+#include "h/proc.h"
 #if !defined(AFS_SGI64_ENV) && !defined(UKERNEL)
-#include "../h/user.h"
+#include "h/user.h"
 #endif
 extern void *osi_Alloc();
 #endif

diff --git a/src/rx/rx_event.h b/src/rx/rx_event.h
index 2b5353e6f35799e8da8544475511b7382ee34bce..6ae5912d35e87beef9c4b95016232fd2662d9a52 100644 (file)
--- a/src/rx/rx_event.h
+++ b/src/rx/rx_event.h
@@ -13,8 +13,8 @@
 #define _EVENT_
 
 #ifdef KERNEL
-#include "../rx/rx_queue.h"
-#include "../rx/rx_clock.h"
+#include "rx/rx_queue.h"
+#include "rx/rx_clock.h"
 #else /* KERNEL */
 #include "rx_queue.h"
 #include "rx_clock.h"

diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c
index 5f3039e47006a53bf9f369bc212c68c5c66457d7..d936f2abbe7bfc0df67523f08ee5ec518f015c5b 100644 (file)
--- a/src/rx/rx_getaddr.c
+++ b/src/rx/rx_getaddr.c
@@ -35,9 +35,9 @@ RCSID("$Header$");
 #endif
 #else  /* KERNEL */
 #ifdef UKERNEL
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 #else /* UKERNEL */
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #endif /* UKERNEL */
 #endif /* KERNEL */
 

diff --git a/src/rx/rx_globals.c b/src/rx/rx_globals.c
index 4d7701c0c6cc4e3faca7d941c834f75ea020d3fc..1520522ddc4d91e6bfea4a1d2a3bfc8c4d2f38eb 100644 (file)
--- a/src/rx/rx_globals.c
+++ b/src/rx/rx_globals.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -28,9 +28,9 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../h/types.h"
+#include "h/types.h"
 #else /* !UKERNEL */
-#include       "../afs/sysincludes.h"
+#include       "afs/sysincludes.h"
 #endif /* UKERNEL */
 #endif /* KERNEL */
 

diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index e9803ab13c3673137b2774c883ca14aa3ffb459c..51b40e7e1f003723ae51061a8f17552df8b8e4aa 100644 (file)
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -10,7 +10,7 @@
 /* RX:  Globals for internal use, basically */
 
 #ifdef KERNEL
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #else /* KERNEL */
 # include "rx.h"
 #endif /* KERNEL */

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index c306672831b7a2e9be8e707d81c6f31fd08e5781..640fcc07af30112a2655db7cca59555221ca7e36 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -12,17 +12,17 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
 
 #ifdef AFS_HPUX110_ENV
-#include "../h/tihdr.h"
+#include "h/tihdr.h"
 #include <xti.h>
 #endif
-#include "../afsint/afsint.h"
+#include "afsint.h"
 
 #ifdef AFS_DARWIN60_ENV
 struct ifnet *rxi_FindIfnet(afs_uint32 addr, struct ifaddr **pifad);

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index bcf87317a6dfecc5fe6a94e4b05d4fc1d800c288..e6162e81f7231072c18237bae5c25b58edf6b920 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -11,6 +11,10 @@
  * rx_kcommon.h - Common kernel RX header for all system types.
  */
 
+#ifdef UKERNEL
+#include <UKERNEL/rx_kcommon.h>
+#else
+
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
@@ -20,99 +24,99 @@
 typedef unsigned short                  etap_event_t;
 #endif
 #endif  
-#include "../h/types.h"
-#include "../h/param.h"
+#include "h/types.h"
+#include "h/param.h"
 #ifndef AFS_LINUX22_ENV
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
-#include "../h/time.h"
+#include "h/time.h"
 #ifdef AFS_SUN56_ENV
-#include "../h/vfs.h"          /* stops SUN56 socketvar.h warnings */
-#include "../h/stropts.h"      /* stops SUN56 socketvar.h warnings */
-#include "../h/stream.h"       /* stops SUN56 socketvar.h errors */
-#include "../h/disp.h"
+#include "h/vfs.h"             /* stops SUN56 socketvar.h warnings */
+#include "h/stropts.h" /* stops SUN56 socketvar.h warnings */
+#include "h/stream.h"  /* stops SUN56 socketvar.h errors */
+#include "h/disp.h"
 #endif
-#include "../h/socket.h"
+#include "h/socket.h"
 #if !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV)
-#include "../h/socketvar.h"
+#include "h/socketvar.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
-#include "../h/domain.h"
-#include "../h/dir.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
+#include "h/domain.h"
+#include "h/dir.h"
+#include "h/buf.h"
+#include "h/mbuf.h"
 #else /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
 #if defined(AFS_FBSD_ENV)
-#include "../h/dirent.h"
-#include "../h/socket.h"
-#include "../h/domain.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
+#include "h/dirent.h"
+#include "h/socket.h"
+#include "h/domain.h"
+#include "h/buf.h"
+#include "h/mbuf.h"
 #endif /* AFS_FBSD_ENV */
 #endif /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
 #endif /* !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) */
 #ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
 #endif
 #ifdef AFS_FBSD_ENV
-#include "../h/sysctl.h"
+#include "h/sysctl.h"
 #endif
 #ifdef AFS_OBSD_ENV
-#include "../h/socket.h"
-#include "../h/domain.h"
-#include "../h/buf.h"
-#include "../net/if.h"
-#include "../h/signalvar.h"
+#include "h/socket.h"
+#include "h/domain.h"
+#include "h/buf.h"
+#include "net/if.h"
+#include "h/signalvar.h"
 #endif /* AFS_OBSD_ENV */
-#include "../netinet/in.h"
-#include "../net/route.h"
-#include "../netinet/in_systm.h"
-#include "../netinet/ip.h"
+#include "netinet/in.h"
+#include "net/route.h"
+#include "netinet/in_systm.h"
+#include "netinet/ip.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
-#include "../netinet/in_pcb.h"
+#include "netinet/in_pcb.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #ifndef AFS_LINUX22_ENV
 #if !defined(AFS_DARWIN60_ENV)
-#include "../netinet/ip_var.h"
+#include "netinet/ip_var.h"
 #endif
-#include "../netinet/ip_icmp.h"
+#include "netinet/ip_icmp.h"
 #endif /* AFS_LINUX22_ENV */
-#include "../netinet/udp.h"
+#include "netinet/udp.h"
 #if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../netinet/udp_var.h"
+#include "netinet/udp_var.h"
 #endif
 #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
-#include "../h/user.h"
+#include "h/user.h"
 #endif
 #ifdef AFS_LINUX22_ENV
 #define _LINUX_CODA_FS_I
 struct coda_inode_info {};
-#include "../h/sched.h"
-#include "../h/netdevice.h"
+#include "h/sched.h"
+#include "h/netdevice.h"
 #else
 #if !defined(AFS_OBSD_ENV)
-#include "../h/proc.h"
-#include "../h/file.h"
+#include "h/proc.h"
+#include "h/file.h"
 #endif
 #endif
-#include "../net/if.h"
+#include "net/if.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
-#include "../netinet/in_var.h"
+#include "netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV) 
-#include "../rpc/types.h"
+#include "rpc/types.h"
 #endif
-#include "../afs/afs_osi.h"
-#include "../rx/rx_kmutex.h"
-#include "../afs/lock.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../afs/longc_procs.h"
-#include "../afs/afs_stats.h"
-#include "../h/errno.h"
+#include "afs/afs_osi.h"
+#include "rx_kmutex.h"
+#include "afs/lock.h"
+#include "rx/xdr.h"
+#include "rx/rx.h"
+#include "rx/rx_globals.h"
+#include "afs/longc_procs.h"
+#include "afs/afs_stats.h"
+#include "h/errno.h"
 #ifdef KERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #endif
 #if defined(AFS_OBSD_ENV)
 #include "../netinet/in_pcb.h"
@@ -129,3 +133,5 @@ extern struct domain inetdomain;
 #endif /* AFS_XBSD_ENV */
 
 #endif /* _RX_KCOMMON_H_ */
+
+#endif

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index e8e4e5228eb33ea22430ae03b7da6540191e7318..5b0050464e6271159e8852e67649c86818b02d1d 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -41,6 +41,6 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val);
 #define        osi_YieldIfPossible()
 #define        osi_WakeupAndYieldIfPossible(x)     rx_Wakeup(x)
 
-#include "../afs/longc_procs.h"
+#include "afs/longc_procs.h"
 
 #endif /* __RX_KERNEL_INCL_ */

diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index a2daa6e3d8815d0b287d5c66dca5b82df97aba74..542f3b6da64f0fe7ed79411b1e4d7e52692bf652 100644 (file)
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -14,7 +14,7 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #include <afs/sysincludes.h>
-#include <afs/afsincludes.h>
+#include <afsincludes.h>
 #else
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c
index 945f2613bf08bbd4cb6bf7cadd60b096ab6db4a3..309ad02d6e710364074cb8c22607e0b8e51983b8 100644 (file)
--- a/src/rx/rx_multi.c
+++ b/src/rx/rx_multi.c
@@ -13,8 +13,8 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../rx/rx_kernel.h"
-#include "../rx/rx_multi.h"
+#include "rx/rx_kernel.h"
+#include "rx/rx_multi.h"
 #else /* KERNEL */
 # include "rx_user.h"
 # include "rx_multi.h"

diff --git a/src/rx/rx_multi.h b/src/rx/rx_multi.h
index 7bf21684ac0e7e2175f52ce6267b38c737c85ec4..973679556ee3720179d172eee2241ef7fac49214 100644 (file)
--- a/src/rx/rx_multi.h
+++ b/src/rx/rx_multi.h
@@ -11,7 +11,7 @@
 #define _RX_MULTI_
 
 #ifdef KERNEL
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #else /* KERNEL */
 # include "rx.h"
 #endif /* KERNEL */

diff --git a/src/rx/rx_null.c b/src/rx/rx_null.c
index dd6849f8b880a591f468351100cd22bc68a79885..8a3612e7b7c0ffcb3d3a69c5022be48aa8176182 100644 (file)
--- a/src/rx/rx_null.c
+++ b/src/rx/rx_null.c
@@ -18,11 +18,11 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef        UKERNEL
-#include "../h/types.h"
+#include "h/types.h"
 #else /* !UKERNEL */
 #include "afs/sysincludes.h"
 #endif /* !UKERNEL */
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #else /* KERNEL */
 #include "rx.h"
 #endif /* KERNEL */

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 195b09e3818cdddcd3066c1f9eb2f3553e6cf84a..a2975a8c06852ed76d7bcc9cb95e7a95f255ffbd 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -18,38 +18,38 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../rx/rx_kcommon.h"
-#include "../rx/rx_clock.h"
-#include "../rx/rx_queue.h"
-#include "../rx/rx_packet.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rx/rx_kcommon.h"
+#include "rx/rx_clock.h"
+#include "rx/rx_queue.h"
+#include "rx/rx_packet.h"
 #else /* defined(UKERNEL) */
-#include "../h/types.h"
+#include "h/types.h"
 #ifndef AFS_LINUX20_ENV
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
 #if defined(AFS_SGI_ENV) || defined(AFS_HPUX110_ENV)
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #endif
-#include "../h/socket.h"
+#include "h/socket.h"
 #if !defined(AFS_SUN5_ENV) &&  !defined(AFS_LINUX20_ENV)
 #if    !defined(AFS_OSF_ENV) && !defined(AFS_AIX41_ENV)
-#include "../sys/mount.h"   /* it gets pulled in by something later anyway */
+#include "sys/mount.h"   /* it gets pulled in by something later anyway */
 #endif
-#include "../h/mbuf.h"
+#include "h/mbuf.h"
 #endif
-#include "../netinet/in.h"
-#include "../afs/afs_osi.h"
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_clock.h"
-#include "../rx/rx_queue.h"
+#include "netinet/in.h"
+#include "afs/afs_osi.h"
+#include "rx_kmutex.h"
+#include "rx/rx_clock.h"
+#include "rx/rx_queue.h"
 #ifdef AFS_SUN5_ENV
 #include <sys/sysmacros.h>
 #endif
-#include "../rx/rx_packet.h"
+#include "rx/rx_packet.h"
 #endif /* defined(UKERNEL) */
-#include "../rx/rx_globals.h"
+#include "rx/rx_globals.h"
 #else /* KERNEL */
 #include "sys/types.h"
 #include <sys/stat.h>

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 9c1026906058fda2fab11659cbee5e71f5ad3651..ab85b8a9adff6ead8f4018418df91c7c81875854 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -19,42 +19,42 @@ RCSID("$Header$");
 #ifdef KERNEL
 #ifndef UKERNEL
 #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #else
-#include "../h/types.h"
-#include "../h/time.h"
-#include "../h/stat.h"
+#include "h/types.h"
+#include "h/time.h"
+#include "h/stat.h"
 #ifdef AFS_OSF_ENV
 #include <net/net_globals.h>
 #endif /* AFS_OSF_ENV */
 #ifdef AFS_LINUX20_ENV
-#include "../h/socket.h"
+#include "h/socket.h"
 #endif
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #if defined(AFS_SGI_ENV)
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #endif
 #endif
-#include "../afs/afs_args.h"
-#include "../afs/afs_osi.h"
+#include "afs/afs_args.h"
+#include "afs/afs_osi.h"
 #if    (defined(AFS_AUX_ENV) || defined(AFS_AIX_ENV))
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #endif /* !UKERNEL */
 #ifdef RXDEBUG
 #undef RXDEBUG     /* turn off debugging */
 #endif /* RXDEBUG */
 
-#include "../rx/rx_kmutex.h"
-#include "../rx/rx_kernel.h"
-#include "../rx/rx_clock.h"
-#include "../rx/rx_queue.h"
-#include "../rx/rx.h"
-#include "../rx/rx_globals.h"
-#include "../afs/lock.h"
-#include "../afsint/afsint.h"
+#include "rx_kmutex.h"
+#include "rx/rx_kernel.h"
+#include "rx/rx_clock.h"
+#include "rx/rx_queue.h"
+#include "rx/rx.h"
+#include "rx/rx_globals.h"
+#include "afs/lock.h"
+#include "afsint.h"
 #ifdef  AFS_ALPHA_ENV
 #undef kmem_alloc
 #undef kmem_free

diff --git a/src/rx/rx_stream.c b/src/rx/rx_stream.c
index ce6aef9ca3153ae1e32c5281de9ec8eb5300129c..7ce9a475234c4b4bbc5086839c10a4796f9e168c 100644 (file)
--- a/src/rx/rx_stream.c
+++ b/src/rx/rx_stream.c
@@ -13,7 +13,7 @@ This file is now obsolete.
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -21,9 +21,9 @@ This file is now obsolete.
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../h/types.h"
-#include "../h/uio.h"
-#include "../rx/rx_stream.h"
+#include "h/types.h"
+#include "h/uio.h"
+#include "rx/rx_stream.h"
 #else /* KERNEL */
 #include "rx_stream.h"
 #endif /* KERNEL */

diff --git a/src/rx/rx_stream.h b/src/rx/rx_stream.h
index 66dcb1d9f2125e3411775fc3c31ea728f6cf4ae3..1e23b1cd70d78291e13e35f6ff87f28899a19a1d 100644 (file)
--- a/src/rx/rx_stream.h
+++ b/src/rx/rx_stream.h
@@ -17,7 +17,7 @@ This file is now obsolete.
 #define _RX_STREAM_
 
 #ifdef KERNEL
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #else /* KERNEL */
 #include <sys/types.h>
 #include <sys/uio.h>

diff --git a/src/rx/test/testclient.c b/src/rx/test/testclient.c
index 9c57d6f986f6a3d9af1aab0a89c7f559d9878d53..0922f05d7d455ae52f16042c46834a99142efa39 100644 (file)
--- a/src/rx/test/testclient.c
+++ b/src/rx/test/testclient.c
@@ -28,10 +28,10 @@ RCSID("$Header$");
 #endif
 #include <sys/stat.h>
 #include <signal.h>
-#include "../rx_clock.h"
-#include "../rx.h"
-#include "../rx_globals.h"
-#include "../rx_null.h"
+#include "rx_clock.h"
+#include "rx.h"
+#include "rx_globals.h"
+#include "rx_null.h"
 #include <errno.h>
 #include <afs/afsutil.h>
 

diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c
index fc20f982e109a402045c925ae0573c0c9679c063..74665ca3ce4a278d568514a8c17e884fa217a39d 100644 (file)
--- a/src/rx/test/testserver.c
+++ b/src/rx/test/testserver.c
@@ -29,10 +29,10 @@ RCSID("$Header$");
 #endif
 #include <signal.h>
 #include <sys/stat.h>
-#include "../rx_clock.h"
-#include "../rx.h"
-#include "../rx_globals.h"
-#include "../rx_null.h"
+#include "rx_clock.h"
+#include "rx.h"
+#include "rx_globals.h"
+#include "rx_null.h"
 
 int error;  /* Return this error number on a call */
 int print = 0, eventlog = 0, rxlog = 0;

diff --git a/src/rx/xdr.c b/src/rx/xdr.c
index d252b8d66ed32b3acf3bdc8f776ad07bf1cd1143..ea0c2f10360ddcd9bb36f0458d587ff12caeaf7b 100644 (file)
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -29,7 +29,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif

diff --git a/src/rx/xdr_afsuuid.c b/src/rx/xdr_afsuuid.c
index f063ffddf33d079660ed90a8f59ec17371898e8f..f65204235af4db919b18ddac62c53de9f13528bb 100644 (file)
--- a/src/rx/xdr_afsuuid.c
+++ b/src/rx/xdr_afsuuid.c
@@ -18,7 +18,7 @@ RCSID("$Header$");
 
 #if defined(KERNEL) && !defined(UKERNEL)
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
+#include "h/string.h"
 #if 0
 #define bzero(A, C) memset((A), 0, (C))
 #endif

diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c
index b1538aa650e975a24e8631dfe9d65b8cedaac2ce..7d0729425f63c035686f3867a9d4ee807ef042f4 100644 (file)
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -45,7 +45,7 @@ RCSID("$Header$");
 #ifdef KERNEL
 #include <sys/param.h>
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
+#include "h/string.h"
 #if 0
 #define bzero(A,C) memset((A), 0, (C))
 #endif

diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c
index dda4cd7703e0c9215adf9c5fb515551e2bf7b6ec..5fde3006ee9eeac649cfe6a75bd772d6504f5c1a 100644 (file)
--- a/src/rx/xdr_arrayn.c
+++ b/src/rx/xdr_arrayn.c
@@ -45,7 +45,7 @@ RCSID("$Header$");
 #if defined(KERNEL) && !defined(UKERNEL)
 #include <sys/param.h>
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
+#include "h/string.h"
 #if 0
 #define bzero(A,C) memset((A), 0, (C))
 #endif

diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c
index de58026e5905e7cd0f8a1c87440bd860361e41d8..7e93a6a7d9ed4f6ca1b5a9de53784d6efbe3d417 100644 (file)
--- a/src/rx/xdr_int32.c
+++ b/src/rx/xdr_int32.c
@@ -29,7 +29,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif

diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c
index 29f983440b86475329ee70ef68e7b90bbcaa824b..2ccde65d2302d341f4fbffb1ca48b31d6aefdad4 100644 (file)
--- a/src/rx/xdr_int64.c
+++ b/src/rx/xdr_int64.c
@@ -10,7 +10,7 @@ RCSID("$Header$");
 
 #if defined(KERNEL) && !defined(UKERNEL)
 #ifdef AFS_LINUX20_ENV
-#include "../h/string.h"
+#include "h/string.h"
 #else
 #include <sys/param.h>
 #include <sys/systm.h>

diff --git a/src/rx/xdr_prototypes.h b/src/rx/xdr_prototypes.h
index 4e4eac8248217ee02ccd805ec5399517900b7dfd..c9238cf973d021e14f38719e849ad3e91a99a634 100644 (file)
--- a/src/rx/xdr_prototypes.h
+++ b/src/rx/xdr_prototypes.h
@@ -12,8 +12,8 @@
 
 /* I don't like this, but some of these defs depend on rx.h */
 #if defined(KERNEL) && defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../rx/rx.h"
+#include "afs/sysincludes.h"
+#include "rx/rx.h"
 #else
 #include "rx/rx.h"
 #endif

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 9d49c1adc81163fd4e2abaf90b483333ab591638..0eb7d07077c1678228fb72e8cba21c65b319a8fc 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -12,7 +12,7 @@
  */
 
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -22,15 +22,15 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../h/types.h"
-#include "../h/uio.h"
+#include "h/types.h"
+#include "h/uio.h"
 #ifdef AFS_OSF_ENV
 #include <net/net_globals.h>
 #endif /* AFS_OSF_ENV */
 #ifdef AFS_LINUX20_ENV
-#include "../h/socket.h"
+#include "h/socket.h"
 #else
-#include "../rpc/types.h"
+#include "rpc/types.h"
 #endif
 #ifdef  AFS_ALPHA_ENV
 #undef kmem_alloc
@@ -45,16 +45,16 @@ RCSID("$Header$");
 #define u_quad_t __u_quad_t
 #endif
 #endif
-#include "../rx/xdr.h"
-#include "../netinet/in.h"
+#include "rx/xdr.h"
+#include "netinet/in.h"
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../rpc/types.h"
-#include "../rpc/xdr.h"
+#include "afs/sysincludes.h"
+#include "rpc/types.h"
+#include "rpc/xdr.h"
 #endif /* !UKERNEL */
-#include "../rx/rx.h"
+#include "rx/rx.h"
 
-#include "../afs/longc_procs.h"
+#include "afs/longc_procs.h"
 
 #else /* KERNEL */
 #include <sys/types.h>

diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in
index ef70a724b09cffd72fb7f7f88640bc3d428a6f8e..17c3ab1e005835ca4e0a904f12b2ab32d542a2c2 100644 (file)
--- a/src/rxgen/Makefile.in
+++ b/src/rxgen/Makefile.in
@@ -16,7 +16,7 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
 GOAL=rxgen
 CFLAGS=-I. -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
 
-all: ukinstall rxgen ${TOP_INCDIR}/afs/rxgen_consts.h
+all: rxgen ${TOP_INCDIR}/afs/rxgen_consts.h
 
 rxgen: $(OBJS) AFS_component_version_number.c
        $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
@@ -26,16 +26,6 @@ rxgen: $(OBJS) AFS_component_version_number.c
 #
 install:  ${DESTDIR}${bindir}/rxgen ${DESTDIR}${includedir}/afs/rxgen_consts.h
 
-ukinstall: \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/rxgen_consts.h
-
-${UKERNELDIR}/afs:
-       mkdir -p ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs/rxgen_consts.h: rxgen_consts.h
-       ${INSTALL} $? $@
-
 ${DEST}/bin/rxgen: rxgen
        ${INSTALL} $? $@
 

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index d40e1386d85be54f3c86688b1da60413175c2fbf..2490fbd6f717f61acf51e43f96460cb71acf0547 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -357,7 +357,7 @@ static void c_output(char *infile, char *define, int extend,
     f_print(fout, "/* Machine generated file -- Do NOT edit */\n\n");
     if (xflag) {
        if (kflag) {
-           f_print(fout, "#include \"../afs/param.h\"\n");
+           f_print(fout, "#include \"afs/param.h\"\n");
        } else {
            f_print(fout, "#include <afs/param.h>\n");
        }
@@ -367,21 +367,21 @@ static void c_output(char *infile, char *define, int extend,
     }
     if (currfile && (include = extendfile(currfile,".h"))) {
        if (kflag) {
-           f_print(fout, "#include \"../afsint/%s\"\n\n",include);
+           f_print(fout, "#include \"%s\"\n\n",include);
        } else
            f_print(fout, "#include \"%s\"\n\n", include);
        free(include);
     } else {
        /* In case we can't include the interface's own header file... */
        if (kflag) {
-           f_print(fout, "#include \"../h/types.h\"\n");
-           f_print(fout, "#include \"../h/socket.h\"\n");
-           f_print(fout, "#include \"../h/file.h\"\n");
-           f_print(fout, "#include \"../h/stat.h\"\n");
-           f_print(fout, "#include \"../netinet/in.h\"\n");
-           f_print(fout, "#include \"../h/time.h\"\n");
-           f_print(fout, "#include \"../rx/xdr.h\"\n");
-           f_print(fout, "#include \"../afsint/rxgen_consts.h\"\n");
+           f_print(fout, "#include \"h/types.h\"\n");
+           f_print(fout, "#include \"h/socket.h\"\n");
+           f_print(fout, "#include \"h/file.h\"\n");
+           f_print(fout, "#include \"h/stat.h\"\n");
+           f_print(fout, "#include \"netinet/in.h\"\n");
+           f_print(fout, "#include \"h/time.h\"\n");
+           f_print(fout, "#include \"rx/xdr.h\"\n");
+           f_print(fout, "#include \"rxgen_consts.h\"\n");
        } else {
            f_print(fout, "#include <rx/xdr.h>\n");
        }
@@ -455,38 +455,38 @@ static void h_output(char *infile, char *define, int extend,
        f_print(fout, "#ifdef   KERNEL\n");
        f_print(fout, "/* The following 'ifndefs' are not a good solution to the vendor's omission of surrounding all system includes with 'ifndef's since it requires that this file is included after the system includes...*/\n");
        f_print(fout, "#include <afsconfig.h>\n");
-       f_print(fout, "#include \"../afs/param.h\"\n");
+       f_print(fout, "#include \"afs/param.h\"\n");
        f_print(fout, "#ifdef   UKERNEL\n");
-       f_print(fout, "#include \"../afs/sysincludes.h\"\n");
-       f_print(fout, "#include \"../rx/xdr.h\"\n");
-       f_print(fout, "#include \"../rx/rx.h\"\n");
+       f_print(fout, "#include \"afs/sysincludes.h\"\n");
+       f_print(fout, "#include \"rx/xdr.h\"\n");
+       f_print(fout, "#include \"rx/rx.h\"\n");
        if (xflag) {
-           f_print(fout, "#include \"../rx/rx_globals.h\"\n");
+           f_print(fout, "#include \"rx/rx_globals.h\"\n");
        }
        f_print(fout, "#else    /* UKERNEL */\n");
-       f_print(fout, "#include \"../h/types.h\"\n");
+       f_print(fout, "#include \"h/types.h\"\n");
        f_print(fout, "#ifndef  SOCK_DGRAM  /* XXXXX */\n");
-       f_print(fout, "#include \"../h/socket.h\"\n");
+       f_print(fout, "#include \"h/socket.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef  DTYPE_SOCKET  /* XXXXX */\n");
        f_print(fout, "#ifdef AFS_DEC_ENV\n");
-       f_print(fout, "#include \"../h/smp_lock.h\"\n");
+       f_print(fout, "#include \"h/smp_lock.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef AFS_LINUX22_ENV\n");
-       f_print(fout, "#include \"../h/file.h\"\n");
+       f_print(fout, "#include \"h/file.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef  S_IFMT  /* XXXXX */\n");
-       f_print(fout, "#include \"../h/stat.h\"\n");
+       f_print(fout, "#include \"h/stat.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef  IPPROTO_UDP /* XXXXX */\n");
-       f_print(fout, "#include \"../netinet/in.h\"\n");
+       f_print(fout, "#include \"netinet/in.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef  DST_USA  /* XXXXX */\n");
-       f_print(fout, "#include \"../h/time.h\"\n");
+       f_print(fout, "#include \"h/time.h\"\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef AFS_LINUX22_ENV\n");
-       f_print(fout, "#include \"../rpc/types.h\"\n");
+       f_print(fout, "#include \"rpc/types.h\"\n");
        f_print(fout, "#endif /* AFS_LINUX22_ENV */\n");
        f_print(fout, "#ifndef  XDR_GETLONG /* XXXXX */\n");
        f_print(fout, "#ifdef AFS_LINUX22_ENV\n");
@@ -495,14 +495,14 @@ static void h_output(char *infile, char *define, int extend,
        f_print(fout, "#define u_quad_t __u_quad_t\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#endif\n");
-       f_print(fout, "#include \"../rx/xdr.h\"\n");
+       f_print(fout, "#include \"rx/xdr.h\"\n");
        f_print(fout, "#endif /* XDR_GETLONG */\n");
        f_print(fout, "#endif   /* UKERNEL */\n");
-       f_print(fout, "#include \"../afsint/rxgen_consts.h\"\n");
-       f_print(fout, "#include \"../afs/afs_osi.h\"\n");
-       f_print(fout, "#include \"../rx/rx.h\"\n");
+       f_print(fout, "#include \"rxgen_consts.h\"\n");
+       f_print(fout, "#include \"afs_osi.h\"\n");
+       f_print(fout, "#include \"rx/rx.h\"\n");
        if (xflag) {
-           f_print(fout, "#include \"../rx/rx_globals.h\"\n");
+           f_print(fout, "#include \"rx/rx_globals.h\"\n");
        }
        f_print(fout, "#else    /* KERNEL */\n");
        f_print(fout, "#include <afs/param.h>\n");
@@ -637,26 +637,26 @@ static void C_output(char *infile, char *define, int extend,
     f_print(fout, "/* Machine generated file -- Do NOT edit */\n\n");
     if (currfile && (include = extendfile(currfile,".h"))) {
        if (kflag) {
-           f_print(fout, "#include \"../afsint/%s\"\n\n",include);
+           f_print(fout, "#include \"%s\"\n\n",include);
        } else {
            f_print(fout,"#include \"%s\"\n\n",include);
        }
        free(include);
     } else {
        if (kflag) {
-           f_print(fout, "#include \"../h/types.h\"\n");
-           f_print(fout, "#include \"../h/socket.h\"\n");
-           f_print(fout, "#include \"../h/file.h\"\n");
-           f_print(fout, "#include \"../h/stat.h\"\n");
-           f_print(fout, "#include \"../netinet/in.h\"\n");
-           f_print(fout, "#include \"../h/time.h\"\n");
-           f_print(fout, "#include \"../rpc/types.h\"\n");
-           f_print(fout, "#include \"../rx/xdr.h\"\n");
-           f_print(fout, "#include \"../afsint/rxgen_consts.h\"\n");
-           f_print(fout, "#include \"../afs/afs_osi.h\"\n");
-           f_print(fout, "#include \"../rx/rx.h\"\n");
+           f_print(fout, "#include \"h/types.h\"\n");
+           f_print(fout, "#include \"h/socket.h\"\n");
+           f_print(fout, "#include \"h/file.h\"\n");
+           f_print(fout, "#include \"h/stat.h\"\n");
+           f_print(fout, "#include \"netinet/in.h\"\n");
+           f_print(fout, "#include \"h/time.h\"\n");
+           f_print(fout, "#include \"rpc/types.h\"\n");
+           f_print(fout, "#include \"rx/xdr.h\"\n");
+           f_print(fout, "#include \"rxgen_consts.h\"\n");
+           f_print(fout, "#include \"afs/afs_osi.h\"\n");
+           f_print(fout, "#include \"rx/rx.h\"\n");
            if (xflag) {
-               f_print(fout, "#include \"../rx/rx_globals.h\"\n");
+               f_print(fout, "#include \"rx/rx_globals.h\"\n");
            }
        } else {
            f_print(fout, "#include <sys/types.h>\n");
@@ -701,26 +701,26 @@ static void S_output(char *infile, char *define, int extend,
     f_print(fout, "/* Machine generated file -- Do NOT edit */\n\n");
     if (currfile && (include = extendfile(currfile,".h"))) {
        if (kflag) {
-           f_print(fout, "#include \"../afsint/%s\"\n",include);
+           f_print(fout, "#include \"%s\"\n",include);
        } else {
            f_print(fout,"#include \"%s\"\n\n",include);
        }
        free(include);
     } else {
        if (kflag) {
-           f_print(fout, "#include \"../h/types.h\"\n");
-           f_print(fout, "#include \"../h/socket.h\"\n");
-           f_print(fout, "#include \"../h/file.h\"\n");
-           f_print(fout, "#include \"../h/stat.h\"\n");
-           f_print(fout, "#include \"../netinet/in.h\"\n");
-           f_print(fout, "#include \"../h/time.h\"\n");
-           f_print(fout, "#include \"../rpc/types.h\"\n");
-           f_print(fout, "#include \"../rx/xdr.h\"\n");
-           f_print(fout, "#include \"../afsint/rxgen_consts.h\"\n");
-           f_print(fout, "#include \"../afs/afs_osi.h\"\n");
-           f_print(fout, "#include \"../rx/rx.h\"\n");
+           f_print(fout, "#include \"h/types.h\"\n");
+           f_print(fout, "#include \"h/socket.h\"\n");
+           f_print(fout, "#include \"h/file.h\"\n");
+           f_print(fout, "#include \"h/stat.h\"\n");
+           f_print(fout, "#include \"netinet/in.h\"\n");
+           f_print(fout, "#include \"h/time.h\"\n");
+           f_print(fout, "#include \"rpc/types.h\"\n");
+           f_print(fout, "#include \"rx/xdr.h\"\n");
+           f_print(fout, "#include \"rxgen_consts.h\"\n");
+           f_print(fout, "#include \"afs/afs_osi.h\"\n");
+           f_print(fout, "#include \"rx/rx.h\"\n");
            if (xflag) {
-               f_print(fout, "#include \"../rx/rx_globals.h\"\n");
+               f_print(fout, "#include \"rx/rx_globals.h\"\n");
            }
        } else {
            f_print(fout, "#include <sys/types.h>\n");

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 279eeacc81a3a2c0b277cbde8dd82cd72b0e526b..cab3d1d40bf5ca36ed2a182cd86156b2c2719606 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -24,126 +24,16 @@ fc_test_LIBS=\
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libsys.a
 
-all: kinstall ukinstall ${TOP_LIBDIR}/librxkad.a fc_test \
-       ${TOP_INCDIR}/rx/rxkad.h ${TOP_INCDIR}/rx/rxkad_prototypes.h \
+all: ${TOP_LIBDIR}/librxkad.a fc_test depinstall
+
+depinstall: \
+       ${TOP_INCDIR}/rx/rxkad.h \
+       ${TOP_INCDIR}/rx/rxkad_prototypes.h \
        ${TOP_INCDIR}/rx/fcrypt.h
 
 #
 # Install targets
 #
-kinstall: \
-       ${KERNELDIR}/afs/private_data.h \
-       ${KERNELDIR}/afs/rxkad.h \
-       ${KERNELDIR}/afs/rxkad_prototypes.h \
-       ${KERNELDIR}/afs/sboxes.h \
-       ${KERNELDIR}/afs/fcrypt.h \
-       ${KERNELDIR}/afs/fcrypt.c \
-       ${KERNELDIR}/afs/crypt_conn.c \
-       ${KERNELDIR}/afs/rxkad_client.c \
-       ${KERNELDIR}/afs/rxkad_common.c 
-
-${KERNELDIR}/afs/private_data.h: private_data.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad_prototypes.h: rxkad_prototypes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/sboxes.h: sboxes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/fcrypt.h: fcrypt.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/fcrypt.c: fcrypt.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/crypt_conn.c: crypt_conn.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad_client.c: rxkad_client.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad_common.c: rxkad_common.c
-       ${INSTALL} $? $@
-
-ukinstall: \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/rx \
-       ${UKERNELDIR}/afs/private_data.h \
-       ${UKERNELDIR}/afs/rxkad.h \
-       ${UKERNELDIR}/afs/rxkad_prototypes.h \
-       ${UKERNELDIR}/afs/fcrypt.h \
-       ${UKERNELDIR}/rx/rxkad.h \
-       ${UKERNELDIR}/rx/rxkad_prototypes.h \
-       ${UKERNELDIR}/rx/fcrypt.h \
-       ${UKERNELDIR}/afs/sboxes.h \
-       ${UKERNELDIR}/afs/fcrypt.c \
-       ${UKERNELDIR}/afs/crypt_conn.c \
-       ${UKERNELDIR}/afs/rxkad_client.c \
-       ${UKERNELDIR}/afs/rxkad_common.c \
-       ${UKERNELDIR}/afs/ticket.c \
-       ${UKERNELDIR}/afs/rxkad_server.c \
-       ${UKERNELDIR}/afs/lifetimes.h \
-       ${UKERNELDIR}/afs/rxkad_errs.c 
-
-
-${UKERNELDIR}/afs:
-       mkdir -p $?
-
-${UKERNELDIR}/rx:
-       mkdir -p $?
-
-${UKERNELDIR}/afs/private_data.h: private_data.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad_prototypes.h: rxkad_prototypes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/fcrypt.h: fcrypt.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rxkad_prototypes.h: rxkad_prototypes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/lifetimes.h: lifetimes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ticket.c: ticket.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/sboxes.h: sboxes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/fcrypt.c: fcrypt.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/crypt_conn.c: crypt_conn.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad_client.c: rxkad_client.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad_errs.c: rxkad_errs.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad_server.c: rxkad_server.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad_common.c: rxkad_common.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/fcrypt.h: fcrypt.h
-       ${INSTALL} $? $@
-
 install:   \
        ${DESTDIR}${libdir}/librxkad.a \
        ${DESTDIR}${includedir}/rx/fcrypt.h \

diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c
index e51ef5b7d21834a0180a2837c97d467ebb0f0daf..7b7ef5104d846a3ee788f118666f098476384b02 100644 (file)
--- a/src/rxkad/domestic/crypt_conn.c
+++ b/src/rxkad/domestic/crypt_conn.c
@@ -13,7 +13,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -21,14 +21,14 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/stds.h"
+#include "afs/stds.h"
 #ifndef UKERNEL
-#include "../h/types.h"
-#include "../rx/rx.h"
-#include "../netinet/in.h"
+#include "h/types.h"
+#include "rx/rx.h"
+#include "netinet/in.h"
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../rx/rx.h"
+#include "afs/sysincludes.h"
+#include "rx/rx.h"
 #endif /* !UKERNEL */
 #else /* !KERNEL */
 #include <afs/stds.h>

diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c
index b36964f4db3e0c28e5551f7d899c11973748acc7..8054a48b6384db36f181d46d97f915a7243392bd 100644 (file)
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -14,7 +14,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -24,20 +24,20 @@ RCSID("$Header$");
 #define DEBUG 0
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../afs/stds.h"
-#include "../h/types.h"
+#include "afs/stds.h"
+#include "h/types.h"
 #ifndef AFS_LINUX20_ENV
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #endif
 #else /* UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../afs/stds.h"
+#include "afs/sysincludes.h"
+#include "afs/stds.h"
 #endif /* UKERNEL */
 #ifdef AFS_LINUX22_ENV
 #include <asm/byteorder.h>
 #endif
 
-#include "../afs/longc_procs.h"
+#include "afs/longc_procs.h"
 
 #else /* KERNEL */
 

diff --git a/src/rxkad/libafsdep b/src/rxkad/libafsdep
new file mode 100644 (file)
index 0000000..e2254c5
--- /dev/null
+++ b/src/rxkad/libafsdep
@@ -0,0 +1,6 @@
+rxkad.h
+rxkad_prototypes.h
+rxkad_client.[ch]
+rxkad_common.c
+private_data.h
+domestic/*.[ch]

diff --git a/src/rxkad/rxkad.p.h b/src/rxkad/rxkad.p.h
index e27ad7729948255ec7cd28a06918364a19c63415..c64fb272042bfc38145b9095ba8a5692f6f7a8b4 100644 (file)
--- a/src/rxkad/rxkad.p.h
+++ b/src/rxkad/rxkad.p.h
@@ -133,10 +133,6 @@ extern pthread_mutex_t rxkad_stats_mutex;
 
 extern int rxkad_EpochWasSet;          /* TRUE => we called rx_SetEpoch */
 
-#ifdef  KERNEL
-#include "../afs/rxkad_prototypes.h"
-#else
 #include "rxkad_prototypes.h"
-#endif
 
 #endif /* TRANSARC_RXKAD_RXKAD_H */

diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c
index 769c33840492ae304319af94108674c09c7f8b8a..684f503b1ffbf5a2b6b4f5e3d511cd71f15d6689 100644 (file)
--- a/src/rxkad/rxkad_client.c
+++ b/src/rxkad/rxkad_client.c
@@ -13,7 +13,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -21,22 +21,22 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/stds.h"
+#include "afs/stds.h"
 #ifndef UKERNEL
-#include "../h/types.h"
-#include "../h/time.h"
+#include "h/types.h"
+#include "h/time.h"
 #ifdef AFS_LINUX20_ENV
-#include "../h/socket.h"
+#include "h/socket.h"
 #endif
-#include "../netinet/in.h"
+#include "netinet/in.h"
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
+#include "afs/sysincludes.h"
 #endif /* !UKERNEL */
 #ifndef AFS_LINUX22_ENV
-#include "../rpc/types.h"
-#include "../rx/xdr.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 #endif
-#include "../rx/rx.h"
+#include "rx/rx.h"
 #else /* ! KERNEL */
 #include <afs/stds.h>
 #include <sys/types.h>
@@ -56,7 +56,7 @@ RCSID("$Header$");
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #ifdef AFS_PTHREAD_ENV
-#include "../rxkad/rxkad.h"
+#include "rxkad/rxkad.h"
 #endif /* AFS_PTHREAD_ENV */
 #endif /* KERNEL */
 

diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index 0aaeadc3fa078c50aa44e7f7646f27539512d42b..bf63cb3e7afb6979e8a22b0f69fe3a6bca1a1beb 100644 (file)
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -26,25 +26,25 @@ RCSID("$Header$");
 
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "../afs/stds.h"
-#include "../afs/afs_osi.h"
+#include "afs/stds.h"
+#include "afs/afs_osi.h"
 #ifdef AFS_AIX_ENV
-#include "../h/systm.h"
+#include "h/systm.h"
 #endif
 #ifdef AFS_DARWIN60_ENV
-#include "../h/kernel.h"
+#include "h/kernel.h"
 #endif
-#include "../h/types.h"
-#include "../h/time.h"
+#include "h/types.h"
+#include "h/time.h"
 #ifndef AFS_LINUX22_ENV
-#include "../rpc/types.h"
-#include "../rx/xdr.h"
+#include "rpc/types.h"
+#include "rx/xdr.h"
 #endif /* AFS_LINUX22_ENV */
 #else /* !UKERNEL */
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #endif /* !UKERNEL */
-#include "../rx/rx.h"
+#include "rx/rx.h"
 
 #else /* KERNEL */
 #include <afs/stds.h>

diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h
index 1c339ff9405f3d90d674b3532bd2c905de9098f7..3767513c50fef28f802a7e3fa2376dc6ce08cc7f 100644 (file)
--- a/src/rxkad/rxkad_prototypes.h
+++ b/src/rxkad/rxkad_prototypes.h
@@ -11,12 +11,8 @@
 #define _RXKAD_PROTOTYPES_H
 
 /* till the typedefs are moved elsewhere */
-#ifdef KERNEL
-#include "../afs/fcrypt.h"
-#else
 #include "rx/fcrypt.h"
-#endif
-#include "../rx/rx.h"
+#include "rx/rx.h"
 
 /* domestic/crypt_conn.c */
 extern afs_int32 rxkad_DecryptPacket (const struct rx_connection *conn,

diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index bfeb763d520cbb137b2e47d972a848ca3a99a35e..f49ed5197a521e4fe45f5a9913b3649d67eaf85a 100644 (file)
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,14 +17,14 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../des/des.h"
-#include "../afs/lifetimes.h"
-#include "../afs/rxkad.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "rx/xdr.h"
+#include "rx/rx.h"
+#include "des/des.h"
+#include "rxkad/lifetimes.h"
+#include "rx/rxkad.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <sys/types.h>

diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in
index 7825103cb7cb06d70c43e8b9cbed93d95e985b38..c34e175afde0ada705de8815132568a9e6f71d52 100644 (file)
--- a/src/rxstat/Makefile.in
+++ b/src/rxstat/Makefile.in
@@ -8,13 +8,14 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c
-
-CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src -I${TOP_INCDIR} ${XCFLAGS}
 
 LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o
 
-all: kinstall ukinstall ${TOP_INCDIR}/rx/rxstat.h ${TOP_LIBDIR}/librxstat.a
+all: depinstall ${TOP_LIBDIR}/librxstat.a 
+
+depinstall: \
+       ${TOP_INCDIR}/rx/rxstat.h Krxstat.cs.c Krxstat.ss.c Krxstat.xdr.c
 
 #
 # Build targets
@@ -60,48 +61,6 @@ ${DEST}/lib/librxstat.a: librxstat.a
 ${DEST}/include/rx/rxstat.h: rxstat.h
        ${INSTALL} $? $@
 
-kinstall: ${KERNELDIR}/afsint \
-       ${KERNELDIR}/afsint/rxstat.c \
-       ${KERNELDIR}/afsint/rxstat.h \
-       ${KERNELDIR}/afsint/Krxstat.ss.c \
-       ${KERNELDIR}/afsint/Krxstat.xdr.c 
-
-${KERNELDIR}/afsint:
-       mkdir -p $?
-
-${KERNELDIR}/afsint/rxstat.c: rxstat.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/rxstat.h: rxstat.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Krxstat.ss.c: Krxstat.ss.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Krxstat.xdr.c: Krxstat.xdr.c
-       ${INSTALL} $? $@
-
-ukinstall: ${UKERNELDIR}/afsint \
-       ${UKERNELDIR}/afsint/rxstat.c \
-       ${UKERNELDIR}/afsint/rxstat.h \
-       ${UKERNELDIR}/afsint/Krxstat.ss.c \
-       ${UKERNELDIR}/afsint/Krxstat.xdr.c
-
-${UKERNELDIR}/afsint:
-       mkdir -p $?
-
-${UKERNELDIR}/afsint/rxstat.c: rxstat.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/rxstat.h: rxstat.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Krxstat.ss.c: Krxstat.ss.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Krxstat.xdr.c: Krxstat.xdr.c
-       ${INSTALL} $? $@
-
 #
 # Misc. targets
 #

diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c
index 343fb0e31cfcf8bec52a74f35c115ad3d55e4421..4f534d429e2b36633beb6badbdfaf8c56bab1040 100644 (file)
--- a/src/rxstat/rxstat.c
+++ b/src/rxstat/rxstat.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef UKERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,15 +17,15 @@
 RCSID("$Header$");
 
 #ifdef UKERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "rxstat.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "rxstat/rxstat.h"
 #else /* UKERNEL */
 #include <afs/stds.h>
 #include <rx/rx.h>
-#include "rxstat.h"
+#include "rxstat/rxstat.h"
 #ifdef KERNEL
-#include "../sys/errno.h"
+#include "sys/errno.h"
 #else /* KERNEL */
 #include <errno.h>
 #endif /* KERNEL */

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index a7bf5c1b39306006b702a3449940def84c4ac76f..f0d2cc3685588101d25a09d108777da1fa7192b9 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -23,11 +23,7 @@ all: \
        ${TOP_INCDIR}/afs/afs.exp \
        ${TOP_INCDIR}/afs/xfsattrs.h \
        ${TOP_LIBDIR}/afs.exp \
-       ${TOP_LIBDIR}/libsys.a \
-       ${KERNELDIR}/afs \
-       ${KERNELDIR}/afs/xfsattrs.h \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/afsl.exp
+       ${TOP_LIBDIR}/libsys.a 
 
 libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
        -$(RM) -f $@
@@ -146,18 +142,6 @@ ${TOP_INCDIR}/afs/xfsattrs.h: xfsattrs.h
 ${TOP_LIBDIR}/libsys.a: libsys.a
        ${INSTALL} $? $@
 
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afs/afsl.exp: afsl.exp
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs:
-       mkdir -p $@
-
-${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${libdir}/afs/libsys.a \
        ${DESTDIR}${sbindir}/rmtsysd \

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index f2d1485bc4ac9df74c79e673caaa7324245efe79..05e1365795c608931e555ea5919bbc7016b5a10b 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -16,7 +16,7 @@ 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} \
+CFLAGS=-I. -I${srcdir} -I${TOP_SRCDIR}/volser ${DBG} -w -I${TOP_OBJDIR}/src/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE} \
        -I../bucoord -I../volser
 
 LDFLAGS = ${DBG} ${XLDFLAGS}

diff --git a/src/tests/afscp_callback.c b/src/tests/afscp_callback.c
index 6d2549d0c76c072f528820391c06c3d8b0f58292..64abb755a368b52eccb313b7e2f8b5770f7f072c 100644 (file)
--- a/src/tests/afscp_callback.c
+++ b/src/tests/afscp_callback.c
@@ -1,5 +1,5 @@
 #include <afs/param.h>
-#include <afs/afscbint.h>               /*Callback interface defs*/
+#include <fsint/afscbint.h>               /*Callback interface defs*/
 int afs_cb_inited = 0;
 struct interfaceAddr afs_cb_interface;
 static int init_afs_cb() {

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 9a89517a56d2ae2f6be80809e1f9af9b01226b78..91e5dad01a467c1623fbd212a5b2aa6fa9cf5323 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -22,7 +22,12 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
      ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
 
-all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client
+all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client
+
+depinstall: \
+       ubik_int.cs.c ubik_int.xdr.c \
+       ${TOP_INCDIR}/ubik.h \
+       ${TOP_INCDIR}/ubik_int.h
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
        ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
@@ -136,38 +141,6 @@ ${DEST}/include/ubik.h: ubik.h
 ${DEST}/include/ubik_int.h: ubik_int.h
        ${INSTALL} $? $@
 
-ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint \
-       ${UKERNELDIR}/afsint/ubik_int.h \
-       ${UKERNELDIR}/afsint/ubik_int.cs.c \
-       ${UKERNELDIR}/afsint/ubik_int.xdr.c \
-       ${UKERNELDIR}/afs/ubik.h \
-       ${UKERNELDIR}/afs/ubikclient.c \
-       ${UKERNELDIR}/afs/uerrors.c
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-${UKERNELDIR}/afsint:
-       mkdir -p $@
-
-${UKERNELDIR}/afsint/ubik_int.h: Kubik_int.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/ubik_int.cs.c: Kubik_int.cs.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/ubik_int.xdr.c: Kubik_int.xdr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ubik.h: ubik.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/ubikclient.c: ubikclient.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/uerrors.c: uerrors.c
-       ${INSTALL} $? $@
-
 #
 # Misc. targets
 #

diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index 5d6cb36a7a033ad7e20f84d6fb70addd024d0604..e1452a1e0bc0b35a404e04999884fdc768ddd7ff 100644 (file)
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -35,7 +35,7 @@
 #endif
 
 #if defined(UKERNEL)
-#include "../afsint/ubik_int.h"
+#include "ubik_int.h"
 #else /* defined(UKERNEL) */
 #include <ubik_int.h>
 #endif /* defined(UKERNEL) */
@@ -134,7 +134,7 @@ struct ubik_stat {
 };
 
 #if defined(UKERNEL)
-#include "../afs/lock.h"
+#include "afs/lock.h"
 #else /* defined(UKERNEL) */
 #include <lock.h>                      /* just to make sure we've go this */
 #endif /* defined(UKERNEL) */

diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index 46198b3603b3291a6fb774862f2899dc266f417c..ba913e5829299cedf88fb1e194e60fa4828bde3a 100644 (file)
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -9,7 +9,7 @@
 
 #include <afsconfig.h>
 #if defined(UKERNEL)
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -17,15 +17,15 @@
 RCSID("$Header$");
 
 #if defined(UKERNEL)
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/stds.h"
-#include "../rx/xdr.h"
-#include "../rx/rx.h"
-#include "../afs/lock.h"
-#include "../afs/rxgen_consts.h"
-#include "../afs/ubik.h"
-#include "../afs/pthread_glock.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/stds.h"
+#include "rx/xdr.h"
+#include "rx/rx.h"
+#include "afs/lock.h"
+#include "afs/rxgen_consts.h"
+#include "ubik.h"
+#include "afs/pthread_glock.h"
 #else /* defined(UKERNEL) */
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>

diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in
index 0e176921c50ec354610de66503e916865562be1e..65bba7eed93e4c7b17be1fc751d9fdec3f3ad6b1 100644 (file)
--- a/src/usd/test/Makefile.in
+++ b/src/usd/test/Makefile.in
@@ -31,10 +31,3 @@ clean:
 #######################################################################
 
 test tests: usd_test
-
-kinstall:
-       @echo No kernel source here.
-
-
-
-

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index e1fb5356b9f1bf47867cb6b338a9b965225196fd..a9c33d47e25dd9b8126933c2b48167e8b41469a9 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -17,7 +17,12 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
         dirpath.o fileutil.o netutils.o flipbase64.o \
         afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ}
 
-all: ukinstall kinstall \
+all: includes \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libafsutil.a \
+       sys
+
+includes: \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
        ${TOP_INCDIR}/afs/assert.h \
@@ -33,10 +38,9 @@ all: ukinstall kinstall \
        ${TOP_INCDIR}/afs/pthread_glock.h \
        ${TOP_INCDIR}/afs/afs_atomlist.h \
        ${TOP_INCDIR}/afs/afs_lhash.h \
-       ${TOP_INCDIR}/potpourri.h \
-       ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/libafsutil.a \
-       sys
+       ${TOP_INCDIR}/potpourri.h 
+
+depinstall: includes
 
 dirpath.h: ${srcdir}/dirpath.hin Makefile
        ( sed \
@@ -323,110 +327,6 @@ ${DEST}/lib/afs/libafsutil.a: util.a
 ${DEST}/bin/sys: sys
        ${INSTALL} $? $@
 
-
-kinstall: ${KDIR}/vice.h \
-       ${KDIR}/afs_base64.c \
-       ${KDIR}/afs_uuid.c \
-       ${KDIR}/afs_atomlist.c \
-       ${KDIR}/afs_atomlist.h \
-       ${KDIR}/afs_lhash.c \
-       ${KDIR}/afs_lhash.h
-
-${KDIR}/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
-
-${KDIR}/afs_base64.c: ${srcdir}/base64.c
-       ${INSTALL} $? $@
-
-${KDIR}/afs_uuid.c: ${srcdir}/uuid.c
-       ${INSTALL} $? $@
-
-${KDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
-       ${INSTALL} $? $@
-
-${KDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
-
-${KDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
-       ${INSTALL} $? $@
-
-${KDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
-
-ukinstall: \
-       ${UKDIR}/afs_uuid.c \
-       ${UKDIR}/afs_atomlist.c \
-       ${UKDIR}/afs_atomlist.h \
-       ${UKDIR}/afs_lhash.c \
-       ${UKDIR}/afs_lhash.h \
-       ${UKDIR}/pthread_glock.h \
-       ${UKDIR}/vice.h \
-       ${UKDIR}/errors.h \
-       ${UKDIR}/afsutil.h \
-       ${UKDIR}/afsutil_prototypes.h \
-       ${UKDIR}/dirpath.h \
-       ${UKDIR}/dirpath.c \
-       ${UKDIR}/fileutil.h \
-       ${UKDIR}/fileutil.c \
-       ${UKDIR}/netutils.h \
-       ${UKDIR}/netutils.c \
-       ${UKDIR}/casestrcpy.c \
-       ${UKDIR}/hostparse.c 
-
-${UKDIR}/errors.h: ${srcdir}/errors.h
-       ${INSTALL} $? $@
-
-${UKDIR}/afsutil.h: ${srcdir}/afsutil.h
-       ${INSTALL} $? $@
-
-${UKDIR}/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
-       ${INSTALL} $? $@
-
-${UKDIR}/dirpath.h: dirpath.h
-       ${INSTALL} $? $@
-
-${UKDIR}/dirpath.c: ${srcdir}/dirpath.c
-       ${INSTALL} $? $@
-
-${UKDIR}/fileutil.h: ${srcdir}/fileutil.h
-       ${INSTALL} $? $@
-
-${UKDIR}/fileutil.c: ${srcdir}/fileutil.c
-       ${INSTALL} $? $@
-
-${UKDIR}/netutils.h: ${srcdir}/netutils.h
-       ${INSTALL} $? $@
-
-${UKDIR}/netutils.c: ${srcdir}/netutils.c
-       ${INSTALL} $? $@
-
-${UKDIR}/casestrcpy.c: ${srcdir}/casestrcpy.c
-       ${INSTALL} $? $@
-
-${UKDIR}/hostparse.c: ${srcdir}/hostparse.c
-       ${INSTALL} $? $@
-
-${UKDIR}/pthread_glock.h: ${srcdir}/pthread_glock.h
-       ${INSTALL} $? $@
-
-${UKDIR}/vice.h: ${srcdir}/vice.h
-       ${INSTALL} $? $@
-
-${UKDIR}/afs_uuid.c: ${srcdir}/uuid.c
-       ${INSTALL} $? $@
-
-${UKDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
-       ${INSTALL} $? $@
-
-${UKDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-       ${INSTALL} $? $@
-
-${UKDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
-       ${INSTALL} $? $@
-
-${UKDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
-       ${INSTALL} $? $@
-
 #
 # Misc targets
 #

diff --git a/src/util/afs_atomlist.c b/src/util/afs_atomlist.c
index e5ed4baf0953c5c25cbbcdf67eddc3d743f0a03f..572c5fa5fbcabb0c8e002dd4f0a38dd138bdae1c 100644 (file)
--- a/src/util/afs_atomlist.c
+++ b/src/util/afs_atomlist.c
@@ -13,7 +13,7 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/afs_atomlist.h"
+#include "afs_atomlist.h"
 #else /* KERNEL */
 #include "afs_atomlist.h"
 #endif /* KERNEL */

diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c
index de2677a4e3e33b29f661863f7b436bc72ce832ea..10d2d20578bbfa9d79c54de761fe7a487ed86892 100644 (file)
--- a/src/util/afs_lhash.c
+++ b/src/util/afs_lhash.c
@@ -13,8 +13,8 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/afs_atomlist.h"
-#include "../afs/afs_lhash.h"
+#include "afs_atomlist.h"
+#include "afs_lhash.h"
 #else /* KERNEL */
 #include "afs_atomlist.h"
 #include "afs_lhash.h"

diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index ce19669b1fbbcbcc535b99c336a02251834b17bb..9e99455f275735981303f1688ed7062c03dfe546 100644 (file)
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -17,8 +17,8 @@
 RCSID("$Header$");
 
 #ifdef UKERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsutil.h"
+#include "afs/sysincludes.h"
+#include "afs/afsutil.h"
 #else /* UKERNEL */
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/src/util/netutils.c b/src/util/netutils.c
index c4750957dbaa808d3781f813b098fb71107b725b..b81ab6ec45bb72f4c9553ec6df493c72a5a952f1 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -14,7 +14,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -32,8 +32,8 @@ RCSID("$Header$");
 #endif
 #include <ctype.h>
 #ifdef KERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #else
 #ifdef __FreeBSD__
 #include <sys/types.h>

diff --git a/src/util/test/b32.c b/src/util/test/b32.c
index fa7d42235ae26c05fa6bc12257f851916a168457..a0439720114259cad6175ff48e1ed2f663cfa76d 100644 (file)
--- a/src/util/test/b32.c
+++ b/src/util/test/b32.c
@@ -17,7 +17,7 @@ RCSID("$Header$");
 main() { printf("b32 not required for this operating system.\n"); exit(1); }
 #else
 
-#include "../afsutil.h"
+#include "afsutil.h"
 
 char *prog = "b32";
 

diff --git a/src/util/test/b64.c b/src/util/test/b64.c
index cba4cbb85cb752c2c869a84be70455aa4a1dff49..6191dfda9fb98f491d557e225f5c74da168ffbd3 100644 (file)
--- a/src/util/test/b64.c
+++ b/src/util/test/b64.c
@@ -17,7 +17,7 @@ RCSID("$Header$");
 main() { printf("b64 not required for this operating system.\n"); exit(1); }
 #else
 
-#include "../afsutil.h"
+#include "afsutil.h"
 
 char *prog = "b64";
 

diff --git a/src/util/test/fb64.c b/src/util/test/fb64.c
index dab9e66fb16704bbd801f03b6ebee235bbc08ff8..99264aeeb30f0ed2357b07bf796f1d7485fbddf1 100644 (file)
--- a/src/util/test/fb64.c
+++ b/src/util/test/fb64.c
@@ -17,7 +17,7 @@ RCSID("$Header$");
 main() { printf("fb64 not required for this operating system.\n"); exit(1); }
 #else
 
-#include "../afsutil.h"
+#include "afsutil.h"
 
 char *prog = "fb64";
 

diff --git a/src/util/uuid.c b/src/util/uuid.c
index c27878b477d628dbe4ef69c4af634b69372a1cc4..8ecab1078648ac6a6c386d0aa853f6d3a92bec09 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -44,7 +44,7 @@
 
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "../afs/param.h"
+#include "afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -52,8 +52,8 @@
 RCSID("$Header$");
 
 #ifdef KERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
 #define uuid_memcmp(A,B,C)     memcmp(A, B, C)
 #define uuid_memcpy(A,B,C)     memcpy(A, B, C)
 #else /* KERNEL */

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index c2de7f2c3b089b613b521dab327260ee1cc8672f..a595ed6cb37f4f1213e05a6da50588e481f498e5 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -174,7 +174,10 @@ cmdebug: cmdebug.o ${CMLIBS}
 # *linux* - Builds kdump-X.Y.Z according to kernel version
 kdump-linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_number.c
        ${CC} $(DBG) -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \
+               -I${TOP_OBJDIR}/src \
+               -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
                -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \
+               -I${TOP_SRCDIR} -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
                -I${TOP_INCDIR} ${XCFLAGS} -o kdump-linux-${LINUX_VERSION}.o \
                -c ${srcdir}/kdump.c
 
@@ -185,7 +188,10 @@ kdump-linux-@LINUX_VERSION@: kdump-linux-@LINUX_VERSION@.o
 # *alpha_linux* - Builds kdump-X.Y.Z according to kernel version
 kdump-alpha_linux-@LINUX_VERSION@.o: kdump.c ${INCLS} AFS_component_version_number.c
        ${CC} $(DBG) -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs \
+               -I${TOP_OBJDIR}/src \
+               -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
                -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \
+               -I${TOP_SRCDIR} -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
                -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 \
                -o kdump-alpha_linux-${LINUX_VERSION}.o -c ${srcdir}/kdump.c ;; \
 

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index 24c6b8380161fc97b8367b7ef3fe3e4e7df117d0..4dfaeef43735cf90dcc87623288c0cf26bc88f7f 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -402,8 +402,8 @@ typedef struct {
 #endif
 
 #include <afs/afsint.h>
-#include "../vlserver/vldbint.h"
-#include "../afs/lock.h"
+#include "vlserver/vldbint.h"
+#include "afs/lock.h"
 
 #define        KERNEL
 
@@ -423,8 +423,8 @@ extern off64_t lseek64();
 #define KDUMP_SIZE_T int
 #endif /* AFS_SGI61_ENV */
 
-#include "../afs/afs.h"                /* XXXX Getting it from the obj tree XXX */
-#include "../afs/afs_axscache.h" /* XXXX Getting it from the obj tree XXX */
+#include "afs/afs.h"           /* XXXX Getting it from the obj tree XXX */
+#include "afs/afs_axscache.h" /* XXXX Getting it from the obj tree XXX */
 #include <afs/afs_stats.h>
 
 #include <afs/cmd.h>
@@ -2540,8 +2540,13 @@ void print_vnode(kmem, vep, ptr, pnt)
     printf("\ti_op=0x%x, i_dev=0x%x, i_rdev=0x%x, i_sb=0x%x\n",
           vep->i_op, vep->i_dev, vep->i_rdev, vep->i_sb);
 #ifdef AFS_LINUX24_ENV
+#ifdef AFS_PARISC_LINUX24_ENV
+    printf("\ti_sem: count=%d, wait=0x%x\n",
+          vep->i_sem.count, vep->i_sem.wait);
+#else
     printf("\ti_sem: count=%d, sleepers=%d, wait=0x%x\n",
           vep->i_sem.count, vep->i_sem.sleepers, vep->i_sem.wait);
+#endif
 #else
     printf("\ti_sem: count=%d, waking=%d, wait=0x%x\n",
           vep->i_sem.count, vep->i_sem.waking, vep->i_sem.wait);

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 3820cb02b23b7161a8be4a6a38fe355c58a76620..7d7f2026c9eef7dbf83a5374b8d7f71ccab235c0 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -9,7 +9,7 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
 
-CFLAGS=-DNINTERFACE -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs \
+CFLAGS=-DNINTERFACE -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\
         ${XCFLAGS} -DRXDEBUG
 
 LDFLAGS = ${DBUG} ${XLDFLAGS}

diff --git a/src/viced/callback.c b/src/viced/callback.c
index e5be078e7bb2847de697b98d40996d4ae279a6f2..bafec43dc55b095ad1f5fa299f1b3ee483fbfb19 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -108,7 +108,7 @@ RCSID("$Header$");
 #include <afs/nfs.h>   /* yuck.  This is an abomination. */
 #include <lwp.h>
 #include <rx/rx.h>
-#include <afs/afscbint.h>
+#include <afscbint.h>
 #include <afs/afsutil.h>
 #include <lock.h>
 #include <afs/ihandle.h>

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 49778f1661a7e8fbcab10e1b6389318e0b2de09a..9ddcdd170c22bf2b036b5834bd54bd5dda57f0fb 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -31,30 +31,20 @@ LIBS=\
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/util.a
 
-KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h
-UKSRCS=$(KSRCS)
-
 OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o
 
-CDIR=../../../src/vlserver
-
 
 all: \
        vlserver vlclient cnvldb vlserver cnvldb vldb_check \
-       ${TOP_LIBDIR}/libvldb.a \
+       Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \
+       ${TOP_LIBDIR}/libvldb.a depinstall
+
+depinstall: \
+       Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \
        ${TOP_INCDIR}/afs/vl_opcodes.h \
        ${TOP_INCDIR}/afs/vlserver.h \
        ${TOP_INCDIR}/afs/vldbint.h \
-       ${TOP_INCDIR}/afs/cnvldb.h \
-       ${KERNELDIR}/afsint/Kvldbint.cs.c \
-       ${KERNELDIR}/afsint/Kvldbint.xdr.c \
-       ${KERNELDIR}/afsint/vl_opcodes.h \
-       ${KERNELDIR}/afsint/vldbint.h \
-       ${UKERNELDIR}/afsint/Kvldbint.cs.c \
-       ${UKERNELDIR}/afsint/Kvldbint.xdr.c \
-       ${UKERNELDIR}/afsint/vl_opcodes.h \
-       ${UKERNELDIR}/afsint/vldbint.h
-
+       ${TOP_INCDIR}/afs/cnvldb.h 
 
 vldb_check: vldb_check.o
        $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${XLIBS} \
@@ -122,15 +112,6 @@ vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
 
 system: install
 
-kinstall: $(KSRCS)
-       ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint
-
-ukinstall webinstall: ${UKERNELDIR}/afsint $(UKSRCS)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint
-
-${UKERNELDIR}/afsint:
-       mkdir -p $@
-
 ${DEST}/root.server/usr/afs/bin/vlserver: vlserver
        ${INSTALL} $? $@
 
@@ -152,30 +133,6 @@ ${TOP_INCDIR}/afs/vldbint.h: vldbint.h
 ${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
        ${INSTALL} $? $@
 
-${KERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afsint/vldbint.h: vldbint.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afsint/vldbint.h: vldbint.h
-       ${INSTALL} $? $@
-
 install: \
        ${DESTDIR}${afssrvlibexecdir}/vlserver \
        ${DESTDIR}${afssrvsbindir}/vldb_convert \

diff --git a/src/vol/devname.c b/src/vol/devname.c
index 866943803114ac3a5b57d7f373dc9df339000784..cdaf2d84bf8c78a096eabace735a4bfcf8524151 100644 (file)
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -65,7 +65,7 @@ RCSID("$Header$");
 #include <mntent.h>
 #ifdef AFS_SGI_EFS_IOPS_ENV
 #define ROOTINO EFS_ROOTINO
-#include "../sgiefs/efs.h"
+#include "sgiefs/efs.h"
 #endif
 #else
 #ifdef AFS_LINUX22_ENV

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 67a6f5d3591d5cdb9ecd86b1f7cf6bfc6534bf6c..c6c2ee8ccf46570b2fd3acccce4ec464c21032bc 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -429,7 +429,7 @@ ginode(inum) {
 #define        __ASSERT_H__
 
 #ifdef AFS_SGI_EFS_IOPS_ENV
-#include "../sgiefs/libefs.h"
+#include "sgiefs/libefs.h"
 extern int Log();
 
 /* afs_efs_figet() replaces the SGI library routine because we are malloc'ing

diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in
index 15c55bd73b7a069eb3348be09600ae3e48a03497..9a0156bbe39519b8b7fe79e04736e75670d41fe7 100644 (file)
--- a/src/vol/test/Makefile.in
+++ b/src/vol/test/Makefile.in
@@ -31,9 +31,6 @@ OBJECTS=listVicepx.o utilities.o  updateDirInode.o
 
 all: listVicepx updateDirInode testpart
 
-kinstall:
-       @echo No kernel source here.
-
 install:   
 
 ${OBJECTS}: ${PUBLICHEADERS} ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/afs/afsint.h ../filesignal.h ../vutils.h ../vldb.h ../salvage.h ../volinodes.h ../qiin.h

diff --git a/src/vol/test/nino.c b/src/vol/test/nino.c
index 82d003ed163148b6734543d81524f17c75c55d7b..c09808709899900d4d5ada018fb5f2b1af9ef3c2 100644 (file)
--- a/src/vol/test/nino.c
+++ b/src/vol/test/nino.c
@@ -17,7 +17,7 @@ RCSID("$Header$");
 
 #include <stdio.h>
 #include <sys/types.h>
-#include "../../util/afsutil.h"
+#include "util/afsutil.h"
 
 void Usage(void)
 {

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 77b82367247b31d73e0a9dc4782ea71c37efa291..2341b63e963eadfc15a2922ba50775d045b22945 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -82,7 +82,7 @@ RCSID("$Header$");
 #ifdef AFS_SGI_EFS_IOPS_ENV
 #define ROOTINO EFS_ROOTINO
 #include <sys/fs/efs.h>
-#include "../sgiefs/efs.h" /* until 5.1 release */ 
+#include "sgiefs/efs.h" /* until 5.1 release */ 
 #endif
 
 

diff --git a/src/vol/xfs_size_check.c b/src/vol/xfs_size_check.c
index d64166b53594014e044beb06960ecc3358365d22..a20697f03ae47b1bb67dbc135e49c3495048c75e 100644 (file)
--- a/src/vol/xfs_size_check.c
+++ b/src/vol/xfs_size_check.c
@@ -24,7 +24,7 @@ RCSID("$Header$");
 #include <mntent.h>
 #include "partition.h"
 #ifdef AFS_SGI_EFS_IOPS_ENV
-#include "../sgiefs/efs.h"
+#include "sgiefs/efs.h"
 #endif
 #include <afs/xfsattrs.h>
 

diff --git a/src/volser/common.c b/src/volser/common.c
index 51df3e4205862af716cad8ba61a963a9230df474..a3247cccd886af3567f47d2fa3594fa08d40bc69 100644 (file)
--- a/src/volser/common.c
+++ b/src/volser/common.c
@@ -36,8 +36,7 @@ char *s;
     abort();
 }
 
-void
-InitErrTabs()
+void InitErrTabs(void)
 {
     initialize_KA_error_table();
     initialize_RXK_error_table();

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 438f2f8f03e40021d8cb66382105f066e288453a..d58615b9ae164486be67434c12d957bca6ba145b 100644 (file)
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -62,6 +62,9 @@ RCSID("$Header$");
 
 #include "volser.h"
 #include "volint.h"
+
+#include <volser_prototypes.h>
+
 extern int DoLogging;
 extern struct volser_trans *FindTrans(), *NewTrans(),*TransList();
 extern struct afsconf_dir *tdir;

diff --git a/src/volser/volser_prototypes.h b/src/volser/volser_prototypes.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..df2ad20a28f56cbbb389ffd9359c1a2f20110595 100644 (file)
--- a/src/volser/volser_prototypes.h
+++ b/src/volser/volser_prototypes.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        _VOLSER_PROTOTYPES_H
+#define _VOLSER_PROTOTYPES_H
+
+/* common.c */
+
+/* vsprocs.c */
+extern void MapPartIdIntoName(afs_int32 partId, char *partName);
+extern int yesprompt(char *str);
+extern int PrintError(char *msg, afs_int32 errcode);
+extern int UV_SetSecurity(register struct rx_securityClass *as, afs_int32 aindex);
+extern struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port);
+extern void SubEnumerateEntry(struct nvldbentry *entry);
+extern void EnumerateEntry(struct nvldbentry *entry);
+extern int UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_int32 volid);
+extern int UV_PartitionInfo(afs_int32 server, char *pname, struct diskPartition *partition);
+extern int UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 *anewid);
+extern int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 aquota, 
+       afs_int32 aspare1, afs_int32 aspare2, afs_int32 aspare3, afs_int32 aspare4, afs_int32 *anewid);
+extern int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 aid);
+extern int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid);
+extern void sigint_handler(int x);
+extern int UV_MoveVolume(afs_int32 afromvol, afs_int32 afromserver, 
+       afs_int32 afrompart, afs_int32 atoserver, afs_int32 atopart);
+extern int UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid);
+extern int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afrompart, int forceflag);
+extern void dump_sig_handler(int x);
+extern int UV_DumpVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afrompart, 
+       afs_int32 fromdate, afs_int32 (*DumpFunction)(), char *rock);
+extern int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid, 
+       char tovolname[], int flags, afs_int32 (*WriteData)(), char *rock);
+extern int UV_LockRelease(afs_int32 volid);
+extern int UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid);
+extern int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_int32 volid);
+extern int UV_ChangeLocation(afs_int32 server, afs_int32 part, afs_int32 volid);
+extern int UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList, afs_int32 *cntp);
+extern int UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart, struct volDescription *volPtr, afs_int32 arraySize);
+extern int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart, struct volDescription *volPtr, afs_int32 arraySize);
+extern int UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all, struct volintInfo **resultPtr, afs_int32 *size);
+extern int UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID, int a_all, 
+       struct volintXInfo **a_resultPP, afs_int32 *a_numEntsInResultP);
+extern int UV_ListOneVolume(afs_int32 aserver, afs_int32 apart, afs_int32 volid, struct volintInfo **resultPtr);
+extern int UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID, 
+       afs_int32 a_volID, struct volintXInfo **a_resultPP);
+extern int sortVolumes(const void *a, const void *b);
+extern int UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname, int flags);
+extern int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags, int force);
+extern afs_int32 VolumeExists(afs_int32 server, afs_int32 partition, afs_int32 volumeid);
+extern afs_int32 CheckVldbRWBK(struct nvldbentry *entry, afs_int32 *modified);
+extern int CheckVldbRO(struct nvldbentry *entry, afs_int32 *modified);
+extern afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 *modified);
+extern int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags, int force);
+extern int UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[]);
+extern int UV_VolserStatus(afs_int32 server, transDebugInfo **rpntr, afs_int32 *rcount);
+extern int UV_VolumeZap(afs_int32 server, afs_int32 part, afs_int32 volid);
+extern int UV_SetVolume(afs_int32 server, afs_int32 partition, afs_int32 volid, afs_int32 transflag, afs_int32 setflag, int sleeptime);
+extern int UV_SetVolumeInfo(afs_int32 server, afs_int32 partition, afs_int32 volid, volintInfo *infop);
+extern void MapNetworkToHost(struct nvldbentry *old, struct nvldbentry *new);
+extern void MapHostToNetwork(struct nvldbentry *entry);
+
+#endif

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 1c464489c646cb5960851a0c78d637457caa662e..c768f9373dea5252ceea84f68508c51b7c5e2b69 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -61,6 +61,8 @@ RCSID("$Header$");
 #include <afs/procmgmt.h>   /* signal(), kill(), wait(), etc. */
 #include <setjmp.h>
 
+#include <volser_prototypes.h>
+
 afs_int32 VolumeExists(), CheckVldbRWBK(), CheckVldb();
 
 struct ubik_client *cstruct;
@@ -78,6 +80,85 @@ struct release {
   afs_int32 vldbEntryIndex;
 };
 
+/* Utility macros used by rest of this source file */
+#define EPRINT(ec, es) \
+       fprintf(STDERR, "\n"); \
+       fprintf(STDERR, (es)); \
+       PrintError("   ",ec);
+
+#define EPRINT1(ec, es, ep1) \
+       fprintf(STDERR, "\n"); \
+       fprintf(STDERR, (es), (ep1)); \
+       PrintError("   ",ec);
+
+#define EPRINT2(ec, es, ep1, ep2) \
+       fprintf(STDERR, "\n"); \
+       fprintf(STDERR, (es), (ep1), (ep2)); \
+       PrintError("   ",ec);
+
+#define EPRINT3(ec, es, ep1, ep2, ep3) \
+       fprintf(STDERR, "\n"); \
+       fprintf(STDERR, (es), (ep1), (ep2), (ep3)); \
+       PrintError("   ",ec); 
+
+#define EGOTO(where, ec, es) \
+       if (ec) { \
+               EPRINT((ec),(es)); \
+               error = (ec); \
+               goto where; \
+       }
+
+#define EGOTO1(where, ec, es, ep1) \
+       if (ec) { \
+               EPRINT1((ec),(es),(ep1)); \
+               error = (ec); \
+               goto where; \
+       }
+
+#define EGOTO2(where, ec, es, ep1, ep2) \
+       if (ec) { \
+               EPRINT2((ec),(es),(ep1),(ep2)); \
+               error = (ec); \
+               goto where; \
+       }
+
+#define EGOTO3(where, ec, es, ep1, ep2, ep3) \
+       if (ec) { \
+               EPRINT3((ec),(es),(ep1),(ep2),(ep3)); \
+               error = (ec); \
+               goto where; \
+       }
+
+#define VPRINT(es) \
+       { if (verbose) { fprintf(STDOUT, (es)); fflush(STDOUT); } }
+#define VPRINT1(es, p) \
+       { if (verbose) { fprintf(STDOUT, (es), (p)); fflush(STDOUT); } }
+#define VPRINT2(es, p1, p2) \
+       { if (verbose) { fprintf(STDOUT, (es), (p1), (p2)); fflush(STDOUT); } }
+#define VPRINT3(es, p1, p2, p3) \
+       { if (verbose) { fprintf(STDOUT, (es), (p1), (p2), (p3)); fflush(STDOUT); } }
+#define VDONE \
+       { if (verbose) { fprintf(STDOUT, " done\n"); fflush(STDOUT); } }
+
+
+
+/* getting rid of this */
+#define ERROR_EXIT(code) {error=(code); goto error_exit;}
+
+
+/* Protos for static routines */
+static afs_int32 CheckAndDeleteVolume(struct rx_connection *aconn, 
+       afs_int32 apart, afs_int32 okvol, afs_int32 delvol);
+static int DelVol (struct rx_connection *conn, afs_int32 vid, afs_int32 part, afs_int32 flags);
+static int GetTrans (struct nvldbentry *vldbEntryPtr, afs_int32 index, struct rx_connection **connPtr, 
+       afs_int32 *transPtr, afs_int32 *timePtr);
+static int SimulateForwardMultiple(struct rx_connection *fromconn, afs_int32 fromtid, 
+       afs_int32 fromdate, manyDests *tr, afs_int32 flags, void *cookie, manyResults *results);
+static int rel_compar (struct release *r1, struct release *r2);
+static afs_int32 CheckVolume(volintInfo *volumeinfo, afs_int32 aserver, afs_int32 apart, 
+       afs_int32 *modentry, afs_uint32 *maxvolid);
+
+
 /*map the partition <partId> into partition name <partName>*/
 void MapPartIdIntoName(afs_int32 partId, char *partName)
 {
@@ -268,9 +349,8 @@ struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port)
 
 /* if <okvol> is allright(indicated by beibg able to
  * start a transaction, delete the <delvol> */
-static afs_int32 CheckAndDeleteVolume(aconn,apart,okvol,delvol)
-struct rx_connection *aconn;
-afs_int32 apart,okvol,delvol;
+static afs_int32 CheckAndDeleteVolume(struct rx_connection *aconn, 
+       afs_int32 apart, afs_int32 okvol, afs_int32 delvol)
 {
     afs_int32 error,code,tid,rcode;
 
@@ -434,31 +514,20 @@ int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32
 
     aconn = UV_Bind(aserver, AFSCONF_VOLUMEPORT);
     /* next the next 3 available ids from the VLDB */
-    vcode = ubik_Call(VL_GetNewVolumeId,cstruct, 0, 3, anewid);
-    if(vcode) {
-       fprintf(STDERR,"Could not get an Id for volume %s\n",aname);
-       error = vcode;
-       goto cfail;
-    }
+    vcode = ubik_Call(VL_GetNewVolumeId, cstruct, 0, 3, anewid);
+    EGOTO1(cfail, vcode, "Could not get an Id for volume %s\n",aname);
+
     code = AFSVolCreateVolume(aconn, apart, aname, volser_RW, 0, anewid, &tid);
-    if (code) {
-       fprintf(STDERR,"Failed to create the volume %s %u \n",aname,*anewid);
-       error = code;
-       goto cfail;
-    }
+    EGOTO2(cfail, vcode, "Failed to create the volume %s %u \n",aname,*anewid);
     
     code = AFSVolSetInfo(aconn, tid, &tstatus);
-    if (code) {
-       fprintf(STDERR,"Could not change quota (error %d), continuing...\n", code);
-    }
+    EPRINT1(code, "Could not change quota (error %d), continuing...\n", code);
 
     code = AFSVolSetFlags(aconn, tid, 0); /* bring it online (mark it InService */
-    if (code) {
-       fprintf(STDERR,"Could not bring the volume %s %u online \n",aname,*anewid);
-       error = code;
-       goto cfail;
-    }
-    if(verbose) fprintf(STDOUT,"Volume %s %u created and brought online\n",aname,*anewid);
+    EGOTO2(cfail, vcode, "Could not bring the volume %s %u online \n",aname,*anewid);
+
+    VPRINT2("Volume %s %u created and brought online\n",aname,*anewid);
+
     /* set up the vldb entry for this volume */
     strncpy(entry.name, aname,VOLSER_OLDMAXVOLNAME);
     entry.nServers = 1;
@@ -480,14 +549,12 @@ int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32
     if(vcode) {
        fprintf(STDERR,"Could not create a VLDB entry for the volume %s %u\n", aname,*anewid);
        /*destroy the created volume*/
-       if(verbose) {
-           fprintf(STDOUT,"Deleting the newly created volume %u\n",*anewid);
-       }
+       VPRINT1("Deleting the newly created volume %u\n",*anewid);
        AFSVolDeleteVolume(aconn,tid);
        error = vcode;
        goto cfail;
     }
-    if(verbose) fprintf(STDOUT,"Created the VLDB entry for the volume %s %u\n",aname,*anewid);
+    VPRINT2("Created the VLDB entry for the volume %s %u\n",aname,*anewid);
     /* volume created, now terminate the transaction and release the connection*/
     code = AFSVolEndTrans(aconn, tid, &rcode);/*if it crashes before this
        the volume will come online anyway when transaction timesout , so if
@@ -552,7 +619,7 @@ int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 a
        error = vcode;
        goto cfail;
     }
-    if(verbose) fprintf(STDOUT,"Created the VLDB entry for the volume %s %u\n",aname,aid);
+    VPRINT2("Created the VLDB entry for the volume %s %u\n",aname,aid);
 
   cfail:
     if(aconn) rx_DestroyConnection(aconn);
@@ -560,8 +627,6 @@ int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 a
     return error;
 }
 
-#define ERROR_EXIT(code) {error=(code); goto error_exit;}
-
 /* Delete the volume <volid>on <aserver> <apart>
  * the physical entry gets removed from the vldb only if the ref count 
  * becomes zero
@@ -581,18 +646,14 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
     code = ubik_Call(VL_SetLock, cstruct, 0, avolid, avoltype, VLOP_DELETE);
     if (code) {
        if (code != VL_NOENT) {
-          fprintf(STDERR,"Could not lock VLDB entry for the volume %u\n", avolid);
-          ERROR_EXIT(code);
+          EGOTO1(error_exit, code, "Could not lock VLDB entry for the volume %u\n", avolid);
        }
        notinvldb = 1;
     } else {
        islocked = 1;
 
        code = VLDB_GetEntryByID(avolid, avoltype, &entry);
-       if (code) {
-         fprintf(STDERR,"Could not fetch VLDB entry for volume %u\n",avolid);
-         ERROR_EXIT(code);
-       }
+       EGOTO1(error_exit, code, "Could not fetch VLDB entry for volume %u\n",avolid);
        MapHostToNetwork(&entry);
 
        if (verbose)
@@ -606,29 +667,20 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
        if (code == VNOVOL) {
          notondisk = 1;
        } else {
-          fprintf(STDERR,"Transaction on volume %u failed\n", avolid);
-          ERROR_EXIT(code);
+          EGOTO1(error_exit, code, "Transaction on volume %u failed\n", avolid);
        }
     }
     else {
-       if (verbose) {
-         fprintf(STDOUT,"Trying to delete the volume %u ...", avolid);
-         fflush(STDOUT);
-       }
+       VPRINT1("Trying to delete the volume %u ...", avolid);
+
        code = AFSVolDeleteVolume(aconn, ttid);
-       if (code) {
-         fprintf(STDERR,"Could not delete the volume %u \n", avolid);
-         ERROR_EXIT(code);
-       }
+       EGOTO1(error_exit, code, "Could not delete the volume %u \n", avolid);
+
        code = AFSVolEndTrans(aconn, ttid, &rcode);
        code = (code ? code : rcode);
        ttid = 0;
-       if (code) {
-         fprintf(STDERR,"Could not end the transaction for the volume %u \n",avolid);
-         ERROR_EXIT(code);
-       }
-       if (verbose)
-         fprintf(STDOUT," done\n");
+       EGOTO1(error_exit, code, "Could not end the transaction for the volume %u \n",avolid);
+       VDONE;
     }
 
     /* Now update the VLDB entry.
@@ -647,8 +699,7 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
           ERROR_EXIT(0);
        }
 
-       if (verbose)
-          fprintf(STDOUT,"Marking the backup volume %u deleted in the VLDB\n", avolid);
+       VPRINT1("Marking the backup volume %u deleted in the VLDB\n", avolid);
 
        entry.flags &= ~BACK_EXISTS;
        vtype = BACKVOL;
@@ -693,18 +744,13 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
              fflush(STDOUT);
           }
           code = AFSVolDeleteVolume(aconn, ttid);
-          if (code) {
-             fprintf(STDERR,"Could not delete the volume %u \n", entry.volumeId[BACKVOL]);
-             ERROR_EXIT(code);
-          }
+          EGOTO1(error_exit, code, "Could not delete the volume %u \n", entry.volumeId[BACKVOL]);
+
           code = AFSVolEndTrans(aconn, ttid, &rcode);
           ttid = 0;
           code = (code ? code : rcode);
-          if (code) {
-             fprintf(STDERR,"Could not end the transaction for the volume %u \n",
+          EGOTO1(error_exit, code, "Could not end the transaction for the volume %u \n",
                      entry.volumeId[BACKVOL]);
-             ERROR_EXIT(code);
-          }
           if (verbose)
              fprintf(STDOUT," done\n");
        }
@@ -732,28 +778,21 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
        if (verbose)
          fprintf(STDOUT,"Last reference to the VLDB entry for %u - deleting entry\n", avolid);
        code = ubik_Call(VL_DeleteEntry, cstruct, 0, avolid, vtype);
-       if (code) {
-         fprintf(STDERR,"Could not delete the VLDB entry for the volume %u \n",avolid);
-         ERROR_EXIT(code);
-       }
+       EGOTO1(error_exit, code, "Could not delete the VLDB entry for the volume %u \n",avolid);
     } else {
        MapNetworkToHost(&entry, &storeEntry);
        code = VLDB_ReplaceEntry(avolid, vtype, &storeEntry,
                                (LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP));
-       if (code) {
-         fprintf(STDERR,"Could not update the VLDB entry for the volume %u \n", avolid);
-         ERROR_EXIT(code);
-       }
+       EGOTO1(error_exit, code, "Could not update the VLDB entry for the volume %u \n", avolid);
     }
     islocked = 0;
 
   error_exit:
-    if (error) PrintError("", error);
+    if (error) EPRINT(error, "\n");
 
     if (notondisk && notinvldb) {
-       fprintf(STDERR,"Volume %u does not exist %s\n",
+       EPRINT2(VOLSERNOVOL,"Volume %u does not exist %s\n",
               avolid, ((notinvldb == 2)?"on server and partition":""));
-       PrintError("", VOLSERNOVOL);
        if (!error) error = VOLSERNOVOL;
     }
     else if (notondisk) {
@@ -778,9 +817,8 @@ int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
        code = ubik_Call(VL_ReleaseLock,cstruct, 0, avolid, -1, 
                         (LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP));
        if (code) {
-           fprintf(STDERR,"Could not release the lock on the VLDB entry for the volume %u \n", 
+           EPRINT1(code, "Could not release the lock on the VLDB entry for the volume %u \n", 
                    avolid);
-           PrintError("", code);
            if (!error) error = code;
        }
     }
@@ -815,20 +853,12 @@ void sigint_handler(int x)
        return;
 }
 
-#define ONERR(ec, es, ep) if (ec) { fprintf(STDERR, (es), (ep)); PrintError("   ",ec); error = (ec); goto mfail; }
-#define VPRINT(es) if (verbose) { fprintf(STDOUT, (es)); fflush(STDOUT); }
-#define VPRINT1(es, vol) if (verbose) { fprintf(STDOUT, (es), (vol)); fflush(STDOUT); }
-#define VPRINT2(es, vol1, vol2) if (verbose) { fprintf(STDOUT, (es), (vol1), (vol2)); fflush(STDOUT); }
-#define VDONE if (verbose) { fprintf(STDOUT, " done\n"); fflush(STDOUT); }
-
 /* Move volume <afromvol> on <afromserver> <afrompart> to <atoserver>
  * <atopart>. The operation is almost idempotent 
  */
 
-UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
-     afs_int32 afromvol; 
-     afs_int32 afromserver, atoserver;
-     afs_int32 afrompart,   atopart;
+int UV_MoveVolume(afs_int32 afromvol, afs_int32 afromserver, 
+       afs_int32 afrompart, afs_int32 atoserver, afs_int32 atopart)
 {
     struct rx_connection *toconn, *fromconn ;
     afs_int32                fromtid, totid, clonetid;
@@ -893,7 +923,7 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     }
 
     vcode = VLDB_GetEntryByID(afromvol, -1, &entry);
-    ONERR (vcode, "Could not fetch the entry for the volume  %u from the VLDB \n", afromvol);
+    EGOTO1(mfail, vcode, "Could not fetch the entry for the volume  %u from the VLDB \n", afromvol);
 
     if (entry.volumeId[RWVOL] != afromvol)
     {
@@ -902,11 +932,11 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     }
 
     vcode = ubik_Call(VL_SetLock, cstruct, 0,afromvol, RWVOL, VLOP_MOVE);
-    ONERR (vcode, "Could not lock entry for volume %u \n", afromvol);
+    EGOTO1(mfail, vcode, "Could not lock entry for volume %u \n", afromvol);
     islocked = 1;
 
     vcode = VLDB_GetEntryByID (afromvol, RWVOL, &entry);
-    ONERR (vcode, "Could not fetch the entry for the volume  %u from the VLDB \n", afromvol);
+    EGOTO1(mfail, vcode, "Could not fetch the entry for the volume  %u from the VLDB \n", afromvol);
 
     backupId = entry.volumeId[BACKVOL];
     MapHostToNetwork(&entry);
@@ -931,7 +961,7 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
            }
            vcode = ubik_Call(VL_ReleaseLock, cstruct, 0, afromvol, -1,
                              (LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP));
-           ONERR (vcode, " Could not release lock on the VLDB entry for the volume %u \n",
+           EGOTO1(mfail, vcode, " Could not release lock on the VLDB entry for the volume %u \n",
                   afromvol);
 
            return VOLSERVOLMOVED;
@@ -951,19 +981,19 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
        {   /* volume exists - delete it */
            VPRINT1("Setting flags on leftover source volume %u ...", afromvol);
            code = AFSVolSetFlags(fromconn, fromtid, VTDeleteOnSalvage | VTOutOfService);
-           ONERR (code, "Failed to set flags on the leftover source volume %u\n", afromvol);
+           EGOTO1(mfail, code, "Failed to set flags on the leftover source volume %u\n", afromvol);
            VDONE;
 
            VPRINT1("Deleting leftover source volume %u ...", afromvol);
            code = AFSVolDeleteVolume(fromconn,fromtid);
-           ONERR (code, "Failed to delete the leftover source volume %u\n", afromvol);
+           EGOTO1(mfail, code, "Failed to delete the leftover source volume %u\n", afromvol);
            VDONE;
            
            VPRINT1("Ending transaction on leftover source volume %u ...", afromvol);
            code = AFSVolEndTrans(fromconn, fromtid, &rcode);
            fromtid = 0;
            if (!code) code = rcode;
-           ONERR (code, "Could not end the transaction for the leftover source volume %u \n", afromvol);
+           EGOTO1(mfail, code, "Could not end the transaction for the leftover source volume %u \n", afromvol);
            VDONE;
        }
 
@@ -974,19 +1004,19 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
        {   /* backup volume exists - delete it */
            VPRINT1("Setting flags on leftover backup volume %u ...", backupId);
            code = AFSVolSetFlags(fromconn, fromtid, VTDeleteOnSalvage | VTOutOfService);
-           ONERR (code, "Failed to set flags on the backup volume %u\n", backupId);
+           EGOTO1(mfail, code, "Failed to set flags on the backup volume %u\n", backupId);
            VDONE;
 
            VPRINT1("Deleting leftover backup volume %u ...", backupId);
            code = AFSVolDeleteVolume(fromconn,fromtid);
-           ONERR (code, "Could not delete the leftover backup volume %u\n", backupId);
+           EGOTO1(mfail, code, "Could not delete the leftover backup volume %u\n", backupId);
            VDONE;
 
            VPRINT1("Ending transaction on leftover backup volume %u ...", backupId);
            code = AFSVolEndTrans(fromconn, fromtid, &rcode);
            fromtid = 0;
            if (!code) code = rcode;
-           ONERR (code,"Could not end the transaction for the leftover backup volume %u \n",backupId);
+           EGOTO1(mfail, code,"Could not end the transaction for the leftover backup volume %u\n",backupId);
            VDONE;
        }
 
@@ -1002,14 +1032,13 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     if (afrompart == atopart) 
     {
         same = VLDB_IsSameAddrs (afromserver, atoserver, &error);
-       if (error) 
+       EGOTO2(mfail, error, "Failed to get info about server's %d address(es) from vlserver (err=%d); aborting call!\n",
+               afromserver, error);
+
+       if ( same )
        {
-           fprintf(STDERR, "Failed to get info about server's %d address(es) from vlserver (err=%d); aborting call!\n", 
-                   afromserver, error);
-           goto mfail;
+               EGOTO1(mfail, VOLSERVOLMOVED, "Warning: Moving volume %u to its home partition ignored!\n", afromvol);
        }
-       if (same) ONERR (VOLSERVOLMOVED, 
-                        "Warning: Moving volume %u to its home partition ignored!\n", afromvol);
     }
 
     pntg = 1;
@@ -1023,34 +1052,34 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
 
     VPRINT1("Starting transaction on source volume %u ...", afromvol);
     code = AFSVolTransCreate(fromconn, afromvol, afrompart, ITBusy, &fromtid);
-    ONERR (code, "Failed to create transaction on the volume %u\n", afromvol);
+    EGOTO1(mfail, code, "Failed to create transaction on the volume %u\n", afromvol);
     VDONE;
 
     /* Get a clone id */
     VPRINT1("Allocating new volume id for clone of volume %u ...", afromvol);
     newVol = 0;
     vcode = ubik_Call (VL_GetNewVolumeId, cstruct, 0, 1, &newVol);
-    ONERR (vcode, "Could not get an ID for the clone of volume %u from the VLDB\n", afromvol);
+    EGOTO1(mfail, vcode, "Could not get an ID for the clone of volume %u from the VLDB\n", afromvol);
     VDONE;
 
     /* Do the clone. Default flags on clone are set to delete on salvage and out of service */
     VPRINT1("Cloning source volume %u ...", afromvol);
     strcpy(vname, "move-clone-temp");
     code = AFSVolClone(fromconn, fromtid, 0,readonlyVolume, vname, &newVol);
-    ONERR (code, "Failed to clone the source volume %u\n", afromvol);
+    EGOTO1(mfail, code, "Failed to clone the source volume %u\n", afromvol);
     VDONE;
 
     /* lookup the name of the volume we just cloned */
     volid = afromvol;
     code = AFSVolGetName(fromconn, fromtid, &volName);
-    ONERR (code, "Failed to get the name of the volume %u\n", newVol);
+    EGOTO1(mfail, code, "Failed to get the name of the volume %u\n", newVol);
 
     VPRINT1("Ending the transaction on the source volume %u ...", afromvol);
     rcode = 0;
     code = AFSVolEndTrans(fromconn, fromtid, &rcode);
     fromtid = 0;
     if (!code) code = rcode;
-    ONERR (code, "Failed to end the transaction on the source volume %u\n", afromvol);
+    EGOTO1(mfail, code, "Failed to end the transaction on the source volume %u\n", afromvol);
     VDONE;
 
     /* ***
@@ -1059,18 +1088,18 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
 
     VPRINT1("Starting transaction on the cloned volume %u ...", newVol);
     code = AFSVolTransCreate (fromconn, newVol, afrompart, ITOffline, &clonetid);
-    ONERR (code, "Failed to start a transaction on the cloned volume%u\n", newVol);
+    EGOTO1(mfail, code, "Failed to start a transaction on the cloned volume%u\n", newVol);
     VDONE;
 
     VPRINT1("Setting flags on cloned volume %u ...", newVol);
     code = AFSVolSetFlags (fromconn, clonetid, VTDeleteOnSalvage|VTOutOfService); /*redundant */
-    ONERR (code, "Could not set falgs on the cloned volume %u\n", newVol);
+    EGOTO1(mfail, code, "Could not set falgs on the cloned volume %u\n", newVol);
     VDONE;
 
     /* remember time from which we've dumped the volume */
     VPRINT1("Getting status of cloned volume %u ...", newVol);
     code = AFSVolGetStatus (fromconn, clonetid, &tstatus);
-    ONERR (code, "Failed to get the status of the cloned volume %u\n", newVol);
+    EGOTO1(mfail, code, "Failed to get the status of the cloned volume %u\n", newVol);
     VDONE;
 
     fromDate = tstatus.creationDate-CLOCKSKEW;
@@ -1084,7 +1113,7 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     volumeInfo.volEntries_val = (volintInfo *)0;/*this hints the stub to allocate space*/
     volumeInfo.volEntries_len = 0;
     code = AFSVolListOneVolume(fromconn, afrompart, afromvol, &volumeInfo);
-    ONERR (code, "Failed to get the volint Info of the cloned volume %u\n", afromvol);
+    EGOTO1(mfail, code, "Failed to get the volint Info of the cloned volume %u\n", afromvol);
 
     infop = (volintInfo *) volumeInfo.volEntries_val;
     infop->maxquota = -1;                      /* Else it will replace the default quota */
@@ -1102,21 +1131,21 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
        */
         VPRINT1("Deleting pre-existing volume %u on destination ...", volid);
        code = AFSVolDeleteVolume(toconn, totid);
-       ONERR (code, "Could not delete the pre-existing volume %u on destination\n", volid);
+       EGOTO1(mfail, code, "Could not delete the pre-existing volume %u on destination\n", volid);
        VDONE;
        
        VPRINT1("Ending transaction on pre-existing volume %u on destination ...", volid);
        code = AFSVolEndTrans(toconn, totid, &rcode);
        totid = 0;
        if (!code) code = rcode;
-       ONERR (code, "Could not end the transaction on pre-existing volume %u on destination\n",
+       EGOTO1(mfail, code, "Could not end the transaction on pre-existing volume %u on destination\n",
               volid);
        VDONE;
     }
 
     VPRINT1("Creating the destination volume %u ...", volid);
     code = AFSVolCreateVolume (toconn, atopart, volName, volser_RW, volid, &volid, &totid);
-    ONERR (code, "Failed to create the destination volume %u\n", volid);
+    EGOTO1(mfail, code, "Failed to create the destination volume %u\n", volid);
     VDONE;
 
     strncpy(tmpName, volName, VOLSER_OLDMAXVOLNAME);
@@ -1125,7 +1154,7 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
 
     VPRINT1("Setting volume flags on destination volume %u ...", volid);
     code = AFSVolSetFlags (toconn, totid, (VTDeleteOnSalvage | VTOutOfService));
-    ONERR(code, "Failed to set the flags on the destination volume %u\n", volid);
+    EGOTO1(mfail, code, "Failed to set the flags on the destination volume %u\n", volid);
     VDONE;
 
     /***
@@ -1143,14 +1172,14 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     cookie.parent = entry.volumeId[RWVOL];
     cookie.clone  = 0;
     code = AFSVolForward(fromconn, clonetid, 0, &destination, totid, &cookie);
-    ONERR (code, "Failed to move data for the volume %u\n", volid);
+    EGOTO1(mfail, code, "Failed to move data for the volume %u\n", volid);
     VDONE;
 
     VPRINT1("Ending transaction on cloned volume %u ...", newVol);
     code = AFSVolEndTrans(fromconn, clonetid, &rcode);
     if (!code) code = rcode;
     clonetid = 0;
-    ONERR (code, "Failed to end the transaction on the cloned volume %u\n", newVol);
+    EGOTO1(mfail, code, "Failed to end the transaction on the cloned volume %u\n", newVol);
     VDONE;
 
     /* ***
@@ -1159,30 +1188,30 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
 
     VPRINT1("Starting transaction on source volume %u ...", afromvol);
     code = AFSVolTransCreate(fromconn, afromvol, afrompart, ITBusy, &fromtid);
-    ONERR (code, "Failed to create a transaction on the source volume %u\n", afromvol);
+    EGOTO1(mfail, code, "Failed to create a transaction on the source volume %u\n", afromvol);
     VDONE;
 
     /* now do the incremental */
     VPRINT1("Doing the incremental dump from source to destination for volume %u ... ", afromvol);
     code = AFSVolForward(fromconn, fromtid, fromDate, &destination, totid,&cookie);
-    ONERR (code, "Failed to do the incremental dump from rw volume on old site to rw volume on newsite\n", 0);
+    EGOTO(mfail, code, "Failed to do the incremental dump from rw volume on old site to rw volume on newsite\n");
     VDONE;
 
     /* now adjust the flags so that the new volume becomes official */
     VPRINT1("Setting volume flags on old source volume %u ...", afromvol);
     code = AFSVolSetFlags(fromconn, fromtid, VTOutOfService);
-    ONERR (code, "Failed to set the flags to make old source volume offline\n", 0);
+    EGOTO(mfail, code, "Failed to set the flags to make old source volume offline\n");
     VDONE;
 
     VPRINT1("Setting volume flags on new source volume %u ...", afromvol);
     code = AFSVolSetFlags(toconn, totid, 0);
-    ONERR (code, "Failed to set the flags to make new source volume online\n", 0);
+    EGOTO(mfail, code, "Failed to set the flags to make new source volume online\n");
     VDONE;
 
 #ifdef ENABLE_BUGFIX_1165
     VPRINT1("Setting volume status on destination volume %u ...", volid);
     code = AFSVolSetInfo(toconn, totid, infop);
-    ONERR (code, "Failed to set volume status on the destination volume %u\n", volid);
+    EGOTO1(mfail, code, "Failed to set volume status on the destination volume %u\n", volid);
     VDONE;
 #endif
 
@@ -1191,7 +1220,7 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     code = AFSVolEndTrans(toconn, totid, &rcode);
     totid = 0;
     if (!code) code = rcode;
-    ONERR (code, "Failed to end the transaction on the volume %u on the new site\n", afromvol);
+    EGOTO1(mfail, code, "Failed to end the transaction on the volume %u on the new site\n", afromvol);
     VDONE;
 
     Lp_SetRWValue(&entry, afromserver, afrompart, atoserver, atopart);
@@ -1270,20 +1299,20 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
         /* set forwarding pointer for moved volumes */
        VPRINT1("Setting forwarding pointer for volume %u ...", afromvol);
         code = AFSVolSetForwarding(fromconn, fromtid, atoserver);
-       ONERR (code, "Failed to set the forwarding pointer for the volume %u\n", afromvol);
+       EGOTO1(mfail, code, "Failed to set the forwarding pointer for the volume %u\n", afromvol);
        VDONE;
     }
 
     VPRINT1("Deleting old volume %u on source ...", afromvol);
     code = AFSVolDeleteVolume(fromconn,fromtid);       /* zap original volume */
-    ONERR (code, "Failed to delete the old volume %u on source\n", afromvol); 
+    EGOTO1(mfail, code, "Failed to delete the old volume %u on source\n", afromvol); 
     VDONE;
     
     VPRINT1("Ending transaction on old volume %u on the source ...", afromvol);
     code = AFSVolEndTrans(fromconn, fromtid, &rcode);
     fromtid = 0;
     if (!code) code = rcode;
-    ONERR (code, "Failed to end the transaction on the old volume %u on the source\n", afromvol);
+    EGOTO1(mfail, code, "Failed to end the transaction on the old volume %u on the source\n", afromvol);
     VDONE;
 
     /* Delete the backup volume on the original site */
@@ -1294,19 +1323,19 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     {
        VPRINT1("Setting flags on backup volume %u on source ...", backupId);
        code = AFSVolSetFlags(fromconn, fromtid, VTDeleteOnSalvage | VTOutOfService);
-       ONERR (code, "Failed to set the flags on the backup volume on source\n", 0);
+       EGOTO1(mfail, code, "Failed to set the flags on the backup volume %u on the source\n", backupId);
        VDONE;
 
        VPRINT1("Deleting the backup volume %u on the source ...", backupId);
        code = AFSVolDeleteVolume(fromconn,fromtid);
-       ONERR (code, "Failed to delete the backup volume on source\n", 0);
+       EGOTO1(mfail, code, "Failed to delete the backup volume %u on the source\n", backupId);
        VDONE;
        
        VPRINT1("Ending transaction on backup volume %u on source ...", backupId);
        code = AFSVolEndTrans(fromconn,fromtid, &rcode);
        fromtid = 0;
        if (!code) code = rcode;
-       ONERR (code, "Failed to end the transaction on the backup volume %u on source\n", 0);
+       EGOTO1(mfail, code, "Failed to end the transaction on the backup volume %u on the source\n", backupId);
        VDONE;
     }
     else code = 0;             /* no backup volume? that's okay */
@@ -1314,20 +1343,20 @@ UV_MoveVolume(afromvol, afromserver, afrompart, atoserver, atopart)
     fromtid = 0;
     VPRINT1("Starting transaction on the cloned volume %u ...", newVol);
     code = AFSVolTransCreate(fromconn, newVol, afrompart, ITOffline, &clonetid);
-    ONERR (code, "Failed to start a transaction on the cloned volume%u\n", newVol);
+    EGOTO1(mfail, code, "Failed to start a transaction on the cloned volume%u\n", newVol);
     VDONE;
     
     /* now delete the clone */
     VPRINT1("Deleting the cloned volume %u ...", newVol);
     code = AFSVolDeleteVolume(fromconn, clonetid);
-    ONERR (code, "Failed to delete the cloned volume %u\n", newVol);
+    EGOTO1(mfail, code, "Failed to delete the cloned volume %u\n", newVol);
     VDONE;
     
     VPRINT1("Ending transaction on cloned volume %u ...", newVol);
     code = AFSVolEndTrans(fromconn, clonetid, &rcode);
     if (!code) code = rcode;
     clonetid = 0;
-    ONERR (code, "Failed to end the transaction on the cloned volume %u\n", newVol);
+    EGOTO1(mfail, code, "Failed to end the transaction on the cloned volume %u\n", newVol);
     VDONE;
 
     /* fall through */
@@ -1746,9 +1775,7 @@ int UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
      * volume exists or not
      */
     if (backexists) {
-       if(verbose) 
-         fprintf(STDOUT,"Re-cloning backup volume %u ...", backupID);
-       fflush(STDOUT);
+       VPRINT1("Re-cloning backup volume %u ...", backupID);
 
        code = AFSVolReClone(aconn, ttid, backupID);
        if (code) {
@@ -1758,9 +1785,7 @@ int UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
        }
     }
     else {
-       if (verbose)
-         fprintf(STDOUT,"Creating a new backup clone %u ...", backupID);
-       fflush(STDOUT);
+       VPRINT1("Creating a new backup clone %u ...", backupID);
 
        strcpy(vname, entry.name);
        strcat(vname,".backup");
@@ -1811,8 +1836,7 @@ int UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_int32 avolid)
        goto bfail;
     }
 
-    if (verbose)
-       fprintf(STDOUT,"done\n");
+    VDONE;
 
     /* Will update the vldb below */
 
@@ -1944,7 +1968,7 @@ static int GetTrans (struct nvldbentry *vldbEntryPtr, afs_int32 index, struct rx
       }
       vldbEntryPtr->volumeId[ROVOL] = volid;
 
-      if (verbose) fprintf(STDOUT,"done.\n");
+      VDONE;
 
       /* The following is a bit redundant, since create sets these flags by default */
       code = AFSVolSetFlags(*connPtr, *transPtr, VTDeleteOnSalvage | VTOutOfService);
@@ -1958,11 +1982,8 @@ static int GetTrans (struct nvldbentry *vldbEntryPtr, afs_int32 index, struct rx
    * latest RO volume on the replication site 
    */
   else {
-      if (verbose) {
-         fprintf(STDOUT,"Updating existing ro volume %u on %s ...\n",
-                 volid, hostutil_GetNameByINet(vldbEntryPtr->serverNumber[index]));
-         fflush(STDOUT);
-      }
+      VPRINT2("Updating existing ro volume %u on %s ...\n",
+         volid, hostutil_GetNameByINet(vldbEntryPtr->serverNumber[index]));
 
       code  = AFSVolGetStatus(*connPtr, *transPtr, &tstatus);
       if (code) {
@@ -2159,48 +2180,56 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
 
      /* Clone or reclone the volume */
      if (roexists) {
-       if (verbose)
-          fprintf(STDERR, "Recloning RW volume ...\n");
-
+       VPRINT1("Recloning RW volume %u...", cloneVolId);
        code = AFSVolReClone(fromconn, clonetid, cloneVolId);
        ONERROR(code, afromvol, "Failed to reclone the RW volume %u\n");
+       VDONE;
      } else {
        if (roclone) {
           strcpy(vname, entry.name);
           strcat(vname, ".readonly");
-          if (verbose)
-            fprintf(STDERR, "Cloning RW volume ...\n");
+          VPRINT("Cloning RW volume %u to permanent RO...");
        } else {
           strcpy(vname, "readonly-clone-temp");
-          if (verbose)
-            fprintf(STDERR, "Cloning RW volume to temporary RO ...\n");
+          VPRINT("Cloning RW volume %u to temporary RO...");
        }
        code = AFSVolClone(fromconn, clonetid, 0, readonlyVolume, vname, &cloneVolId);
        ONERROR(code, afromvol, "Failed to clone the RW volume %u\n");
+       VDONE;
      }
 
      /* Get the time the RW was created for future information */
+     VPRINT1("Getting status of RW volume %u...", cloneVolId);
      code = AFSVolGetStatus(fromconn, clonetid, &volstatus);
      ONERROR(code, cloneVolId, "Failed to get the status of the RW volume %u\n");
+     VDONE;
      rwcrdate = volstatus.creationDate;
 
      /* End the transaction on the RW volume */
+     VPRINT1("Ending cloning transaction on RW volume %u...", cloneVolId);
      code = AFSVolEndTrans(fromconn, clonetid, &rcode);
      clonetid = 0;
      ONERROR((code?code:rcode), cloneVolId, "Failed to end cloning transaction on RW %u\n");
+     VDONE;
 
      /* Remember clone volume ID in case we fail or are interrupted */
      entry.cloneId = cloneVolId;
 
      if (roclone) {
        /* Bring the RO clone online - though not if it's a temporary clone */
+       VPRINT1("Starting transaction on RO clone volume %u...", cloneVolId);
        code = AFSVolTransCreate(fromconn, cloneVolId, afrompart, ITOffline, &onlinetid);
        ONERROR(code, cloneVolId, "Failed to start transaction on volume %u\n");
+       VDONE;
 
+       VPRINT1("Setting volume flags for volume %u...", cloneVolId);
        tcode = AFSVolSetFlags(fromconn, onlinetid, 0);
+       VDONE;
 
+       VPRINT1("Ending transaction on volume %u...", cloneVolId);
        code = AFSVolEndTrans(fromconn, onlinetid, &rcode);
        ONERROR((code?code:rcode), cloneVolId, "Failed to end transaction on RO clone %u\n");
+       VDONE;
 
        ONERROR(tcode, cloneVolId, "Could not bring volume %u on line\n");
 
@@ -2226,8 +2255,10 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
         * temporarily unavailable.
         */
        MapNetworkToHost(&entry, &storeEntry);
+       VPRINT1("Replacing VLDB entry for %s...", entry.name);
        vcode = VLDB_ReplaceEntry(afromvol, RWVOL, &storeEntry, 0);
        ONERROR(vcode, entry.name, "Could not update vldb entry for %s.\n");
+       VDONE;
      }
   }  
 
@@ -2261,10 +2292,12 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
   memset(results.manyResults_val, 0, (sizeof(afs_int32)*nservers+1));
 
   /* Create a transaction on the cloned volume */
+  VPRINT1("Starting transaction on cloned volume %u...", cloneVolId);
   code = AFSVolTransCreate(fromconn, cloneVolId, afrompart, ITBusy, &fromtid);
   if (!fullrelease && code)
      ONERROR(VOLSERNOVOL, afromvol,"Old clone is inaccessible. Try vos release -f %u.\n");
   ONERROR(code, 0, "Failed to create transaction on the release clone\n");
+  VDONE;
 
   /* For each index in the VLDB */
   for (vldbindex=0; vldbindex<entry.nServers; ) {
@@ -2472,8 +2505,7 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
       }
       code = DelVol (fromconn, cloneVolId, afrompart, ITOffline);
       ONERROR (code, cloneVolId, "Failed to delete volume %u.\n");
-      if (verbose)
-        fprintf(STDOUT," done\n");
+      VDONE;
   }
   entry.cloneId = 0;
 
@@ -2481,16 +2513,13 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
      entry.serverFlags[i] &= ~NEW_REPSITE;
 
   /* Update the VLDB */
-  if (verbose) {
-      fprintf(STDOUT,"updating VLDB ...");
-      fflush(STDOUT);
-  }
+  VPRINT("updating VLDB ...");
+
   MapNetworkToHost(&entry, &storeEntry);
   vcode = VLDB_ReplaceEntry(afromvol, RWVOL, &storeEntry,
                           LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP);
   ONERROR(vcode, afromvol, " Could not update VLDB entry for volume %u\n");
-  if (verbose)
-     fprintf(STDOUT," done\n");
+  VDONE;
 
  rfail:
   if (clonetid) {
@@ -2545,7 +2574,7 @@ int UV_ReleaseVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afromp
 }
 
 
-void dump_sig_handler(x)
+void dump_sig_handler(int x)
 {
    fprintf(STDERR,"\nSignal handler: vos dump operation\n");
    longjmp(env,0);
@@ -2573,33 +2602,24 @@ int UV_DumpVolume(afs_int32 afromvol, afs_int32 afromserver, afs_int32 afrompart
    /* get connections to the servers */
    fromconn = UV_Bind(afromserver, AFSCONF_VOLUMEPORT);
    code = AFSVolTransCreate(fromconn, afromvol, afrompart, ITBusy, &fromtid);
-   if (code) {
-      fprintf(STDERR,"Could not start transaction on the volume %u to be dumped\n", afromvol);
-      ERROR_EXIT(code);
-   }
+   EGOTO1(error_exit, code, "Could not start transaction on the volume %u to be dumped\n", afromvol);
 
-   if (verbose) {
-      if (!fromdate)
-       fprintf(STDERR,"Full Dump ...");
-      else 
-       fprintf(STDERR,"Incremental Dump (as of %.24s) ...",
+  if (!fromdate)
+{      VPRINT("Full Dump ..."); }
+  else 
+{
+       VPRINT1("Incremental Dump (as of %.24s) ...",
                ctime((time_t *)&fromdate));
-      fflush(STDERR);
-   }
+}
 
    fromcall = rx_NewCall(fromconn);
    code = StartAFSVolDump(fromcall, fromtid, fromdate);
-   if (code) {
-      fprintf(STDERR,"Could not start the dump process \n");
-      ERROR_EXIT(code);
-   }
-   if (code = DumpFunction(fromcall, rock)) {
-      fprintf(STDERR,"Error while dumping volume \n");
-      ERROR_EXIT(code);
-   }
+   EGOTO(error_exit, code, "Could not start the dump process \n");
 
-   if (verbose)
-      fprintf(STDERR,"completed\n");
+   code = DumpFunction(fromcall, rock);
+   EGOTO(error_exit, code, "Error while dumping volume \n");
+
+   VPRINT("completed\n");
 
  error_exit: 
    if (fromcall) {
@@ -2700,9 +2720,7 @@ int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid,
     }/* at this point we have a volume id to use/reuse for the volume to be restored */
 
     if(strlen(tovolname) > (VOLSER_OLDMAXVOLNAME - 1)) {
-       fprintf(STDERR,"The volume name %s exceeds the maximum limit of (VOLSER_OLDMAXVOLNAME -1 ) bytes\n",tovolname);
-       error = VOLSERBADOP;
-       goto refail;
+       EGOTO1(refail, VOLSERBADOP, "The volume name %s exceeds the maximum limit of (VOLSER_OLDMAXVOLNAME -1 ) bytes\n",tovolname);
     }
     MapPartIdIntoName(topart, partName);
     fprintf(STDOUT,"Restoring volume %s Id %u on server %s partition %s ..", tovolname,
@@ -2711,51 +2729,30 @@ int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid,
     code = AFSVolCreateVolume(toconn, topart, tovolname, volsertype, 0,&pvolid, &totid);
     if (code){
        if (flags & RV_FULLRST) { /* full restore: delete then create anew */
-           if(verbose) {
-               fprintf(STDOUT,"Deleting the previous volume %u ...",pvolid);
-               fflush(STDOUT);
-           }
+           VPRINT1("Deleting the previous volume %u ...",pvolid);
+
            code = AFSVolTransCreate(toconn, pvolid, topart, ITOffline, &totid);
-           if (code) {
-               fprintf(STDERR,"Failed to start transaction on %u\n",pvolid);
-               error = code;
-               goto refail;
-           }
+           EGOTO1(refail, code, "Failed to start transaction on %u\n",pvolid);
+
            code = AFSVolSetFlags(toconn, totid, VTDeleteOnSalvage | VTOutOfService);
-           if (code){
-               fprintf(STDERR,"Could not set flags on volume %u \n",pvolid);
-               error = code;
-               goto refail;
-           }
+           EGOTO1(refail, code, "Could not set flags on volume %u \n",pvolid);
+
            code = AFSVolDeleteVolume(toconn,totid);
-           if (code){
-               fprintf(STDERR,"Could not delete volume %u\n",pvolid); 
-               error = code;
-               goto refail;
-           }
+           EGOTO1(refail, code, "Could not delete volume %u\n",pvolid); 
+
            code = AFSVolEndTrans(toconn, totid, &rcode);
            totid = 0;
            if (!code) code = rcode;
-           if (code) {
-               fprintf(STDERR,"Could not end transaction on %u\n",pvolid);
-               error = code;
-               goto refail;
-           }
-           if (verbose) fprintf(STDOUT," done\n");
+           EGOTO1(refail, code, "Could not end transaction on %u\n",pvolid);
+
+           VDONE;
+
            code = AFSVolCreateVolume(toconn, topart, tovolname, volsertype, 0,&pvolid, &totid);
-           if (code){
-               fprintf(STDERR,"Could not create new volume %u\n",pvolid);
-               error = code;
-               goto refail;}
+           EGOTO1(refail, code, "Could not create new volume %u\n",pvolid);
        }
        else{
-           
            code = AFSVolTransCreate(toconn, pvolid, topart, ITOffline, &totid);
-           if (code) {
-               fprintf(STDERR,"Failed to start transaction on %u\n",pvolid);
-               error = code;
-               goto refail;
-           }
+           EGOTO1(refail, code, "Failed to start transaction on %u\n",pvolid);
        }
     }
     cookie.parent = pvolid;
@@ -2837,7 +2834,7 @@ int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid,
        if (!vcode) MapHostToNetwork(&entry);
        if(vcode == VL_NOENT) { /* it doesnot exist already */
            /*make the vldb return this indication specifically*/
-           if (verbose) fprintf(STDOUT,"------- Creating a new VLDB entry ------- \n");
+           VPRINT("------- Creating a new VLDB entry ------- \n");
            strcpy(entry.name, tovolname);
            entry.nServers = 1;
            entry.serverNumber[0] = toserver;/*should be indirect */
@@ -2902,19 +2899,15 @@ int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid,
                * if its different from new site.
                */
               same = VLDB_IsSameAddrs(toserver, entry.serverNumber[index], &errcode);
-              if (errcode) {
-                 fprintf(STDERR,"Failed to get info about server's %d address(es) from vlserver (err=%d)\n", 
+              EPRINT2(errcode, "Failed to get info about server's %d address(es) from vlserver (err=%d)\n", 
                          toserver, errcode);
-              }
               if ( (!errcode && !same) || (entry.serverPartition[index] != topart) ) {
                  tempconn = UV_Bind(entry.serverNumber[index], AFSCONF_VOLUMEPORT);
-                 if (verbose) {
-                    MapPartIdIntoName(entry.serverPartition[index], apartName);
-                    fprintf(STDOUT,"Deleting the previous volume %u on server %s, partition %s ...",
+                 
+                 MapPartIdIntoName(entry.serverPartition[index], apartName);
+                 VPRINT3("Deleting the previous volume %u on server %s, partition %s ...",
                             pvolid,
                             hostutil_GetNameByINet(entry.serverNumber[index]), apartName);
-                    fflush(STDOUT);
-                 }
                  code = AFSVolTransCreate(tempconn, pvolid, entry.serverPartition[index], ITOffline, &temptid);
                  if (!code){
                     code = AFSVolSetFlags(tempconn, temptid, VTDeleteOnSalvage | VTOutOfService);
@@ -2937,7 +2930,7 @@ int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_int32 tovolid,
                        error = code;
                        goto refail;
                     }
-                    if(verbose) fprintf(STDOUT," done\n");
+                    VDONE;
                     MapPartIdIntoName(entry.serverPartition[index],partName);
                  }
               }
@@ -3001,14 +2994,14 @@ int UV_LockRelease(afs_int32 volid)
        
     afs_int32 vcode;
 
-    if (verbose) fprintf(STDERR,"Binding to the VLDB server\n");
+    VPRINT("Binding to the VLDB server\n");
     vcode = ubik_Call(VL_ReleaseLock,cstruct, 0,volid,-1,LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP );
     if(vcode) {
        fprintf(STDERR,"Could not unlock the entry for volume number %u in VLDB \n",volid);
        PrintError("",vcode);
        return (vcode);
     }
-    if (verbose) fprintf(STDERR,"VLDB updated\n");
+    VPRINT("VLDB updated\n");
     return 0;
 
 }
@@ -3074,8 +3067,7 @@ int UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid)
        goto asfail;
     }
 
-    if (verbose) fprintf(STDOUT,"Adding a new site ...");
-    fflush(STDOUT);
+    VPRINT("Adding a new site ...");
     entry.serverNumber[entry.nServers] = server;
     entry.serverPartition[entry.nServers] = part;
     entry.serverFlags[entry.nServers] = (ITSROVOL | RO_DONTUSE);
@@ -3088,7 +3080,7 @@ int UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid)
        goto asfail;
     }
     islocked = 0;
-    if (verbose) fprintf(STDOUT," done\n");
+    VDONE;
 
   asfail:
     if (islocked) {
@@ -3142,7 +3134,7 @@ int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_int32 volid)
        if((entry.nServers == 1) && (entry.flags & RW_EXISTS))
            entry.flags &= ~RO_EXISTS;
        if(entry.nServers < 1) { /*this is the last ref */
-           if(verbose) fprintf(STDOUT,"Deleting the VLDB entry for %u ...",volid);
+           VPRINT1("Deleting the VLDB entry for %u ...",volid);
            fflush(STDOUT);
            vcode = ubik_Call(VL_DeleteEntry,cstruct, 0,volid, ROVOL);
            if(vcode) {
@@ -3150,7 +3142,7 @@ int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_int32 volid)
                PrintError("",vcode);
                return(vcode);
            }
-           if (verbose) fprintf(STDOUT," done\n");
+           VDONE;
        }
        MapNetworkToHost(&entry,&storeEntry);
        fprintf(STDOUT,"Deleting the replication site for volume %u ...",volid);
@@ -3162,7 +3154,7 @@ int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_int32 volid)
            ubik_Call(VL_ReleaseLock,cstruct, 0, volid, RWVOL, LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP);
            return(vcode);
        }
-       if(verbose) fprintf(STDOUT," done\n");
+       VDONE;
     }
     return 0;
 }
@@ -3210,7 +3202,7 @@ int UV_ChangeLocation(afs_int32 server, afs_int32 part, afs_int32 volid)
            ubik_Call(VL_ReleaseLock,cstruct, 0, volid, RWVOL, LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP);
            return(vcode);
        }
-       if(verbose) fprintf(STDOUT," done\n");
+       VDONE;
     }
     return 0;
 }
@@ -3298,7 +3290,7 @@ int UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart, struct volDescription
            }
            if(success) curPtr->volFlags |= CLONEZAPPED;
            if(!success) fprintf(STDERR,"Could not zap volume %u\n",curPtr->volCloneId);
-           if(success && verbose) fprintf(STDOUT,"Clone of %s %u deleted\n", curPtr->volName,curPtr->volCloneId);
+           if(success) VPRINT2("Clone of %s %u deleted\n", curPtr->volName,curPtr->volCloneId);
            curPos++;
            tid = 0;
        }
@@ -3341,7 +3333,7 @@ int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart, struct volDescri
            curPtr->volFlags |= CLONEVALID; 
            /*make a clone of curParentId and record as curPtr->volCloneId */
            code = AFSVolTransCreate(aconn, curPtr->volId, apart, ITOffline, &tid);
-           if(verbose && code) fprintf(STDERR,"Clone for volume %s %u failed \n",curPtr->volName,curPtr->volId);
+           if(code) VPRINT2("Clone for volume %s %u failed \n",curPtr->volName,curPtr->volId);
            if(code) {
                curPtr->volFlags &= ~CLONEVALID; /*cant clone */
                curPos++;
@@ -3367,7 +3359,7 @@ int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart, struct volDescri
                        fprintf(STDERR,"WARNING: could not end transaction\n");
                continue;
            }
-           if(verbose) fprintf(STDOUT,"********** Cloned %s temporary %u\n",cloneName,curPtr->volCloneId);
+           VPRINT2("********** Cloned %s temporary %u\n",cloneName,curPtr->volCloneId);
            code = AFSVolEndTrans(aconn, tid, &rcode);
            if(code || rcode) {
                curPtr->volFlags &= ~CLONEVALID; 
@@ -3963,9 +3955,7 @@ static afs_int32 CheckVolume(volintInfo *volumeinfo, afs_int32 aserver, afs_int3
    }
 
  error_exit:
-   if (verbose) {
-      fprintf(STDOUT,"\n_______________________________\n");
-   }
+   VPRINT("\n_______________________________\n");
    return(error);
 }
 
@@ -4076,7 +4066,7 @@ int UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname, int flags)
        aconn = UV_Bind(aserver,AFSCONF_VOLUMEPORT);
 
        /* If a volume ID were given, search for it on each partition */
-       if (volumeid = atol(avolname)) {
+       if ((volumeid = atol(avolname))) {
          for (j=0; j<pcnt; j++) {
             code = AFSVolListOneVolume(aconn, PartList.partId[j], volumeid, &volumeInfo);
             if (code) {
@@ -4226,11 +4216,8 @@ int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags, int force)
        pcnt = 1;
     }
 
-    if (verbose) {
-       fprintf(STDOUT,"Processing volume entries ...\n");
-       fflush(STDOUT);
-    }
-
+    VPRINT("Processing volume entries ...\n");
+ 
     /* Step through the array of partitions */
     for (i = 0; i < pcnt; i++) {
        apart = PartList.partId[i];
@@ -4292,10 +4279,8 @@ int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags, int force)
 
     }/* thru all partitions */
 
-    if (verbose) {
-       fprintf(STDOUT, "Total entries: %u, Failed to process %d, Changed %d\n",
+    VPRINT3("Total entries: %u, Failed to process %d, Changed %d\n",
               tentries, failures, modifications);
-    }
 
   error_exit:
     /* Now check if the maxvolid is larger than that stored in the VLDB */
@@ -4615,9 +4600,7 @@ afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 *modified)
    }
 
  error_exit:
-   if (verbose) {
-      fprintf(STDOUT,"\n_______________________________\n");
-   }
+   VPRINT("\n_______________________________\n");
 
    if (islocked) {
       code = ubik_Call(VL_ReleaseLock, cstruct, 0, entry->volumeId[RWVOL], RWVOL,
@@ -4655,10 +4638,7 @@ int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags, int force)
        attributes.Mask      |= VLLIST_PARTITION;
     }
 
-    if (verbose) {
-       fprintf(STDOUT,"Processing VLDB entries ...\n");
-       fflush(STDOUT);
-    }
+    VPRINT("Processing VLDB entries ...\n");
 
     /* While we need to collect more VLDB entries */
     for (si=0; si != -1; si=nsi) {
@@ -4681,10 +4661,7 @@ int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags, int force)
          vlentry = &arrayEntries.nbulkentries_val[j];
          MapHostToNetwork(vlentry);
 
-         if (verbose) {
-            fprintf(STDOUT,"Processing VLDB entry %d ...\n", j+1);
-            fflush(STDOUT);
-         }
+         VPRINT1("Processing VLDB entry %d ...\n", j+1);
 
          code = CheckVldb(vlentry, &modified);
          if (code) {
@@ -4711,10 +4688,8 @@ int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags, int force)
        }
     }
 
-    if (verbose) {
-       fprintf(STDOUT,"Total entries: %u, Failed to process %d, Changed %d\n",
+    VPRINT3("Total entries: %u, Failed to process %d, Changed %d\n",
               tentries, failures, modifications);
-    }
 
   error_exit:    
     if (aconn)
@@ -4761,7 +4736,7 @@ int UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[])
        error = vcode;
        goto rvfail;
     }
-    if(verbose) fprintf(STDOUT,"Recorded the new name %s in VLDB\n",newname);
+    VPRINT1("Recorded the new name %s in VLDB\n",newname);
     /*at this stage the intent to rename is recorded in the vldb, as far as the vldb 
       is concerned, oldname is lost */
     if(entry->flags & RW_EXISTS) {
@@ -4783,7 +4758,7 @@ int UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[])
 
            code = AFSVolSetIdsTypes(aconn, tid, newname,RWVOL, entry->volumeId[RWVOL],entry->volumeId[ROVOL],entry->volumeId[BACKVOL]);
            if(!code) {
-               if(verbose) printf("Renamed rw volume %s to %s\n",oldname,newname);
+               VPRINT2("Renamed rw volume %s to %s\n",oldname,newname);
                code = AFSVolEndTrans(aconn, tid, &rcode);
                tid = 0;
                if(code) {
@@ -4828,7 +4803,7 @@ int UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[])
 
            code = AFSVolSetIdsTypes(aconn, tid,nameBuffer ,BACKVOL, entry->volumeId[RWVOL],0,0);
            if(!code) {
-               if(verbose) fprintf(STDOUT,"Renamed backup volume to %s \n",nameBuffer);
+               VPRINT1("Renamed backup volume to %s \n",nameBuffer);
                code = AFSVolEndTrans(aconn, tid, &rcode);
                tid = 0;
                if(code) {
@@ -4866,7 +4841,7 @@ int UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[])
                    }
                    code = AFSVolSetIdsTypes(aconn, tid, nameBuffer,ROVOL, entry->volumeId[RWVOL],0,0);
                    if(!code) {
-                       if(verbose) fprintf(STDOUT,"Renamed RO volume %s on host %s\n",
+                       VPRINT2("Renamed RO volume %s on host %s\n",
                                            nameBuffer,
                                            hostutil_GetNameByINet(entry->serverNumber[i]));
                        code = AFSVolEndTrans(aconn, tid, &rcode);