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 ac9ac41..209e5cf 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 55fd5f2..a91dee4 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 0b740e6..f9fa0fa 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 5829c55..dfce048 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 4708ac0..12416ec 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 06bd7db..f898f40 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 4892e51..a9f3fa6 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 1b045b5..44c383b 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 55ac68b..bb3b99e 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 1f225cf..d43632e 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 af976a0..9b90425 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 ac1770f..edf3075 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 6cf80f7..8a9cc0a 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 2a548a6..fa13143 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 40116ed..f3ff494 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 8bf01bd..cba32dd 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 1a69d82..b595077 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 7a90e4c..c106f8f 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 823dd1a..67ab99b 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 c0f881c..666b6e0 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 c5656e0..de87135 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 f5a6086..70792bb 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 47334d2..bd020ed 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 b016a76..2ba492f 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 77001be..d39aeb6 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 6fd4e6b..970895e 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 e7fcdc7..6035f9f 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 f90b598..0e452a1 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 ffc48cc..4063b6c 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 ffc7bca..f6a8b92 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 d1baa19..d874ee1 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 8e666b6..86016c6 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 e55c535..1c70217 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 0942af3..262bf5f 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 8e5a8ab..a073b92 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 1b8fbd9..97551ea 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 60a3f9b..25889f4 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 bbf1acc..9eaf227 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 ff2b5d2..8cc84c8 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 f6204e7..2bdbfd8 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 790c45a..accd3de 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 49ac594..f0c8046 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 8a4066a..a549fa8 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 60853ae..bf144a5 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 55c5354..b3c7a9e 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 22394bf..022c644 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 9a666b1..36377bf 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 4510e3b..11aa3f7 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 cafe4b5..049d508 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 ac4bddf..9542c53 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 97518a1..4b773f3 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 c7abfe3..3e176f4 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 300308c..b1efb1e 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 560e26e..7080661 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 12bfbfa..3674baf 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 3c1b2fd..2f922c5 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 ca6c417..3d44051 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 50f6df2..51e4be7 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 431844b..1f8d1a4 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 a362a78..087a49d 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 614df2b..cbb16ec 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 e031bd4..ad7a080 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 200c4e6..6625a6a 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 1b5d5d8..b952a62 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 bafcbd7..0a5cbc2 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 b3e7cd2..e51a5fa 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 3ac172e..a85448d 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 1479ca1..d159c89 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 e0e1693..e278495 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 26ac359..0c15dcb 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 99112c4..972aac8 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 317cb7e..a465faa 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 185d793..da66dc5 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 77f4d64..c512413 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 2e77da0..2b1020a 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 1064a1a..8c48c79 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 a22ff85..6948109 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 752879a..ff9d3a8 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 275c82a..8a10084 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 badb165..23bb5f0 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 2df465b..3b4f4e6 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 86b2518..048d4e3 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 159373c..4fc5dfe 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 5ea0c59..5505f10 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 cb7af81..4db6cf4 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 73a907e..d8a214b 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 cc8b111..2f379c2 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 63d3cbd..9763ab0 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 ec40b53..049475d 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 292bf08..71a641b 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 e6d9595..b4a5246 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 ee3a863..db1fcdc 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 2bdcefc..960a646 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 348c929..aaee487 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 06a8a27..69fcd33 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 be797a8..c78dbd8 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 e3e90a3..6064e34 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 a5fd19e..a3f2a63 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 d366c40..74d1878 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 bbec38f..2d84703 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 f53ecb1..d240a0e 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 5ecde68..ff779de 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 93612d4..2fcf8ce 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 4f01069..cb2c55f 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 c50bfb2..4cd97de 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 661e6da..135a996 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 9d2bb28..942c2a2 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 17d22b1..f5b2a64 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 2580aae..4f4cbc9 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 bd3321b..8e014b0 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 ff9463b..b2d029b 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 105d65a..c27f242 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 150bf2b..23083c6 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 dad53c5..7dbb475 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 5c5c33f..39a1309 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 4b3c2dc..4285fc4 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 62e32b5..33c0147 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 76e92dc..8f2ee0e 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 1059a01..b272039 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 f476246..e06751b 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 43a8cc7..a913e2e 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 d2d7bee..c930593 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 892a63d..8cc5697 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 68e184c..49fc81b 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 fbf7650..8b35c52 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 7d8da93..9e666fa 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 022640b..1a8d709 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 8981c2c..b010432 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 2748141..a2ce0b3 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 feabd4e..ac36540 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 f9d36a9..01f3980 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 c311a7f..37c407d 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 5303825..9fcc118 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 4ee71a0..736c777 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 38bbd9d..2065755 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 025470b..423d2fb 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 8bfdcb5..69098cc 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 9f0c39c..c14dd46 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 5a2ceca..57c9dfd 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 8c1f978..f34d5eb 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 10ba950..a71e7df 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 591a6a8..7398ea8 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 c23e95c..8f72c5f 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 cea8927..d456bda 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 798d01a..1145109 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 d5fb0aa..ef21a4d 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 559576a..1286028 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 5c22421..98bb633 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 1806ad9..41a9b03 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 b5f796e..f5080e8 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 902be1e..715b8ac 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 d12a44b..7a223cc 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 8a0e21f..1faab62 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 a33d563..a630434 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 51dde9c..6bd69e8 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 aac3417..848995c 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 b55ce93..b16cde4 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 ade7c3c..8caf9d5 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 a462ad9..f532e45 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 817bbfa..763d97a 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 b304e5a..ef3d3a7 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 cc952dd..caefafa 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 d85e3dc..60b59e3 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 828237b..c661998 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 bc845b8..9b8e1c1 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 1270ee9..d20b61a 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 053d35f..5f39e4c 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 c449095..d236717 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 3b0ec83..5f39e4c 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 01b16de..e83730a 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 7aa8d0a..5f39e4c 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 252d68f..a35dbe5 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 e1d1667..5f39e4c 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 2bf32a9..9d2845d 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 3795484..5f39e4c 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 40e8777..9f5ba10 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 be39420..5f39e4c 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 a0b35ec..3890a4c 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 51f3ace..5f39e4c 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 0a69d60..88e1b22 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 fdcc12c..5f39e4c 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