]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
convert-all-makefiles-to-makefile-ins-20010802
authorNathan Neulinger <nneul@umr.edu>
Thu, 2 Aug 2001 16:45:35 +0000 (16:45 +0000)
committerDerrick Brashear <shadow@dementia.org>
Thu, 2 Aug 2001 16:45:35 +0000 (16:45 +0000)
all relevant variables become subst'd and not passed in the environment

258 files changed:
Makefile.in
configure.in
src/afs/Makefile [deleted file]
src/afs/Makefile.in [new file with mode: 0644]
src/afsd/Makefile [deleted file]
src/afsd/Makefile.in [new file with mode: 0644]
src/afsmonitor/Makefile [deleted file]
src/afsmonitor/Makefile.in [new file with mode: 0644]
src/afsweb/Makefile [deleted file]
src/afsweb/Makefile.in [new file with mode: 0644]
src/audit/Makefile [deleted file]
src/audit/Makefile.in [new file with mode: 0644]
src/auth/Makefile [deleted file]
src/auth/Makefile.in [new file with mode: 0644]
src/auth/test/Makefile [deleted file]
src/auth/test/Makefile.in [new file with mode: 0644]
src/bozo/Makefile [deleted file]
src/bozo/Makefile.in [new file with mode: 0644]
src/bozo/test/Makefile [deleted file]
src/bozo/test/Makefile.in [new file with mode: 0644]
src/bu_utils/Makefile [deleted file]
src/bu_utils/Makefile.in [new file with mode: 0644]
src/bubasics/Makefile [deleted file]
src/bubasics/Makefile.in [new file with mode: 0644]
src/bucoord/Makefile [deleted file]
src/bucoord/Makefile.in [new file with mode: 0644]
src/budb/Makefile [deleted file]
src/budb/Makefile.in [new file with mode: 0644]
src/butc/Makefile [deleted file]
src/butc/Makefile.in [new file with mode: 0644]
src/butm/Makefile [deleted file]
src/butm/Makefile.in [new file with mode: 0644]
src/cmd/Makefile [deleted file]
src/cmd/Makefile.in [new file with mode: 0644]
src/cmd/test/Makefile [deleted file]
src/cmd/test/Makefile.in [new file with mode: 0644]
src/comerr/Makefile [deleted file]
src/comerr/Makefile.in [new file with mode: 0644]
src/comerr/test/Makefile [deleted file]
src/comerr/test/Makefile.in [new file with mode: 0644]
src/config/Makefile [deleted file]
src/config/Makefile.alpha_dux40.in
src/config/Makefile.alpha_dux50.in
src/config/Makefile.alpha_linux_22.in
src/config/Makefile.hp_ux102.in
src/config/Makefile.hp_ux110.in
src/config/Makefile.i386_djgpp
src/config/Makefile.i386_fbsd_42.in
src/config/Makefile.i386_linux22.in
src/config/Makefile.i386_linux24.in
src/config/Makefile.in [new file with mode: 0644]
src/config/Makefile.ppc_darwin_12.in
src/config/Makefile.ppc_darwin_13.in
src/config/Makefile.ppc_linux22.in
src/config/Makefile.ppc_linux24.in
src/config/Makefile.rs_aix42.in
src/config/Makefile.s390_linux22.in
src/config/Makefile.s390_linux24.in
src/config/Makefile.sgi_62.in
src/config/Makefile.sgi_63.in
src/config/Makefile.sgi_64.in
src/config/Makefile.sgi_65.in
src/config/Makefile.sparc64_linux22.in
src/config/Makefile.sparc64_linux24.in
src/config/Makefile.sparc_linux22.in
src/config/Makefile.sun4x_55.in
src/config/Makefile.sun4x_56.in
src/config/Makefile.sun4x_57.in
src/config/Makefile.sun4x_58.in
src/config/Makefile.sunx86_54.in
src/dauth/Makefile [deleted file]
src/dauth/Makefile.in [new file with mode: 0644]
src/des/Makefile [deleted file]
src/des/Makefile.in [new file with mode: 0644]
src/des/test/Makefile [deleted file]
src/des/test/Makefile.in [new file with mode: 0644]
src/des_stub/Makefile [deleted file]
src/des_stub/Makefile.in [new file with mode: 0644]
src/dir/Makefile [deleted file]
src/dir/Makefile.in [new file with mode: 0644]
src/dir/test/Makefile [deleted file]
src/dir/test/Makefile.in [new file with mode: 0644]
src/export/Makefile [deleted file]
src/export/Makefile.in [new file with mode: 0644]
src/finale/Makefile [deleted file]
src/finale/Makefile.in [new file with mode: 0644]
src/fsint/Makefile [deleted file]
src/fsint/Makefile.in [new file with mode: 0644]
src/fsprobe/Makefile [deleted file]
src/fsprobe/Makefile.in [new file with mode: 0644]
src/ftpd43+/Makefile [deleted file]
src/ftpd43+/Makefile.in [new file with mode: 0644]
src/gtx/Makefile [deleted file]
src/gtx/Makefile.in [new file with mode: 0644]
src/inetd/Makefile [deleted file]
src/inetd/Makefile.in [new file with mode: 0644]
src/kauth/Makefile [deleted file]
src/kauth/Makefile.in [new file with mode: 0644]
src/kauth/test/Makefile [deleted file]
src/kauth/test/Makefile.in [new file with mode: 0644]
src/libacl/Makefile [deleted file]
src/libacl/Makefile.in [new file with mode: 0644]
src/libacl/test/Makefile [deleted file]
src/libacl/test/Makefile.in [new file with mode: 0644]
src/libadmin/Makefile [deleted file]
src/libadmin/Makefile.in [new file with mode: 0644]
src/libadmin/adminutil/Makefile [deleted file]
src/libadmin/adminutil/Makefile.in [new file with mode: 0644]
src/libadmin/bos/Makefile [deleted file]
src/libadmin/bos/Makefile.in [new file with mode: 0644]
src/libadmin/cfg/Makefile [deleted file]
src/libadmin/cfg/Makefile.in [new file with mode: 0644]
src/libadmin/cfg/test/Makefile [deleted file]
src/libadmin/cfg/test/Makefile.in [new file with mode: 0644]
src/libadmin/client/Makefile [deleted file]
src/libadmin/client/Makefile.in [new file with mode: 0644]
src/libadmin/kas/Makefile [deleted file]
src/libadmin/kas/Makefile.in [new file with mode: 0644]
src/libadmin/pts/Makefile [deleted file]
src/libadmin/pts/Makefile.in [new file with mode: 0644]
src/libadmin/samples/Makefile [deleted file]
src/libadmin/samples/Makefile.in [new file with mode: 0644]
src/libadmin/test/Makefile [deleted file]
src/libadmin/test/Makefile.in [new file with mode: 0644]
src/libadmin/vos/Makefile [deleted file]
src/libadmin/vos/Makefile.in [new file with mode: 0644]
src/libafs/Makefile.common
src/libafs/MakefileProto.AIX.in
src/libafs/MakefileProto.DARWIN.in
src/libafs/MakefileProto.DUX.in
src/libafs/MakefileProto.FBSD.in
src/libafs/MakefileProto.HPUX.in
src/libafs/MakefileProto.IRIX.in
src/libafs/MakefileProto.LINUX.in
src/libafs/MakefileProto.SOLARIS.in
src/libafsauthent/Makefile [deleted file]
src/libafsauthent/Makefile.in [new file with mode: 0644]
src/libafsrpc/Makefile [deleted file]
src/libafsrpc/Makefile.in [new file with mode: 0644]
src/libuafs/MakefileProto.AIX [deleted file]
src/libuafs/MakefileProto.AIX.in [new file with mode: 0644]
src/libuafs/MakefileProto.DARWIN [deleted file]
src/libuafs/MakefileProto.DARWIN.in [new file with mode: 0644]
src/libuafs/MakefileProto.DUX [deleted file]
src/libuafs/MakefileProto.DUX.in [new file with mode: 0644]
src/libuafs/MakefileProto.FBSD [deleted file]
src/libuafs/MakefileProto.FBSD.in [new file with mode: 0644]
src/libuafs/MakefileProto.HPUX [deleted file]
src/libuafs/MakefileProto.HPUX.in [new file with mode: 0644]
src/libuafs/MakefileProto.IRIX [deleted file]
src/libuafs/MakefileProto.IRIX.in [new file with mode: 0644]
src/libuafs/MakefileProto.LINUX [deleted file]
src/libuafs/MakefileProto.LINUX.in [new file with mode: 0644]
src/libuafs/MakefileProto.SOLARIS [deleted file]
src/libuafs/MakefileProto.SOLARIS.in [new file with mode: 0644]
src/log/Makefile [deleted file]
src/log/Makefile.in [new file with mode: 0644]
src/log/test/Makefile [deleted file]
src/log/test/Makefile.in [new file with mode: 0644]
src/login/Makefile [deleted file]
src/login/Makefile.in [new file with mode: 0644]
src/lwp/Makefile [deleted file]
src/lwp/Makefile.in [new file with mode: 0644]
src/lwp/test/Makefile [deleted file]
src/lwp/test/Makefile.in [new file with mode: 0644]
src/mpp/Makefile [deleted file]
src/mpp/Makefile.in [new file with mode: 0644]
src/ntp/Makefile [deleted file]
src/ntp/Makefile.in [new file with mode: 0644]
src/null/Makefile [deleted file]
src/null/Makefile.in [new file with mode: 0644]
src/package/Makefile [deleted file]
src/package/Makefile.in [new file with mode: 0644]
src/pam/Makefile.in
src/pinstall/Makefile [deleted file]
src/pinstall/Makefile.in [new file with mode: 0644]
src/pinstall/test/Makefile [deleted file]
src/pinstall/test/Makefile.in [new file with mode: 0644]
src/procmgmt/Makefile [deleted file]
src/procmgmt/Makefile.in [new file with mode: 0644]
src/procmgmt/test/Makefile [deleted file]
src/procmgmt/test/Makefile.in [new file with mode: 0644]
src/ptserver/Makefile [deleted file]
src/ptserver/Makefile.in [new file with mode: 0644]
src/rcp/Makefile [deleted file]
src/rcp/Makefile.in [new file with mode: 0644]
src/rlogind/Makefile [deleted file]
src/rlogind/Makefile.in [new file with mode: 0644]
src/rsh/Makefile [deleted file]
src/rsh/Makefile.in [new file with mode: 0644]
src/rx/Makefile [deleted file]
src/rx/Makefile.in [new file with mode: 0644]
src/rx/bulk.example/Makefile [deleted file]
src/rx/bulk.example/Makefile.in [new file with mode: 0644]
src/rx/bulktest/Makefile [deleted file]
src/rx/bulktest/Makefile.in [new file with mode: 0644]
src/rx/multi.example/Makefile [deleted file]
src/rx/multi.example/Makefile.in [new file with mode: 0644]
src/rx/simple.example/Makefile [deleted file]
src/rx/simple.example/Makefile.in [new file with mode: 0644]
src/rx/test/Makefile [deleted file]
src/rx/test/Makefile.in [new file with mode: 0644]
src/rxgen/Makefile [deleted file]
src/rxgen/Makefile.in [new file with mode: 0644]
src/rxkad/Makefile [deleted file]
src/rxkad/Makefile.in [new file with mode: 0644]
src/rxkad/test/Makefile [deleted file]
src/rxkad/test/Makefile.in [new file with mode: 0644]
src/rxstat/Makefile [deleted file]
src/rxstat/Makefile.in [new file with mode: 0644]
src/scout/Makefile [deleted file]
src/scout/Makefile.in [new file with mode: 0644]
src/sgistuff/Makefile [deleted file]
src/sgistuff/Makefile.in [new file with mode: 0644]
src/sia/Makefile [deleted file]
src/sia/Makefile.in [new file with mode: 0644]
src/sys/Makefile [deleted file]
src/sys/Makefile.in [new file with mode: 0644]
src/tbutc/Makefile [deleted file]
src/tbutc/Makefile.in [new file with mode: 0644]
src/tsm41/Makefile [deleted file]
src/tsm41/Makefile.in [new file with mode: 0644]
src/tviced/Makefile [deleted file]
src/tviced/Makefile.in [new file with mode: 0644]
src/ubik/Makefile [deleted file]
src/ubik/Makefile.in [new file with mode: 0644]
src/update/Makefile [deleted file]
src/update/Makefile.in [new file with mode: 0644]
src/usd/Makefile [deleted file]
src/usd/Makefile.in [new file with mode: 0644]
src/usd/test/Makefile [deleted file]
src/usd/test/Makefile.in [new file with mode: 0644]
src/uss/Makefile [deleted file]
src/uss/Makefile.in [new file with mode: 0644]
src/util/Makefile [deleted file]
src/util/Makefile.in [new file with mode: 0644]
src/util/test/Makefile [deleted file]
src/util/test/Makefile.in [new file with mode: 0644]
src/venus/Makefile [deleted file]
src/venus/Makefile.in [new file with mode: 0644]
src/venus/test/Makefile [deleted file]
src/venus/test/Makefile.in [new file with mode: 0644]
src/vfsck/Makefile [deleted file]
src/vfsck/Makefile.in [new file with mode: 0644]
src/viced/Makefile [deleted file]
src/viced/Makefile.in [new file with mode: 0644]
src/vlserver/Makefile [deleted file]
src/vlserver/Makefile.in [new file with mode: 0644]
src/vol/Makefile [deleted file]
src/vol/Makefile.in [new file with mode: 0644]
src/vol/test/Makefile [deleted file]
src/vol/test/Makefile.in [new file with mode: 0644]
src/volser/Makefile [deleted file]
src/volser/Makefile.in [new file with mode: 0644]
src/wsadmin.src/Makefile [deleted file]
src/wsadmin.src/Makefile.in [new file with mode: 0644]
src/xstat/Makefile [deleted file]
src/xstat/Makefile.in [new file with mode: 0644]

index d108e2ffccddf14e847f0d6fdc5c66a2950364a1..19b8f484519f1a95d8825997225c6cf6c41e2eed 100644 (file)
@@ -6,8 +6,9 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 SHELL=/bin/sh
-DESTDIR=dest/
-SRCDIR=${DESTDIR}
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
 INSTALL=${SRCDIR}bin/install
 
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
@@ -30,27 +31,29 @@ WITH_INSECURE=@WITH_INSECURE@
 
 ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@
 
-# To compile AFS from scratch in the src tree run "make SYS_NAME=<type>".
+# To compile AFS from scratch in the src tree run "make".
 #   This recursively calls "make install ..." and does not depend on the
 #   existence of any non-standard programs.
-# To compile a package and all its predecessors using washtool run
-#   "make <package>".  This requires that @sys works, and that washtool,
-#   rcsupdate and our version of ci and co exist.
-# To compile for the kernel type "make blibafs".  This assumes washtool,
-#   install, rxgen, compile_et and others already exist and runs it with
+# To compile for the kernel type "make blibafs".  This assumes install, 
+#   rxgen, compile_et and others already exist and runs it with
 #   "-argument kinstall".
 
+COMPILE_PART1=cd src; cd
+COMPILE_PART2=; $(MAKE) install
+COMPILE_PART3=; $(MAKE) test
+COMPILE_CLEAN=; $(MAKE) clean
+
 all: force
        set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-       $(MAKE) install "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+       $(MAKE) install
 
 all_nolibafs:
        set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-       $(MAKE) install TARGET=finale_nolibafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+       $(MAKE) install TARGET=finale_nolibafs
 
 only_libafs:
        set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-       $(MAKE) install TARGET=libafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+       $(MAKE) install TARGET=libafs
 
 project: cmd comerr 
 
@@ -375,12 +378,7 @@ libadmin_real:
 libadmin: libafsauthent bozo
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
-                       $(MAKE) libadmin_real SYS_NAME=$(SYS_NAME) \
-                       COMPILE_PART1="$(COMPILE_PART1)" \
-                       COMPILE_PART2="$(COMPILE_PART2)" \
-                       TOP_SRCDIR=@TOP_SRCDIR@ \
-                       SRCDIR=$(SRCDIR) DESTDIR=$(DESTDIR) \
-                       DBG_DEFS=$(DBG_DEFS) ;; \
+                       $(MAKE) libadmin_real ;; \
        *) \
                echo Not building MT libadmin for ${SYS_NAME} ;; \
        esac
@@ -409,27 +407,21 @@ force:
 
 TARGET=finale
 install: force
-       $(MAKE) $(TARGET) "SYS_NAME=${SYS_NAME}" \
-               "COMPILE_PART1=${COMPILE_PART1}" \
-               "COMPILE_PART2=${COMPILE_PART2}" \
-                DESTDIR=`pwd`/${SYS_NAME}/dest/ \
-                TOP_SRCDIR=@TOP_SRCDIR@ \
-                SRCDIR=`pwd`/${SYS_NAME}/dest/ \
-                "DBG_DEFS=${DBG_DEFS}"
+       $(MAKE) $(TARGET)
 
 kupdate: updatekdir libafs_setup libuafs_setup
 
 blibafs:
-       $(MAKE) libafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument kinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+       $(MAKE) libafs
 
 blibuafs:
-       $(MAKE) libuafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument ukinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+       $(MAKE) libuafs
 
 bwebafs: sys
-       $(MAKE) libuafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument webinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+       $(MAKE) libuafs
 
 clean:
-       $(MAKE) clean2 "COMPILE_PART1=cd src; cd" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} 
+       $(MAKE) clean2
 
 clean2:
        -${COMPILE_PART1} config ${COMPILE_CLEAN}
@@ -524,24 +516,6 @@ distclean: clean
 pristine: distclean
        /bin/rm -f src/config/afsconfig.h.in configure aclocal.m4
 
-links:
-       echo "Remove the obj directory"
-       - /bin/rm -rf @sys/obj/* ;
-       - /bin/rm -rf @sys/dest/* ;
-       - /bin/mkdir @sys/obj ;
-       echo "Create the obj directories"
-       here=`pwd` ; \
-       cd src; \
-       for file in `find [!NW]* -type d -print` ; do \
-               /bin/mkdir $${here}/obj/$${file} ; \
-       done;
-       echo "Create the obj file links"
-       here=`pwd` ; \
-       cd src; \
-       for file in `find [!NW]* -type f -print` ; do \
-               /bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
-       done;
-
 #
 # Below targets are all deprecated, insecure, or obsolte, 
 # see README.OBSOLETE and README.INSECURE for more info
index 67286e89defde379ad736ca7e685a2ba9211b84b..4269c3a9601d0ec8fdd175ebf4c47cc95573d1bb 100644 (file)
@@ -354,6 +354,8 @@ fi
 
 SRCDIR_PARENT=`pwd`
 TOP_SRCDIR="${SRCDIR_PARENT}/src"
+DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"
+SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"
 
 dnl checks for header files.
 AC_HEADER_STDC
@@ -379,6 +381,8 @@ AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)
 AC_SUBST(MKAFS_OSTYPE)
 AC_SUBST(TOP_SRCDIR)
+AC_SUBST(DESTDIR)
+AC_SUBST(SRCDIR)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
 
@@ -387,6 +391,109 @@ Makefile               \
 src/config/Makefile.version-NOCML \
 src/config/Makefile.${AFS_SYSNAME} \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
 src/pam/Makefile \
 src/afsd/afs.ppc_darwin.plist \
+src/afs/Makefile \
+src/afsd/Makefile \
+src/afsmonitor/Makefile \
+src/afsweb/Makefile \
+src/audit/Makefile \
+src/auth/test/Makefile \
+src/auth/Makefile \
+src/bozo/test/Makefile \
+src/bozo/Makefile \
+src/bu_utils/Makefile \
+src/bubasics/Makefile \
+src/bucoord/Makefile \
+src/budb/Makefile \
+src/butc/Makefile \
+src/butm/Makefile \
+src/cmd/test/Makefile \
+src/cmd/Makefile \
+src/comerr/test/Makefile \
+src/comerr/Makefile \
+src/config/Makefile \
+src/dauth/Makefile \
+src/des/test/Makefile \
+src/des/Makefile \
+src/des_stub/Makefile \
+src/dir/test/Makefile \
+src/dir/Makefile \
+src/export/Makefile \
+src/finale/Makefile \
+src/fsint/Makefile \
+src/fsprobe/Makefile \
+src/ftpd43+/Makefile \
+src/gtx/Makefile \
+src/inetd/Makefile \
+src/kauth/test/Makefile \
+src/kauth/Makefile \
+src/libacl/test/Makefile \
+src/libacl/Makefile \
+src/libadmin/adminutil/Makefile \
+src/libadmin/Makefile \
+src/libadmin/bos/Makefile \
+src/libadmin/cfg/test/Makefile \
+src/libadmin/cfg/Makefile \
+src/libadmin/client/Makefile \
+src/libadmin/kas/Makefile \
+src/libadmin/pts/Makefile \
+src/libadmin/samples/Makefile \
+src/libadmin/test/Makefile \
+src/libadmin/vos/Makefile \
+src/libafsauthent/Makefile \
+src/libafsrpc/Makefile \
+src/log/test/Makefile \
+src/log/Makefile \
+src/login/Makefile \
+src/lwp/test/Makefile \
+src/lwp/Makefile \
+src/mpp/Makefile \
+src/ntp/Makefile \
+src/null/Makefile \
+src/package/Makefile \
+src/pam/Makefile \
+src/pinstall/test/Makefile \
+src/pinstall/Makefile \
+src/procmgmt/Makefile \
+src/procmgmt/test/Makefile \
+src/ptserver/Makefile \
+src/rcp/Makefile \
+src/rlogind/Makefile \
+src/rsh/Makefile \
+src/rx/Makefile \
+src/rx/bulk.example/Makefile \
+src/rx/bulktest/Makefile \
+src/rx/multi.example/Makefile \
+src/rx/simple.example/Makefile \
+src/rx/test/Makefile \
+src/rxgen/Makefile \
+src/rxkad/Makefile \
+src/rxkad/test/Makefile \
+src/rxstat/Makefile \
+src/scout/Makefile \
+src/sgistuff/Makefile \
+src/sia/Makefile \
+src/sys/Makefile \
+src/tbutc/Makefile \
+src/tsm41/Makefile \
+src/tviced/Makefile \
+src/ubik/Makefile \
+src/update/Makefile \
+src/usd/test/Makefile \
+src/usd/Makefile \
+src/uss/Makefile \
+src/util/Makefile \
+src/util/test/Makefile \
+src/venus/test/Makefile \
+src/venus/Makefile \
+src/vfsck/Makefile \
+src/viced/Makefile \
+src/vlserver/Makefile \
+src/vol/Makefile \
+src/vol/test/Makefile \
+src/volser/Makefile \
+src/wsadmin.src/Makefile \
+src/xstat/Makefile \
 )
diff --git a/src/afs/Makefile b/src/afs/Makefile
deleted file mode 100644 (file)
index 063159a..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-COMPONENT=afs
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-system: install
-
-# NOTE: linux case uses --new as well to work around bug in some versions of
-# gencat.
-kinstall: AFS_component_version_number.c
-       set ${KERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       -chmod 666 ${KERNELDIR}afs/*
-       ${DESTDIR}bin/compile_et -v 2 afs_trace.et
-       ${INSTALL} *.[csh] ${KERNELDIR}afs
-       ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs
-       ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs
-       set ${DESTDIR}root.client/usr/vice/etc/C; $(MKDIR_IF_NEEDED)
-       -rm -f afszcm.cat
-       case ${SYS_NAME} in \
-               sgi_* ) \
-                       gencat -m afszcm.cat afs_trace.msf ;; \
-               *_linux* ) \
-                       gencat --new afszcm.cat afs_trace.msf ;; \
-               ppc_darwin* | i386_fbsd*) \
-                       echo No gencat for ${SYS_NAME} ;; \
-               * ) \
-                       gencat afszcm.cat afs_trace.msf ;; \
-       esac
-
-
-
-ukinstall webinstall: AFS_component_version_number.c
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       -chmod 666 ${UKERNELDIR}afs/*
-       ${DESTDIR}bin/compile_et -v 2 afs_trace.et
-       ${INSTALL} *.[csh] ${UKERNELDIR}afs
-       ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs
-       ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs
-
-noversion: install.noversion
-install install.noversion: kinstall ukinstall
-       ${INSTALL} afs.h ${DESTDIR}include/afs
-       ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}include/afs
-       ${INSTALL} afs_stats.h exporter.h nfsclient.h  ${DESTDIR}include/afs
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${DESTDIR}include/afs ;; \
-       esac
-       case ${SYS_NAME} in \
-               next_mach30 | vax_ul43 | ppc_darwin* | i386_fbsd* ) \
-                       echo skipping afszcm.cat install for ${SYS_NAME} ;; \
-               * ) \
-                       ${INSTALL} afszcm.cat ${DESTDIR}root.client/usr/vice/etc/C ;; \
-       esac
-       case ${SYS_NAME} in \
-               *linux* ) \
-                       ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}include/afs ;;\
-               * ) \
-                       echo No vfs headers to install for ${SYS_NAME};; \
-       esac
-
-clean:
-       rm -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat
diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
new file mode 100644 (file)
index 0000000..0258168
--- /dev/null
@@ -0,0 +1,80 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+system: install
+
+# NOTE: linux case uses --new as well to work around bug in some versions of
+# gencat.
+kinstall: AFS_component_version_number.c
+       set ${KERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       -chmod 666 ${KERNELDIR}afs/*
+       ${DESTDIR}bin/compile_et -v 2 afs_trace.et
+       ${INSTALL} *.[csh] ${KERNELDIR}afs
+       ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs
+       ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs
+       set ${DESTDIR}root.client/usr/vice/etc/C; $(MKDIR_IF_NEEDED)
+       -rm -f afszcm.cat
+       case ${SYS_NAME} in \
+               sgi_* ) \
+                       gencat -m afszcm.cat afs_trace.msf ;; \
+               *_linux* ) \
+                       gencat --new afszcm.cat afs_trace.msf ;; \
+               ppc_darwin* | i386_fbsd*) \
+                       echo No gencat for ${SYS_NAME} ;; \
+               * ) \
+                       gencat afszcm.cat afs_trace.msf ;; \
+       esac
+
+
+
+ukinstall webinstall: AFS_component_version_number.c
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       -chmod 666 ${UKERNELDIR}afs/*
+       ${DESTDIR}bin/compile_et -v 2 afs_trace.et
+       ${INSTALL} *.[csh] ${UKERNELDIR}afs
+       ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs
+       ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs
+
+noversion: install.noversion
+install install.noversion: kinstall ukinstall
+       ${INSTALL} afs.h ${DESTDIR}include/afs
+       ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}include/afs
+       ${INSTALL} afs_stats.h exporter.h nfsclient.h  ${DESTDIR}include/afs
+       case ${SYS_NAME} in \
+               pmax_ul43 | pmax_ul43a) \
+                       ${INSTALL} longc_procs.h ${DESTDIR}include/afs ;; \
+       esac
+       case ${SYS_NAME} in \
+               next_mach30 | vax_ul43 | ppc_darwin* | i386_fbsd* ) \
+                       echo skipping afszcm.cat install for ${SYS_NAME} ;; \
+               * ) \
+                       ${INSTALL} afszcm.cat ${DESTDIR}root.client/usr/vice/etc/C ;; \
+       esac
+       case ${SYS_NAME} in \
+               *linux* ) \
+                       ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}include/afs ;;\
+               * ) \
+                       echo No vfs headers to install for ${SYS_NAME};; \
+       esac
+
+clean:
+       rm -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat
diff --git a/src/afsd/Makefile b/src/afsd/Makefile
deleted file mode 100644 (file)
index 454b0e1..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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
-
-# afsd makefile
-
-SHELL = /bin/sh
-DESTDIR = DEST/
-SRCDIR = DEST/
-
-SOURCES = afsd.c sys.c
-
-COMPONENT=afsd
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-INSTALLro = ${INSTALL} -m 644
-INSTALLex = ${INSTALL} -m 755
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
-
-noversion: install
-
-#
-# What to make
-#
-all:   afsd vsys
-
-#
-# Programs
-#
-
-AFSLIBS=$(SRCDIR)lib/afs/libauth.a ${SRCDIR}lib/afs/libcmd.a $(SRCDIR)lib/afs/libsys.a $(SRCDIR)lib/afs/util.a $(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a $(SRCDIR)lib/afs/util.a 
-
-afsd: afsd.o $(AFSLIBS)
-       case ${SYS_NAME} in \
-       sgi_61 | sgi_62 | sgi_63) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \
-       sgi_64 | sgi_65 ) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \
-       * ) \
-               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \
-       esac
-
-vsys: vsys.o
-       $(CC) -g -o vsys vsys.o ${SRCDIR}lib/afs/libsys.a $(LDFLAGS) ${XLIBS}
-
-#
-# Objects
-#
-afsd.o: afsd.c AFS_component_version_number.c
-
-vsys.o: vsys.c AFS_component_version_number.c
-
-clean:
-       rm -f *.o vsys afsd core AFS_component_version_number.c
-
-beancount:
-       wc -l afsd.c
-
-system: install
-
-install: all
-       ${INSTALL} vsys ${DESTDIR}etc
-       ${INSTALL} afsd ${DESTDIR}root.client/usr/vice/etc
-       case ${SYS_NAME} in \
-               rs_aix*)  \
-                       ${INSTALL} -f rc.afs.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.afs ; \
-                       ${INSTALL} -f rc.dkload.client.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.client ; \
-                       ${INSTALL} -f rc.dkload.server.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
-               sgi_65 ) \
-                       ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\
-                       ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.server/etc/init.d/afs.rc ;;\
-               sgi_* ) \
-                       ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\
-                       ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.server/etc/init.d/afs.rc ;\
-                       case ${SYS_NAME} in \
-                               sgi_53 | sgi_61 ) \
-                               ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DESTDIR}root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
-                       esac;; \
-               sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \
-                       ${INSTALL} -f afs.rc.solaris ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
-               sun4x_57 ) \
-                       ${INSTALL} -f afs.rc.solaris.2.7 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
-               sun4x_58 ) \
-                       ${INSTALL} -f afs.rc.solaris.2.8 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
-                sun4x_5? ) \
-                        ${INSTALL} -f afs.rc.solaris.2_5 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
-               alpha_osf* ) \
-                       ${INSTALL} -f afs.rc.alpha ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
-               hp_ux10? | hp_ux11? ) \
-                       ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;\
-                       ${INSTALL} -f afs.hpux102.driver ${DESTDIR}root.client/usr/vice/etc/afs.driver ;;\
-               alpha_dux* ) \
-                       ${INSTALL} -f afs.rc.alpha_dux40 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
-                hp?00_ux10? ) \
-                       ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
-               *linux* ) \
-                       ${INSTALLex} -f afs.rc.linux ${DESTDIR}root.client/usr/vice/etc/afs.rc; \
-                       ${INSTALL} -f afs.conf.linux ${DESTDIR}root.client/usr/vice/etc/afs.conf ;; \
-               ppc_darwin*) \
-                       mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\
-                       ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \
-                       ${INSTALLex} -f afs.rc.darwin ${DESTDIR}root.client/usr/vice/etc/afs.rc ; \
-                       ${INSTALL} -f afs.rc.darwin.plist ${DESTDIR}root.client/usr/vice/etc/StartupParameters.plist ;; \
-               *fbsd*) \
-                       mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.rc; \
-                       ${INSTALL} -f afs.rc.fbsd ${DESTDIR}root.client/usr/vice/etc/afs.rc.fbsd ;; \
-               * )  \
-                       echo No rc scripts installed for ${SYS_NAME} ;; \
-       esac
diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
new file mode 100644 (file)
index 0000000..4d0c8f7
--- /dev/null
@@ -0,0 +1,116 @@
+# 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
+
+# afsd makefile
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+SOURCES = afsd.c sys.c
+
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+INSTALLro = ${INSTALL} -m 644
+INSTALLex = ${INSTALL} -m 755
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = -g ${XLDFLAGS}
+
+noversion: install
+
+#
+# What to make
+#
+all:   afsd vsys
+
+#
+# Programs
+#
+
+AFSLIBS=$(SRCDIR)lib/afs/libauth.a ${SRCDIR}lib/afs/libcmd.a $(SRCDIR)lib/afs/libsys.a $(SRCDIR)lib/afs/util.a $(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a $(SRCDIR)lib/afs/util.a 
+
+afsd: afsd.o $(AFSLIBS)
+       case ${SYS_NAME} in \
+       sgi_61 | sgi_62 | sgi_63) \
+               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \
+       sgi_64 | sgi_65 ) \
+               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \
+       * ) \
+               ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \
+       esac
+
+vsys: vsys.o
+       $(CC) -g -o vsys vsys.o ${SRCDIR}lib/afs/libsys.a $(LDFLAGS) ${XLIBS}
+
+#
+# Objects
+#
+afsd.o: afsd.c AFS_component_version_number.c
+
+vsys.o: vsys.c AFS_component_version_number.c
+
+clean:
+       rm -f *.o vsys afsd core AFS_component_version_number.c
+
+beancount:
+       wc -l afsd.c
+
+system: install
+
+install: all
+       ${INSTALL} vsys ${DESTDIR}etc
+       ${INSTALL} afsd ${DESTDIR}root.client/usr/vice/etc
+       case ${SYS_NAME} in \
+               rs_aix*)  \
+                       ${INSTALL} -f rc.afs.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.afs ; \
+                       ${INSTALL} -f rc.dkload.client.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.client ; \
+                       ${INSTALL} -f rc.dkload.server.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
+               sgi_65 ) \
+                       ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\
+                       ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.server/etc/init.d/afs.rc ;;\
+               sgi_* ) \
+                       ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\
+                       ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.server/etc/init.d/afs.rc ;\
+                       case ${SYS_NAME} in \
+                               sgi_53 | sgi_61 ) \
+                               ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DESTDIR}root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
+                       esac;; \
+               sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \
+                       ${INSTALL} -f afs.rc.solaris ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
+               sun4x_57 ) \
+                       ${INSTALL} -f afs.rc.solaris.2.7 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
+               sun4x_58 ) \
+                       ${INSTALL} -f afs.rc.solaris.2.8 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
+                sun4x_5? ) \
+                        ${INSTALL} -f afs.rc.solaris.2_5 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\
+               alpha_osf* ) \
+                       ${INSTALL} -f afs.rc.alpha ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
+               hp_ux10? | hp_ux11? ) \
+                       ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;\
+                       ${INSTALL} -f afs.hpux102.driver ${DESTDIR}root.client/usr/vice/etc/afs.driver ;;\
+               alpha_dux* ) \
+                       ${INSTALL} -f afs.rc.alpha_dux40 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
+                hp?00_ux10? ) \
+                       ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\
+               *linux* ) \
+                       ${INSTALLex} -f afs.rc.linux ${DESTDIR}root.client/usr/vice/etc/afs.rc; \
+                       ${INSTALL} -f afs.conf.linux ${DESTDIR}root.client/usr/vice/etc/afs.conf ;; \
+               ppc_darwin*) \
+                       mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\
+                       ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \
+                       ${INSTALLex} -f afs.rc.darwin ${DESTDIR}root.client/usr/vice/etc/afs.rc ; \
+                       ${INSTALL} -f afs.rc.darwin.plist ${DESTDIR}root.client/usr/vice/etc/StartupParameters.plist ;; \
+               *fbsd*) \
+                       mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.rc; \
+                       ${INSTALL} -f afs.rc.fbsd ${DESTDIR}root.client/usr/vice/etc/afs.rc.fbsd ;; \
+               * )  \
+                       echo No rc scripts installed for ${SYS_NAME} ;; \
+       esac
diff --git a/src/afsmonitor/Makefile b/src/afsmonitor/Makefile
deleted file mode 100644 (file)
index a02e155..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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
-
-# Makefile for Afsmonitor, the AFS Performance monitoring tool
-
-SHELL = /bin/sh
-DESTDIR=DEST/
-SRCDIR=DEST/
-COMPONENT=afsmonitor
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS=-g -I. \
-       -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
-       -I${SRCDIR} ${XCFLAGS}
-LDFLAGS = ${XLDFLAGS}
-RPCINCLS=
-
-INCLS=${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxwindows.h \
-       ${SRCDIR}include/afs/gtxcurseswin.h \
-       ${SRCDIR}include/afs/gtxdumbwin.h \
-       ${SRCDIR}include/afs/gtxX11win.h \
-       ${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxlightobj.h \
-       ${SRCDIR}include/afs/gtxtextobj.h \
-       ${SRCDIR}include/afs/gtxobjdict.h \
-       ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h \
-       ${SRCDIR}include/afs/xstat_fs.h \
-       ${SRCDIR}include/afs/xstat_cm.h \
-       afsmonitor.h \
-       afsmon-labels.h
-LIBS=${SRCDIR}lib/afs/libxstat_fs.a \
-       ${SRCDIR}lib/afs/libxstat_cm.a \
-       ${SRCDIR}lib/afs/libgtx.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a 
-
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: afsmonitor 
-
-afsmon-output.o: afsmon-output.c ${INCLS}
-afsmon-win.o: afsmon-win.c ${INCLS}
-afsmonitor.o: afsmonitor.c ${INCLS} AFS_component_version_number.c
-
-afsmonitor: afsmonitor.o afsmon-win.o afsmon-output.o ${LIBS}
-       ${CC} ${LDFLAGS} -o afsmonitor afsmonitor.o afsmon-win.o \
-               afsmon-output.o ${LIBS} ${EXTRA_LIBS}
-
-afsmon-parselog:  afsmon-parselog.o ${LIBS}
-       ${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \
-               ${LIBS} ${EXTRA_LIBS}
-
-#gtxtest.o:    gtxtest.c ${INCLS}
-#gtxtest:      gtxtest.o ${LIBS}
-#              cc ${CFLAGS} -o gtxtest gtxtest.o ${LIBS} ${EXTRA_LIBS} 
-
-#
-# Misc others
-#
-system: install
-
-install: all
-       ${INSTALL} afsmonitor ${DESTDIR}bin
-
-clean:
-       rm -f  *.o afsmonitor AFS_component_version_number.c
-
diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in
new file mode 100644 (file)
index 0000000..a51f005
--- /dev/null
@@ -0,0 +1,89 @@
+# 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
+
+# Makefile for Afsmonitor, the AFS Performance monitoring tool
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS=-g -I. \
+       -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include \
+       -I${SRCDIR}include/afs \
+       -I${SRCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
+RPCINCLS=
+
+INCLS=${SRCDIR}include/afs/gtxobjects.h \
+       ${SRCDIR}include/afs/gtxwindows.h \
+       ${SRCDIR}include/afs/gtxcurseswin.h \
+       ${SRCDIR}include/afs/gtxdumbwin.h \
+       ${SRCDIR}include/afs/gtxX11win.h \
+       ${SRCDIR}include/afs/gtxobjects.h \
+       ${SRCDIR}include/afs/gtxlightobj.h \
+       ${SRCDIR}include/afs/gtxtextobj.h \
+       ${SRCDIR}include/afs/gtxobjdict.h \
+       ${RPCINCLS} \
+       ${SRCDIR}include/afs/keys.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/afs/cmd.h \
+       ${SRCDIR}include/afs/xstat_fs.h \
+       ${SRCDIR}include/afs/xstat_cm.h \
+       afsmonitor.h \
+       afsmon-labels.h
+LIBS=${SRCDIR}lib/afs/libxstat_fs.a \
+       ${SRCDIR}lib/afs/libxstat_cm.a \
+       ${SRCDIR}lib/afs/libgtx.a \
+       ${SRCDIR}lib/afs/libafsint.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/util.a 
+
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: afsmonitor 
+
+afsmon-output.o: afsmon-output.c ${INCLS}
+afsmon-win.o: afsmon-win.c ${INCLS}
+afsmonitor.o: afsmonitor.c ${INCLS} AFS_component_version_number.c
+
+afsmonitor: afsmonitor.o afsmon-win.o afsmon-output.o ${LIBS}
+       ${CC} ${LDFLAGS} -o afsmonitor afsmonitor.o afsmon-win.o \
+               afsmon-output.o ${LIBS} ${EXTRA_LIBS}
+
+afsmon-parselog:  afsmon-parselog.o ${LIBS}
+       ${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \
+               ${LIBS} ${EXTRA_LIBS}
+
+#gtxtest.o:    gtxtest.c ${INCLS}
+#gtxtest:      gtxtest.o ${LIBS}
+#              cc ${CFLAGS} -o gtxtest gtxtest.o ${LIBS} ${EXTRA_LIBS} 
+
+#
+# Misc others
+#
+system: install
+
+install: all
+       ${INSTALL} afsmonitor ${DESTDIR}bin
+
+clean:
+       rm -f  *.o afsmonitor AFS_component_version_number.c
+
diff --git a/src/afsweb/Makefile b/src/afsweb/Makefile
deleted file mode 100644 (file)
index 6c61a62..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=nsafs
-
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR=../libuafs/
-COMPILE_ET=${SRCDIR}bin/compile_et
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-UKSRCS=nsafs.h nsafs.c securehash.c
-
-#
-# Targets for Apache AFS Web Secure
-#
-APACHE_AFS_LIB=libapacheafs.a
-DCE_ADK_LIB=libadk.a
-APACHE_AFS_COMMON_LIB=libcommon.a
-
-BINARIES=weblog weblog_starter
-SRC_MODULE=afs_module.c
-## This module is made compatible with Apache 1.3.1 by including a file called
-## ap_compat.h provided by Apache (basically all they do is #define all the old API calls
-## as the new ones with ap_ prepended to the old API calls. The makefile takes care of this
-## while building afs_module.c and adding the AFS_component_version_number.c file's contents 
-## in comments. 
-
-APACHEAFS_DOC=README
-APACHE_INSTALL_SCRIPT=afswsApache_config.sh 
-NETSCAPE_INSTALL_SCRIPT=afswsNetscape_config.sh
-
-
-
-system noversion apache_afs_web_secure:
-       case "${SYS_NAME}" in \
-               rs_aix* ) \
-                       echo Clean, make, and install the lib for 1.2 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) ; \
-                       ${INSTALL} ${APACHE_AFS_LIB} ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
-                       echo Make and install source for 1.2 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
-                       echo Make and install the lib for 1.3.1 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
-                       echo Make and install source for 1.3.1 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
-                       echo Clean, make, and install the lib for 1.3.6 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6"; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       echo Make and install source for 1.3.1 ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
-                       echo Do the binaries ; \
-                       $(MAKE) AUX_CFLAGS=-DAIX $(BINARIES) ;; \
-               sun*) \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
-                       $(MAKE) AUX_CFLAGS=-DSOLARIS "XLIBS=-lsocket -lnsl" $(BINARIES) ;; \
-               *linux*) \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
-                       $(MAKE) libclean ; \
-                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
-                       /bin/rm -f $(SRC_MODULE) ; \
-                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
-                       $(MAKE) AUX_CFLAGS=-DLINUX "XLIBS=-lnsl" $(BINARIES) ;; \
-               * ) \
-                        echo "NOT BUILT FOR ${SYS_NAME}"; ;; \
-       esac
-       ${INSTALL} ${APACHEAFS_DOC} ${DESTDIR}root.afsweb/doc
-       ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DESTDIR}root.afsweb/install
-       chmod a+x ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT}
-       chmod a+w ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT}
-       ${INSTALL} $(BINARIES) ${DESTDIR}root.afsweb/bin
-
-include ../config/Makefile.version
-
-all:
-
-install: kinstall ukinstall
-
-kinstall:
-       @echo No $@ source here.
-
-
-webinstall:${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-ukinstall:
-       @echo No $@ source here.
-
-##
-## For Apache Afs Web Secure libraries and binaries
-## NOTE: APACHE_INCLUDES should point to the Apache src directory where 
-## httpd.h and all it's included files reside which right now is src/afsweb/include
-## and we have Apache versions as subdirectories but these are taken care of by the
-## code. Be sure to compile with the VERSION_CFLAG=-DAPACHE_1_3 option for Apache 1.3
-##
-APACHE_INCLUDES=-Iapache_includes
-EXTRA_CFLAGS=-DENABLE_DCE_DLOG -I../dauth/
-ADKOBJS=../dauth/adkint.cs.o ../dauth/adkint.xdr.o
-
-XLIBS=
-DEFINES=-DSTATUS
-OPTF=
-DEBUG_FLAG=
-AUX_CFLAGS=
-VERSION_CFLAG=
-AFS_INCL=-I${SRCDIR}include -I.. -I../config
-CFLAGS=$(OPTF) $(DEFINES) -I. -I.. $(EXTRA_CFLAGS) $(VERSION_CFLAG) $(DEBUG_FLAG)
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-             ${SRCDIR}include/rx/rxkad.h \
-             ${SRCDIR}include/afs/com_err.h \
-            weblog_errors.h $(DCE_DLOG_INCLUDES)
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a
-kauthlib=${SRCDIR}lib/afs/libkauth.a
-
-LIBS = ${kauthlib} ${SRCDIR}lib/libubik.a ${SRCDIR}lib/afs/libprot.a \
-       ${authlib} ${rxkadlib} ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a ${deslib} ${cmdlib} \
-       ${SRCDIR}lib/afs/libcom_err.a ${utilib} \
-       $(DBM) $(XLIBS)
-
-AR=ar
-ARFLAGS=rv
-LIBCOMMON_OBJS=apache_afs_utils.o apache_afs_cache.o
-LIBAPACHE_OBJS=apache_afs_client.o apache_afs_plugin.o
-LIBOBJS=$(LIBCOMMON_OBJS) $(LIBAPACHE_OBJS)
-OBJS=$(LIBOBJS) apache_afs_weblog.o weblog.o
-
-.c.o:
-       $(CC) -c $(CFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $<
-
-
-weblog: weblog.o $(APACHE_AFS_COMMON_LIB) $(DCE_ADK_LIB)
-       $(CC) -o $@ weblog.o $(APACHE_AFS_COMMON_LIB) $(LIBS) $(DCE_ADK_LIB) $(XLIBS)
-
-weblog_starter: apache_afs_weblog.o weblog_errors.h 
-       $(CC) -o $@ apache_afs_weblog.o 
-
-$(DCE_ADK_LIB): 
-       - /bin/rm -f $@ 
-       $(AR) $(ARFLAGS) $@ $(ADKOBJS)          
-
-$(APACHE_AFS_COMMON_LIB):$(LIBCOMMON_OBJS)
-       - /bin/rm -f $@
-       $(AR) $(ARFLAGS) $@ $(LIBCOMMON_OBJS)
-
-$(APACHE_AFS_LIB): $(LIBOBJS) AFS_component_version_number.o
-       - /bin/rm -f $@
-       $(AR) $(ARFLAGS) $@ $(LIBOBJS) 
-
-afs_module.c: apache_afs_module.c 
-       -/bin/rm -f afs_module.c \
-       ; echo "/*" > afs_module.c \
-       ; cat AFS_component_version_number.c >> afs_module.c \
-       ; echo "*/" >> afs_module.c \
-       ; case "${VERSION_CFLAG}" in \
-               -DAPACHE_1_3*)  echo '#include "ap_compat.h"' >> afs_module.c ;; \
-         esac \
-       ; cat apache_afs_module.c >> afs_module.c
-        
-##
-##Dependencies
-##
-
-$(OBJS): Makefile
-
-apache_afs_weblog.o: apache_afs_weblog.c weblog_errors.h AFS_component_version_number.o
-apache_afs_utils.o: apache_afs_utils.c apache_afs_utils.h
-apache_afs_cache.o: apache_afs_cache.c apache_afs_cache.h
-weblog.o: weblog.c weblog_errors.h $(APACHE_AFS_COMMON_LIB)
-apache_afs_client.o: apache_api.h apache_afs_client.c apache_afs_utils.o apache_afs_cache.o AFS_component_version_number.o
-       $(CC) -c $(CFLAGS) $(AFS_INCL) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_client.c
-apache_afs_plugin.o: apache_api.h apache_afs_plugin.c apache_afs_client.o apache_afs_utils.o apache_afs_cache.o
-       $(CC) -c $(CFLAGS) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_plugin.c
-
-
-clean:
-       -/bin/rm -f *.o $(BINARIES) $(APACHE_AFS_LIB) $(APACHE_AFS_COMMON_LIB) $(DCE_ADK_LIB)
-
-libclean:
-       -/bin/rm -f $(APACHE_AFS_LIB) $(LIBOBJS)
-
diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
new file mode 100644 (file)
index 0000000..af38361
--- /dev/null
@@ -0,0 +1,243 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+
+include ../config/Makefile.${SYS_NAME}
+
+UKERNELDIR=../libuafs/
+COMPILE_ET=${SRCDIR}bin/compile_et
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+UKSRCS=nsafs.h nsafs.c securehash.c
+
+#
+# Targets for Apache AFS Web Secure
+#
+APACHE_AFS_LIB=libapacheafs.a
+DCE_ADK_LIB=libadk.a
+APACHE_AFS_COMMON_LIB=libcommon.a
+
+BINARIES=weblog weblog_starter
+SRC_MODULE=afs_module.c
+## This module is made compatible with Apache 1.3.1 by including a file called
+## ap_compat.h provided by Apache (basically all they do is #define all the old API calls
+## as the new ones with ap_ prepended to the old API calls. The makefile takes care of this
+## while building afs_module.c and adding the AFS_component_version_number.c file's contents 
+## in comments. 
+
+APACHEAFS_DOC=README
+APACHE_INSTALL_SCRIPT=afswsApache_config.sh 
+NETSCAPE_INSTALL_SCRIPT=afswsNetscape_config.sh
+
+
+
+system noversion apache_afs_web_secure:
+       case "${SYS_NAME}" in \
+               rs_aix* ) \
+                       echo Clean, make, and install the lib for 1.2 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) ; \
+                       ${INSTALL} ${APACHE_AFS_LIB} ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
+                       echo Make and install source for 1.2 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
+                       echo Make and install the lib for 1.3.1 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
+                       echo Make and install source for 1.3.1 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
+                       echo Clean, make, and install the lib for 1.3.6 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6"; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       echo Make and install source for 1.3.1 ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
+                       echo Do the binaries ; \
+                       $(MAKE) AUX_CFLAGS=-DAIX $(BINARIES) ;; \
+               sun*) \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
+                       $(MAKE) AUX_CFLAGS=-DSOLARIS "XLIBS=-lsocket -lnsl" $(BINARIES) ;; \
+               *linux*) \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \
+                       $(MAKE) libclean ; \
+                       $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
+                       ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \
+                       /bin/rm -f $(SRC_MODULE) ; \
+                       $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
+                       ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \
+                       $(MAKE) AUX_CFLAGS=-DLINUX "XLIBS=-lnsl" $(BINARIES) ;; \
+               * ) \
+                        echo "NOT BUILT FOR ${SYS_NAME}"; ;; \
+       esac
+       ${INSTALL} ${APACHEAFS_DOC} ${DESTDIR}root.afsweb/doc
+       ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DESTDIR}root.afsweb/install
+       chmod a+x ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT}
+       chmod a+w ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT}
+       ${INSTALL} $(BINARIES) ${DESTDIR}root.afsweb/bin
+
+include ../config/Makefile.version
+
+all:
+
+install: kinstall ukinstall
+
+kinstall:
+       @echo No $@ source here.
+
+
+webinstall:${UKSRCS}
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+ukinstall:
+       @echo No $@ source here.
+
+##
+## For Apache Afs Web Secure libraries and binaries
+## NOTE: APACHE_INCLUDES should point to the Apache src directory where 
+## httpd.h and all it's included files reside which right now is src/afsweb/include
+## and we have Apache versions as subdirectories but these are taken care of by the
+## code. Be sure to compile with the VERSION_CFLAG=-DAPACHE_1_3 option for Apache 1.3
+##
+APACHE_INCLUDES=-Iapache_includes
+EXTRA_CFLAGS=-DENABLE_DCE_DLOG -I../dauth/
+ADKOBJS=../dauth/adkint.cs.o ../dauth/adkint.xdr.o
+
+XLIBS=
+DEFINES=-DSTATUS
+OPTF=
+DEBUG_FLAG=
+AUX_CFLAGS=
+VERSION_CFLAG=
+AFS_INCL=-I${SRCDIR}include -I.. -I../config
+CFLAGS=$(OPTF) $(DEFINES) -I. -I.. $(EXTRA_CFLAGS) $(VERSION_CFLAG) $(DEBUG_FLAG)
+INCLS=${SRCDIR}include/ubik.h \
+             ${SRCDIR}include/lwp.h \
+             ${SRCDIR}include/lock.h  \
+             ${SRCDIR}include/rx/rx.h \
+             ${SRCDIR}include/rx/xdr.h \
+             ${SRCDIR}include/rx/rxkad.h \
+             ${SRCDIR}include/afs/com_err.h \
+            weblog_errors.h $(DCE_DLOG_INCLUDES)
+deslib=${SRCDIR}lib/libdes.a
+rxkadlib=${SRCDIR}lib/librxkad.a
+authlib=${SRCDIR}lib/afs/libauth.a
+cmdlib=${SRCDIR}lib/afs/libcmd.a
+utilib=${SRCDIR}lib/afs/util.a
+auditlib=${SRCDIR}lib/afs/libaudit.a
+kauthlib=${SRCDIR}lib/afs/libkauth.a
+
+LIBS = ${kauthlib} ${SRCDIR}lib/libubik.a ${SRCDIR}lib/afs/libprot.a \
+       ${authlib} ${rxkadlib} ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a  \
+       ${SRCDIR}lib/liblwp.a ${deslib} ${cmdlib} \
+       ${SRCDIR}lib/afs/libcom_err.a ${utilib} \
+       $(DBM) $(XLIBS)
+
+AR=ar
+ARFLAGS=rv
+LIBCOMMON_OBJS=apache_afs_utils.o apache_afs_cache.o
+LIBAPACHE_OBJS=apache_afs_client.o apache_afs_plugin.o
+LIBOBJS=$(LIBCOMMON_OBJS) $(LIBAPACHE_OBJS)
+OBJS=$(LIBOBJS) apache_afs_weblog.o weblog.o
+
+.c.o:
+       $(CC) -c $(CFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $<
+
+
+weblog: weblog.o $(APACHE_AFS_COMMON_LIB) $(DCE_ADK_LIB)
+       $(CC) -o $@ weblog.o $(APACHE_AFS_COMMON_LIB) $(LIBS) $(DCE_ADK_LIB) $(XLIBS)
+
+weblog_starter: apache_afs_weblog.o weblog_errors.h 
+       $(CC) -o $@ apache_afs_weblog.o 
+
+$(DCE_ADK_LIB): 
+       - /bin/rm -f $@ 
+       $(AR) $(ARFLAGS) $@ $(ADKOBJS)          
+
+$(APACHE_AFS_COMMON_LIB):$(LIBCOMMON_OBJS)
+       - /bin/rm -f $@
+       $(AR) $(ARFLAGS) $@ $(LIBCOMMON_OBJS)
+
+$(APACHE_AFS_LIB): $(LIBOBJS) AFS_component_version_number.o
+       - /bin/rm -f $@
+       $(AR) $(ARFLAGS) $@ $(LIBOBJS) 
+
+afs_module.c: apache_afs_module.c 
+       -/bin/rm -f afs_module.c \
+       ; echo "/*" > afs_module.c \
+       ; cat AFS_component_version_number.c >> afs_module.c \
+       ; echo "*/" >> afs_module.c \
+       ; case "${VERSION_CFLAG}" in \
+               -DAPACHE_1_3*)  echo '#include "ap_compat.h"' >> afs_module.c ;; \
+         esac \
+       ; cat apache_afs_module.c >> afs_module.c
+        
+##
+##Dependencies
+##
+
+$(OBJS): Makefile
+
+apache_afs_weblog.o: apache_afs_weblog.c weblog_errors.h AFS_component_version_number.o
+apache_afs_utils.o: apache_afs_utils.c apache_afs_utils.h
+apache_afs_cache.o: apache_afs_cache.c apache_afs_cache.h
+weblog.o: weblog.c weblog_errors.h $(APACHE_AFS_COMMON_LIB)
+apache_afs_client.o: apache_api.h apache_afs_client.c apache_afs_utils.o apache_afs_cache.o AFS_component_version_number.o
+       $(CC) -c $(CFLAGS) $(AFS_INCL) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_client.c
+apache_afs_plugin.o: apache_api.h apache_afs_plugin.c apache_afs_client.o apache_afs_utils.o apache_afs_cache.o
+       $(CC) -c $(CFLAGS) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_plugin.c
+
+
+clean:
+       -/bin/rm -f *.o $(BINARIES) $(APACHE_AFS_LIB) $(APACHE_AFS_COMMON_LIB) $(DCE_ADK_LIB)
+
+libclean:
+       -/bin/rm -f $(APACHE_AFS_LIB) $(LIBOBJS)
+
diff --git a/src/audit/Makefile b/src/audit/Makefile
deleted file mode 100644 (file)
index f102b1e..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
-
-# # Auditing is currently only supported for AIX32 machines.  It is
-# # integrated with the AIX auditing facility.  The objects, events, 
-# # and config files are AIX specific.  The Audit file is not but is
-# # included in the rs_aix32 case since other platforms are not
-# # supported (if not supported, don't show it).
-# ######################################################################
-
-SHELL = /bin/sh
-
-COMPONENT=audit
-include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-UKERNELDIR = ../libuafs/
-LOCALDIR = ${DESTDIR}root.server/usr/afs/local/
-
-audobjs = audit.o
-
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I$(SRCDIR)include ${XCFLAGS}
-
-include ../config/Makefile.version
-
-noversion system: install
-
-UKSRCS = audit.h
-
-all:  libaudit.a 
-
-headers: audit.h
-       ${INSTALL} audit.h ${DESTDIR}include/afs
-
-install: ukinstall libaudit.a 
-       ${INSTALL} libaudit.a ${DESTDIR}lib/afs
-       ${INSTALL} audit.h ${DESTDIR}include/afs
-       case ${SYS_NAME} in \
-       rs_aix*) \
-          ${INSTALL} Audit              ${LOCALDIR}                     ;  \
-          ${INSTALL} objects.aix.sample ${LOCALDIR}audit/objects.sample ;  \
-          ${INSTALL} events.aix.sample  ${LOCALDIR}audit/events.sample  ;  \
-          ${INSTALL} config.aix.sample  ${LOCALDIR}audit/config.sample  ;; \
-        *) ;; \
-        esac ;
-
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall:
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-doc:
-       echo no documents in this directory
-
-libaudit.a: ${audobjs} AFS_component_version_number.o
-       rm -f libaudit.a
-       ar r libaudit.a ${audobjs} AFS_component_version_number.o
-       $(RANLIB) libaudit.a
-
-audit.o: audit.c audit.h 
-       ${CC} ${CFLAGS} -c audit.c
-
-clean:
-       rm -f *.o core AFS_component_version_number.c *.a
-
-beancount:
-       wc -l *.c *.h
-
diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
new file mode 100644 (file)
index 0000000..cd553e0
--- /dev/null
@@ -0,0 +1,80 @@
+# 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
+
+# # Auditing is currently only supported for AIX32 machines.  It is
+# # integrated with the AIX auditing facility.  The objects, events, 
+# # and config files are AIX specific.  The Audit file is not but is
+# # included in the rs_aix32 case since other platforms are not
+# # supported (if not supported, don't show it).
+# ######################################################################
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+
+include ../config/Makefile.${SYS_NAME}
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+UKERNELDIR = ../libuafs/
+LOCALDIR = ${DESTDIR}root.server/usr/afs/local/
+
+audobjs = audit.o
+
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I$(SRCDIR)include ${XCFLAGS}
+
+include ../config/Makefile.version
+
+noversion system: install
+
+UKSRCS = audit.h
+
+all:  libaudit.a 
+
+headers: audit.h
+       ${INSTALL} audit.h ${DESTDIR}include/afs
+
+install: ukinstall libaudit.a 
+       ${INSTALL} libaudit.a ${DESTDIR}lib/afs
+       ${INSTALL} audit.h ${DESTDIR}include/afs
+       case ${SYS_NAME} in \
+       rs_aix*) \
+          ${INSTALL} Audit              ${LOCALDIR}                     ;  \
+          ${INSTALL} objects.aix.sample ${LOCALDIR}audit/objects.sample ;  \
+          ${INSTALL} events.aix.sample  ${LOCALDIR}audit/events.sample  ;  \
+          ${INSTALL} config.aix.sample  ${LOCALDIR}audit/config.sample  ;; \
+        *) ;; \
+        esac ;
+
+
+kinstall:
+       @echo No $@ source here.
+
+ukinstall webinstall:
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+doc:
+       echo no documents in this directory
+
+libaudit.a: ${audobjs} AFS_component_version_number.o
+       rm -f libaudit.a
+       ar r libaudit.a ${audobjs} AFS_component_version_number.o
+       $(RANLIB) libaudit.a
+
+audit.o: audit.c audit.h 
+       ${CC} ${CFLAGS} -c audit.c
+
+clean:
+       rm -f *.o core AFS_component_version_number.c *.a
+
+beancount:
+       wc -l *.c *.h
+
diff --git a/src/auth/Makefile b/src/auth/Makefile
deleted file mode 100644 (file)
index 480ef3e..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=auth
-
-include ../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \
-    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
-KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \
-    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
-
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} 
-LDIRS= 
-LIBS= libauth.a ${DESTDIR}lib/afs/libsys.a \
-      ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
-      ${DESTDIR}lib/librx.a ${DESTDIR}lib/afs/libsys.a \
-      ${DESTDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
-INCLS=cellconfig.h auth.h keys.h # comauth.h
-KSRCS=auth.h
-UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
-       ktc.c authcon.c ktc_errors.c
-
-include ../config/Makefile.version
-
-system install noversion: install.noversion
-
-all: libauth.a libauth.krb.a setkey
-
-cellconfig.o: cellconfig.c ${INCLS}
-#comktc.o: comktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-#comvice.o: comvice.c ${INCLS}
-ktc.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-writeconfig.o: writeconfig.c ${INCLS}
-authcon.o: authcon.c ${INCLS}
-userok.o: userok.c ${INCLS}
-cellconfig.o: cellconfig.c ${INCLS}
-copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o
-setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
-#comauth.o: comauth.c ${INCLS} ${SRCDIR}include/afs/vice.h
-
-ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
-
-libauth.a: $(OBJS) AFS_component_version_number.o
-       -rm -f libauth.a
-       ar rv libauth.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libauth.a
-
-libauth.krb.a: $(KOBJS) AFS_component_version_number.o
-       -rm -f libauth.krb.a
-       ar rv libauth.krb.a $(KOBJS) AFS_component_version_number.o
-       $(RANLIB) libauth.krb.a
-
-copyauth: copyauth.o
-       $(CC) $(CFLAGS) $(LDIRS) -o copyauth copyauth.o ${LIBS}
-
-setkey: setkey.o
-       ${CC} $(CFLAGS) $(LDIRS) -o setkey setkey.o ${LIBS}
-
-acfg_errors.o: acfg_errors.c
-
-acfg_errors.c cellconfig.h: acfg_errors.et cellconfig.p.h
-       rm -f cellconfig.h acfg_errors.c; ${COMPILE_ET} acfg_errors -h cellconfig
-
-ktc_errors.o: ktc_errors.c
-
-ktc_errors.c auth.h: ktc_errors.et auth.p.h
-       rm -f auth.h ktc_errors.c; ${COMPILE_ET} ktc_errors -h auth
-
-test: 
-       cd test; $(MAKE)
-
-kinstall: ${KSRCS}
-       ${INSTALL} ${KSRCS} ${KERNELDIR}afs
-
-ukinstall webinstall: ${UKSRCS}
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-${DESTDIR}etc/copyauth: copyauth
-       ${INSTALL} copyauth ${DESTDIR}etc/copyauth
-
-install.noversion: all kinstall ukinstall ${DESTDIR}etc/copyauth
-       ${INSTALL} libauth.a ${DESTDIR}lib/afs/libauth.a
-       ${INSTALL} libauth.krb.a ${DESTDIR}lib/afs/libauth.krb.a
-       ${INSTALL} auth.h ${DESTDIR}include/afs
-#      ${INSTALL} comauth.h ${DESTDIR}include/afs
-       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
-       ${INSTALL} keys.h ${DESTDIR}include/afs
-
-includes: auth.h cellconfig.h keys.h
-       ${INSTALL} auth.h ${DESTDIR}include/afs
-       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
-       ${INSTALL} keys.h ${DESTDIR}include/afs
-
-clean:
-       rm -f *.o *.a copyauth testcellconf setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
-       AFS_component_version_number.c
diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
new file mode 100644 (file)
index 0000000..fa89271
--- /dev/null
@@ -0,0 +1,111 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+
+include ../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+COMPILE_ET = ${SRCDIR}bin/compile_et
+OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \
+    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
+KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \
+    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
+
+CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} 
+LDIRS= 
+LIBS= libauth.a ${DESTDIR}lib/afs/libsys.a \
+      ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
+      ${DESTDIR}lib/librx.a ${DESTDIR}lib/afs/libsys.a \
+      ${DESTDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
+INCLS=cellconfig.h auth.h keys.h # comauth.h
+KSRCS=auth.h
+UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
+       ktc.c authcon.c ktc_errors.c
+
+include ../config/Makefile.version
+
+system install noversion: install.noversion
+
+all: libauth.a libauth.krb.a setkey
+
+cellconfig.o: cellconfig.c ${INCLS}
+#comktc.o: comktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
+#comvice.o: comvice.c ${INCLS}
+ktc.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
+writeconfig.o: writeconfig.c ${INCLS}
+authcon.o: authcon.c ${INCLS}
+userok.o: userok.c ${INCLS}
+cellconfig.o: cellconfig.c ${INCLS}
+copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o
+setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
+#comauth.o: comauth.c ${INCLS} ${SRCDIR}include/afs/vice.h
+
+ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
+
+libauth.a: $(OBJS) AFS_component_version_number.o
+       -rm -f libauth.a
+       ar rv libauth.a $(OBJS) AFS_component_version_number.o
+       $(RANLIB) libauth.a
+
+libauth.krb.a: $(KOBJS) AFS_component_version_number.o
+       -rm -f libauth.krb.a
+       ar rv libauth.krb.a $(KOBJS) AFS_component_version_number.o
+       $(RANLIB) libauth.krb.a
+
+copyauth: copyauth.o
+       $(CC) $(CFLAGS) $(LDIRS) -o copyauth copyauth.o ${LIBS}
+
+setkey: setkey.o
+       ${CC} $(CFLAGS) $(LDIRS) -o setkey setkey.o ${LIBS}
+
+acfg_errors.o: acfg_errors.c
+
+acfg_errors.c cellconfig.h: acfg_errors.et cellconfig.p.h
+       rm -f cellconfig.h acfg_errors.c; ${COMPILE_ET} acfg_errors -h cellconfig
+
+ktc_errors.o: ktc_errors.c
+
+ktc_errors.c auth.h: ktc_errors.et auth.p.h
+       rm -f auth.h ktc_errors.c; ${COMPILE_ET} ktc_errors -h auth
+
+test: 
+       cd test; $(MAKE)
+
+kinstall: ${KSRCS}
+       ${INSTALL} ${KSRCS} ${KERNELDIR}afs
+
+ukinstall webinstall: ${UKSRCS}
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+${DESTDIR}etc/copyauth: copyauth
+       ${INSTALL} copyauth ${DESTDIR}etc/copyauth
+
+install.noversion: all kinstall ukinstall ${DESTDIR}etc/copyauth
+       ${INSTALL} libauth.a ${DESTDIR}lib/afs/libauth.a
+       ${INSTALL} libauth.krb.a ${DESTDIR}lib/afs/libauth.krb.a
+       ${INSTALL} auth.h ${DESTDIR}include/afs
+#      ${INSTALL} comauth.h ${DESTDIR}include/afs
+       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
+       ${INSTALL} keys.h ${DESTDIR}include/afs
+
+includes: auth.h cellconfig.h keys.h
+       ${INSTALL} auth.h ${DESTDIR}include/afs
+       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
+       ${INSTALL} keys.h ${DESTDIR}include/afs
+
+clean:
+       rm -f *.o *.a copyauth testcellconf setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
+       AFS_component_version_number.c
diff --git a/src/auth/test/Makefile b/src/auth/test/Makefile
deleted file mode 100644 (file)
index 81b5ae4..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-SRCDIR=
-DESTDIR=DEST/
-OPTIMIZE=-O
-
-INCDIRS= -I./ -I${DESTDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L${DESTDIR}lib/rx
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lauth -lsys -lrx -llwp ${utilib} ${XLIBS}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
-
-tests system all: testcellconf ktctest
-
-testcellconf: testcellconf.o 
-       $(CC) $(CFLAGS) -o testcellconf testcellconf.o  ${LIBS}
-
-ktctest: ktctest.o 
-       $(CC) $(CFLAGS) -o ktctest ktctest.o  ${LIBS}
-
-clean:
-       rm -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core
diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in
new file mode 100644 (file)
index 0000000..1f1ec5d
--- /dev/null
@@ -0,0 +1,34 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+SRCDIR=
+
+OPTIMIZE=-O
+
+INCDIRS= -I./ -I${DESTDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L${DESTDIR}lib/rx
+LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS}
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
+
+tests system all: testcellconf ktctest
+
+testcellconf: testcellconf.o 
+       $(CC) $(CFLAGS) -o testcellconf testcellconf.o  ${LIBS}
+
+ktctest: ktctest.o 
+       $(CC) $(CFLAGS) -o ktctest ktctest.o  ${LIBS}
+
+clean:
+       rm -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core
diff --git a/src/bozo/Makefile b/src/bozo/Makefile
deleted file mode 100644 (file)
index faed834..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=bozo
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET=$(SRCDIR)bin/compile_et
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
-INCLS=bnode.h ${RPCINCLS} ${SRCDIR}include/afs/auth.h \
-     ${SRCDIR}include/afs/keys.h  ${SRCDIR}include/afs/cellconfig.h \
-     ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/ktime.h
-
-auditlib=${SRCDIR}/lib/afs/libaudit.a
-
-#have to search libauth.a twice to get error stuff done right.
-# EH 12/18/90 - have to search librx.a twice on Ultrix 4.0
-LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
-     ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libkauth.a \
-     ${SRCDIR}lib/afs/libvolser.a \
-     ${SRCDIR}lib/afs/libvldb.a \
-     ${SRCDIR}lib/afs/libauth.a \
-     ${SRCDIR}lib/librxstat.a \
-     ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
-     ${SRCDIR}lib/librx.a \
-     ${SRCDIR}lib/libubik.a \
-     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-     ${SRCDIR}lib/afs/libsys.a \
-     ${SRCDIR}lib/afs/libprocmgmt.a
-
-OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \
-bosoprocs.o cronbnodeops.o
-
-LIBOBJS=bosint.xdr.o bosint.cs.o boserr.o
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: bosserver bos libbos.a
-
-$(OBJS) $(LIBOBJS): $(INCLS)
-
-bosint.ss.o: bosint.ss.c ${RPCINCLS}
-bosint.xdr.o: bosint.xdr.c ${RPCINCLS}
-bosint.cs.o: bosint.cs.c ${RPCINCLS}
-
-bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg
-       ${SRCDIR}bin/rxgen -x bosint.xg
-
-bnode.h boserr.c: bnode.p.h boserr.et
-       rm -f boserr.c bnode.h; $(COMPILE_ET) boserr -h bnode
-
-bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o
-
-cronbnodeops.o: cronbnodeops.c ${INCLS}
-
-bnode.o: bnode.c ${INCLS}
-
-bosoprocs.o: bosoprocs.c ${INCLS}
-
-bos.o: bos.c ${INCLS} AFS_component_version_number.o
-
-bos: bos.o $(LIBS) libbos.a
-       ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS)  ${XLIBS}
-
-ezbnodeops.o: ezbnodeops.c ${INCLS}
-
-fsbnodeops.o: fsbnodeops.c ${INCLS}
-
-libbos.a: $(LIBOBJS) AFS_component_version_number.o
-       -rm -f libbos.a
-       ${AR} r libbos.a ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) libbos.a
-
-bosserver: $(OBJS) $(LIBS)
-       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${auditlib} $(LIBS)  ${XLIBS} 
-
-system: install
-
-install: all
-       ${INSTALL} bosserver ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} bosint.h ${DESTDIR}include/afs/bosint.h
-       ${INSTALL} bos ${DESTDIR}bin
-       ${INSTALL} bos ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} libbos.a ${DESTDIR}lib/afs/libbos.a
-       ${INSTALL} bnode.h ${DESTDIR}include/afs/bnode.h
-
-clean:
-       rm -f  *.a *.o bos bosserver testproc bosint.cs.c bosint.ss.c bosint.xdr.c bosint.h core boserr.c bnode.h\
-       AFS_component_version_number.c
-
-test: 
-       cd test; $(MAKE) 
diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
new file mode 100644 (file)
index 0000000..b285ba5
--- /dev/null
@@ -0,0 +1,104 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET=$(SRCDIR)bin/compile_et
+CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
+INCLS=bnode.h ${RPCINCLS} ${SRCDIR}include/afs/auth.h \
+     ${SRCDIR}include/afs/keys.h  ${SRCDIR}include/afs/cellconfig.h \
+     ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/ktime.h
+
+auditlib=${SRCDIR}/lib/afs/libaudit.a
+
+#have to search libauth.a twice to get error stuff done right.
+# EH 12/18/90 - have to search librx.a twice on Ultrix 4.0
+LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
+     ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libkauth.a \
+     ${SRCDIR}lib/afs/libvolser.a \
+     ${SRCDIR}lib/afs/libvldb.a \
+     ${SRCDIR}lib/afs/libauth.a \
+     ${SRCDIR}lib/librxstat.a \
+     ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
+     ${SRCDIR}lib/librx.a \
+     ${SRCDIR}lib/libubik.a \
+     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
+     ${SRCDIR}lib/afs/libsys.a \
+     ${SRCDIR}lib/afs/libprocmgmt.a
+
+OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \
+bosoprocs.o cronbnodeops.o
+
+LIBOBJS=bosint.xdr.o bosint.cs.o boserr.o
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: bosserver bos libbos.a
+
+$(OBJS) $(LIBOBJS): $(INCLS)
+
+bosint.ss.o: bosint.ss.c ${RPCINCLS}
+bosint.xdr.o: bosint.xdr.c ${RPCINCLS}
+bosint.cs.o: bosint.cs.c ${RPCINCLS}
+
+bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg
+       ${SRCDIR}bin/rxgen -x bosint.xg
+
+bnode.h boserr.c: bnode.p.h boserr.et
+       rm -f boserr.c bnode.h; $(COMPILE_ET) boserr -h bnode
+
+bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o
+
+cronbnodeops.o: cronbnodeops.c ${INCLS}
+
+bnode.o: bnode.c ${INCLS}
+
+bosoprocs.o: bosoprocs.c ${INCLS}
+
+bos.o: bos.c ${INCLS} AFS_component_version_number.o
+
+bos: bos.o $(LIBS) libbos.a
+       ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS)  ${XLIBS}
+
+ezbnodeops.o: ezbnodeops.c ${INCLS}
+
+fsbnodeops.o: fsbnodeops.c ${INCLS}
+
+libbos.a: $(LIBOBJS) AFS_component_version_number.o
+       -rm -f libbos.a
+       ${AR} r libbos.a ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) libbos.a
+
+bosserver: $(OBJS) $(LIBS)
+       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${auditlib} $(LIBS)  ${XLIBS} 
+
+system: install
+
+install: all
+       ${INSTALL} bosserver ${DESTDIR}root.server/usr/afs/bin
+       ${INSTALL} bosint.h ${DESTDIR}include/afs/bosint.h
+       ${INSTALL} bos ${DESTDIR}bin
+       ${INSTALL} bos ${DESTDIR}root.server/usr/afs/bin
+       ${INSTALL} libbos.a ${DESTDIR}lib/afs/libbos.a
+       ${INSTALL} bnode.h ${DESTDIR}include/afs/bnode.h
+
+clean:
+       rm -f  *.a *.o bos bosserver testproc bosint.cs.c bosint.ss.c bosint.xdr.c bosint.h core boserr.c bnode.h\
+       AFS_component_version_number.c
+
+test: 
+       cd test; $(MAKE) 
diff --git a/src/bozo/test/Makefile b/src/bozo/test/Makefile
deleted file mode 100644 (file)
index 4e43f3b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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
-
-SRCDIR=
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-system:        testproc smail-notifier
-
-testproc: testproc.c 
-       $(CC) $(CFLAGS) -o testproc testproc.c
-
-smail-notifier: smail-notifier.c 
-       $(CC) $(CFLAGS) -o smail-notifier smail-notifier.c
-
-clean:
-       rm -f  *.a *.o testproc smail-notifier core
-
diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in
new file mode 100644 (file)
index 0000000..e1dad6e
--- /dev/null
@@ -0,0 +1,33 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SRCDIR=
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+system:        testproc smail-notifier
+
+testproc: testproc.c 
+       $(CC) $(CFLAGS) -o testproc testproc.c
+
+smail-notifier: smail-notifier.c 
+       $(CC) $(CFLAGS) -o smail-notifier smail-notifier.c
+
+clean:
+       rm -f  *.a *.o testproc smail-notifier core
+
diff --git a/src/bu_utils/Makefile b/src/bu_utils/Makefile
deleted file mode 100644 (file)
index 717aacd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=bu_utils
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET = ${DESTDIR}/bin/compile_et
-CFLAGS= -g -w -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
-LDFLAGS = ${XLDFLAGS}
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: fms
-
-FMSOBJS = fms.o
-FMSLIBS=${DESTDIR}lib/afs/libcmd.a \
-       ${TXLIBS} \
-        $(SRCDIR)lib/afs/libusd.a \
-       $(SRCDIR)lib/afs/libtermlib.a ${XLIBS} \
-       $(SRCDIR)lib/afs/util.a
-
-fms:   ${FMSOBJS}
-       ${CC} ${LDFLAGS} -o fms ${FMSOBJS} ${FMSLIBS}
-
-fms.o:  fms.c AFS_component_version_number.o
-
-#
-# global operations 
-#
-
-system:        install
-
-install:       all
-       ${INSTALL} fms ${DESTDIR}etc
-
-clean:
-       rm -f *.o fms AFS_component_version_number.c
diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in
new file mode 100644 (file)
index 0000000..07ccfc1
--- /dev/null
@@ -0,0 +1,50 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET = ${DESTDIR}/bin/compile_et
+CFLAGS= -g -w -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: fms
+
+FMSOBJS = fms.o
+FMSLIBS=${DESTDIR}lib/afs/libcmd.a \
+       ${TXLIBS} \
+        $(SRCDIR)lib/afs/libusd.a \
+       $(SRCDIR)lib/afs/libtermlib.a ${XLIBS} \
+       $(SRCDIR)lib/afs/util.a
+
+fms:   ${FMSOBJS}
+       ${CC} ${LDFLAGS} -o fms ${FMSOBJS} ${FMSLIBS}
+
+fms.o:  fms.c AFS_component_version_number.o
+
+#
+# global operations 
+#
+
+system:        install
+
+install:       all
+       ${INSTALL} fms ${DESTDIR}etc
+
+clean:
+       rm -f *.o fms AFS_component_version_number.c
diff --git a/src/bubasics/Makefile b/src/bubasics/Makefile
deleted file mode 100644 (file)
index 237e23c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=bubasics
-include ../config/Makefile.${SYS_NAME}
-
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: libbubasics.a bumon.h butc.h bubasics.h tcdata.h butm.h
-
-OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o
-
-libbubasics.a: $(OBJS) AFS_component_version_number.o
-       -rm -f libbubasics.a
-       ar r libbubasics.a ${OBJS} AFS_component_version_number.o
-       ${RANLIB} libbubasics.a
-
-butc.xdr.c butc.ss.c butc.cs.c butc.h: butc.xg
-       ${RXGEN} butc.xg
-
-bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg
-       ${RXGEN} bumon.xg
-
-butm_errs.c butm.h: butm_errs.et butm.p.h
-       rm -f butm.h butm_errs.c; ${COMPILE_ET} butm_errs -h butm
-
-butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
-       rm -f tcdata.h butc_errs.c; ${COMPILE_ET} butc_errs -h tcdata
-
-butx_errs.c butx.h: butx_errs.et
-       rm -f butx.h butx_errs.c; ${COMPILE_ET} butx_errs -h butx
-
-system: install
-
-${DESTDIR}lib/afs/libbubasics.a: libbubasics.a 
-       ${INSTALL}   $? $@
-
-
-install: all ${DESTDIR}lib/afs/libbubasics.a
-       ${INSTALL} bubasics.h butc.h bumon.h butm.h butx.h tcdata.h ${DESTDIR}include/afs
-
-clean:
-       -rm -f *.o *.a *.xdr.c *.ss.c *.cs.c \
-butc.h butx.h butm.h bumon.h tcdata.h \
-butc_errs.c butx_errs.c butm_errs.c \
-core AFS_component_version_number.c
diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
new file mode 100644 (file)
index 0000000..8b3f2c6
--- /dev/null
@@ -0,0 +1,63 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: libbubasics.a bumon.h butc.h bubasics.h tcdata.h butm.h
+
+OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o
+
+libbubasics.a: $(OBJS) AFS_component_version_number.o
+       -rm -f libbubasics.a
+       ar r libbubasics.a ${OBJS} AFS_component_version_number.o
+       ${RANLIB} libbubasics.a
+
+butc.xdr.c butc.ss.c butc.cs.c butc.h: butc.xg
+       ${RXGEN} butc.xg
+
+bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg
+       ${RXGEN} bumon.xg
+
+butm_errs.c butm.h: butm_errs.et butm.p.h
+       rm -f butm.h butm_errs.c; ${COMPILE_ET} butm_errs -h butm
+
+butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
+       rm -f tcdata.h butc_errs.c; ${COMPILE_ET} butc_errs -h tcdata
+
+butx_errs.c butx.h: butx_errs.et
+       rm -f butx.h butx_errs.c; ${COMPILE_ET} butx_errs -h butx
+
+system: install
+
+${DESTDIR}lib/afs/libbubasics.a: libbubasics.a 
+       ${INSTALL}   $? $@
+
+
+install: all ${DESTDIR}lib/afs/libbubasics.a
+       ${INSTALL} bubasics.h butc.h bumon.h butm.h butx.h tcdata.h ${DESTDIR}include/afs
+
+clean:
+       -rm -f *.o *.a *.xdr.c *.ss.c *.cs.c \
+butc.h butx.h butm.h bumon.h tcdata.h \
+butc_errs.c butx_errs.c butm_errs.c \
+core AFS_component_version_number.c
diff --git a/src/bucoord/Makefile b/src/bucoord/Makefile
deleted file mode 100644 (file)
index 131686f..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=bucoord
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
-
-#LIBS=${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libbubasics.a \
-#${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-#$(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a
-
-LIBS=${SRCDIR}lib/afs/libbudb.a ${SRCDIR}lib/afs/libbubasics.a \
-        ${SRCDIR}lib/afs/libbutm.a ${SRCDIR}lib/afs/libvolser.a \
-        ${SRCDIR}lib/afs/libvldb.a  ${SRCDIR}lib/afs/vlib.a \
-        ${SRCDIR}lib/afs/libkauth.a ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a  ${SRCDIR}lib/librxkad.a \
-        ${SRCDIR}lib/afs/libsys.a   ${SRCDIR}lib/libdes.a \
-        ${SRCDIR}lib/librx.a  ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a 
-
-INCLS=bc.h ${SRCDIR}include/afs/butc.h
-RXGEN=${SRCDIR}bin/rxgen
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: backup libbxdb.a 
-
-libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o
-       -rm -f libbxdb.a
-       ${AR} r libbxdb.a dsstub.o ubik_db_if.o status.o dlq.o \
-               bucoord_errs.o volstub.o AFS_component_version_number.o
-       ${RANLIB} libbxdb.a
-
-ttest: ttest.o ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a libbxdb.a
-       ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \
-               ${SRCDIR}lib/afs/libbubasics.a \
-${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
-
-ttest.o: AFS_component_version_number.c
-
-btest: btest.o ${SRCDIR}lib/afs/libbubasics.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/liblwp.a
-       ${CC} ${CFLAGS} -o btest btest.o ${SRCDIR}lib/afs/libbubasics.a \
-               ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
-
-btest.o: AFS_component_version_number.c
-
-BACKSRCS = main.c config.c dsstub.c volstub.c commands.c regex.c server.c \
-       dsvs.c dump.c restore.c ubik_db_if.c                              \
-       dump_sched.c vol_sets.c tape_hosts.c                              \
-       bc_status.c status.c dlq.c
-
-BACKOBJS = main.o config.o dsstub.o volstub.o commands.o regex.o server.o \
-       dsvs.o dump.o restore.o ubik_db_if.o dump_sched.o vol_sets.o    \
-       tape_hosts.o bucoord_errs.o bc_status.o status.o dlq.o
-
-main.o: AFS_component_version_number.c
-
-$(BACKOBJS): $(INCLS)
-
-backup:  $(BACKOBJS) ${LIBS}
-       ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS}
-
-bucoord_errs.c bc.h:   bucoord_errs.et bc.p.h
-       rm -f bc.h bucoord_errs.c
-       ${COMPILE_ET} bucoord_errs -h bc
-
-system: install
-
-install: all
-       ${INSTALL} libbxdb.a ${DESTDIR}lib/afs
-       ${INSTALL} backup ${DESTDIR}etc
-
-clean:
-       rm -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c
-
-lint:
-       lint -IDEST/include -IDEST/include/afs *.h *.c
-
-cxref:
-       cxref $(CFLAGS) $(BACKSRCS) > cxref.out
diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
new file mode 100644 (file)
index 0000000..968574a
--- /dev/null
@@ -0,0 +1,98 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+
+#LIBS=${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libbubasics.a \
+#${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
+#$(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a
+
+LIBS=${SRCDIR}lib/afs/libbudb.a ${SRCDIR}lib/afs/libbubasics.a \
+        ${SRCDIR}lib/afs/libbutm.a ${SRCDIR}lib/afs/libvolser.a \
+        ${SRCDIR}lib/afs/libvldb.a  ${SRCDIR}lib/afs/vlib.a \
+        ${SRCDIR}lib/afs/libkauth.a ${SRCDIR}lib/libubik.a \
+        ${SRCDIR}lib/afs/libauth.a  ${SRCDIR}lib/librxkad.a \
+        ${SRCDIR}lib/afs/libsys.a   ${SRCDIR}lib/libdes.a \
+        ${SRCDIR}lib/librx.a  ${SRCDIR}lib/afs/libsys.a \
+        ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
+        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a 
+
+INCLS=bc.h ${SRCDIR}include/afs/butc.h
+RXGEN=${SRCDIR}bin/rxgen
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: backup libbxdb.a 
+
+libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o
+       -rm -f libbxdb.a
+       ${AR} r libbxdb.a dsstub.o ubik_db_if.o status.o dlq.o \
+               bucoord_errs.o volstub.o AFS_component_version_number.o
+       ${RANLIB} libbxdb.a
+
+ttest: ttest.o ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a libbxdb.a
+       ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \
+               ${SRCDIR}lib/afs/libbubasics.a \
+${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
+
+ttest.o: AFS_component_version_number.c
+
+btest: btest.o ${SRCDIR}lib/afs/libbubasics.a ${SRCDIR}lib/librx.a \
+               ${SRCDIR}lib/liblwp.a
+       ${CC} ${CFLAGS} -o btest btest.o ${SRCDIR}lib/afs/libbubasics.a \
+               ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
+
+btest.o: AFS_component_version_number.c
+
+BACKSRCS = main.c config.c dsstub.c volstub.c commands.c regex.c server.c \
+       dsvs.c dump.c restore.c ubik_db_if.c                              \
+       dump_sched.c vol_sets.c tape_hosts.c                              \
+       bc_status.c status.c dlq.c
+
+BACKOBJS = main.o config.o dsstub.o volstub.o commands.o regex.o server.o \
+       dsvs.o dump.o restore.o ubik_db_if.o dump_sched.o vol_sets.o    \
+       tape_hosts.o bucoord_errs.o bc_status.o status.o dlq.o
+
+main.o: AFS_component_version_number.c
+
+$(BACKOBJS): $(INCLS)
+
+backup:  $(BACKOBJS) ${LIBS}
+       ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS}
+
+bucoord_errs.c bc.h:   bucoord_errs.et bc.p.h
+       rm -f bc.h bucoord_errs.c
+       ${COMPILE_ET} bucoord_errs -h bc
+
+system: install
+
+install: all
+       ${INSTALL} libbxdb.a ${DESTDIR}lib/afs
+       ${INSTALL} backup ${DESTDIR}etc
+
+clean:
+       rm -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c
+
+lint:
+       lint -IDEST/include -IDEST/include/afs *.h *.c
+
+cxref:
+       cxref $(CFLAGS) $(BACKSRCS) > cxref.out
diff --git a/src/budb/Makefile b/src/budb/Makefile
deleted file mode 100644 (file)
index 836b0c2..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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
-
-# */
-
-
-SHELL = /bin/sh
-COMPONENT=budb
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET = ${SRCDIR}bin/compile_et
-RXGEN=${SRCDIR}bin/rxgen
-
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
-INCLS= \
-       ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/des.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/com_err.h \
-       ${SRCDIR}include/afs/bubasics.h \
-       budb.h budb_client.h database.h
-
-audlib=${SRCDIR}lib/afs/libaudit.a
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-kauthlib=${SRCDIR}lib/afs/libkauth.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-ubiklib=${SRCDIR}lib/libubik.a
-
-# library ordering defined by top level makefile
-
-LIBS= ${SRCDIR}lib/afs/libbubasics.a \
-       ${audlib}                    \
-        ${SRCDIR}lib/afs/libprot.a      \
-        ${kauthlib} \
-        ${ubiklib} \
-        ${authlib} \
-        ${rxkadlib} \
-        ${SRCDIR}lib/afs/libsys.a \
-        ${deslib} \
-        ${SRCDIR}lib/librx.a \
-        ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/liblwp.a \
-        ${cmdlib} ${SRCDIR}lib/afs/libcom_err.a \
-        ${utilib} 
-
-COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o \
-       ol_verify.o
-
-SERVER_OBJS = ${COMMON_OBJS} \
-       budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o procs.o server.o budb_errs.o
-
-LIB_BUDB_OBJS = budb_errs.o budb.cs.o budb.xdr.o struct_ops.o
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: budb_server libbudb.a
-
-clean:
-       rm -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
-               *.ss.c *.cs.c core budb_server AFS_component_version_number.c
-
-budb_errs.o: budb_errs.c
-
-budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
-       rm -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client
-
-budb_errs.h: budb_errs.et
-       ${COMPILE_ET} budb_errs
-
-database.o: database.c budb_errs.h globals.h ${INCLS}
-db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
-dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS}
-db_lock.o:  db_lock.c budb_errs.h ${INCLS}
-db_text.o:  db_text.c budb_errs.h ${INCLS}
-db_hash.o: db_hash.c budb_errs.h ${INCLS}
-ol_verify.o:   ol_verify.c budb_errs.h ${INCLS}
-procs.o: procs.c budb_errs.h globals.h ${INCLS}
-server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
-
-# database verification and rebuild
-
-budb_server: $(SERVER_OBJS) ${LIBS}
-       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
-
-budb.xdr.c budb.cs.c budb.ss.c budb.h: budb.rg
-       ${RXGEN} budb.rg
-
-libbudb.a: ${LIB_BUDB_OBJS} AFS_component_version_number.o
-       -rm -f libbudb.a
-       ${AR} rv libbudb.a $(LIB_BUDB_OBJS) AFS_component_version_number.o
-       ${RANLIB} libbudb.a
-
-system: install
-install: all ${DESTDIR}lib/afs/libbudb.a ${DESTDIR}include/afs/budb.h ${DESTDIR}include/afs/budb_errs.h ${DESTDIR}include/afs/budb_client.h ${DESTDIR}root.server/usr/afs/bin/buserver
-
-${DESTDIR}lib/afs/libbudb.a: libbudb.a
-       ${INSTALL}  $? $@
-
-${DESTDIR}include/afs/budb.h: budb.h
-       ${INSTALL}  $? $@
-
-${DESTDIR}include/afs/budb_errs.h: budb_errs.h
-       ${INSTALL}  $? $@
-
-${DESTDIR}include/afs/budb_client.h: budb_client.h
-       ${INSTALL}  $? $@
-
-${DESTDIR}root.server/usr/afs/bin/buserver: budb_server
-       ${INSTALL} -f $? $@
diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
new file mode 100644 (file)
index 0000000..6bb2e0c
--- /dev/null
@@ -0,0 +1,120 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET = ${SRCDIR}bin/compile_et
+RXGEN=${SRCDIR}bin/rxgen
+
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = -g ${XLDFLAGS}
+INCLS= \
+       ${SRCDIR}include/lock.h \
+       ${SRCDIR}include/ubik.h \
+       ${SRCDIR}include/lwp.h \
+       ${SRCDIR}include/des.h \
+       ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h \
+       ${SRCDIR}include/rx/rxkad.h \
+       ${SRCDIR}include/afs/auth.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/afs/com_err.h \
+       ${SRCDIR}include/afs/bubasics.h \
+       budb.h budb_client.h database.h
+
+# library ordering defined by top level makefile
+LIBS= ${SRCDIR}lib/afs/libbubasics.a \
+       ${SRCDIR}lib/afs/libaudit.a \
+       ${SRCDIR}lib/afs/libprot.a \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a
+
+COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o \
+       ol_verify.o
+
+SERVER_OBJS = ${COMMON_OBJS} \
+       budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o procs.o server.o budb_errs.o
+
+LIB_BUDB_OBJS = budb_errs.o budb.cs.o budb.xdr.o struct_ops.o
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: budb_server libbudb.a
+
+clean:
+       rm -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
+               *.ss.c *.cs.c core budb_server AFS_component_version_number.c
+
+budb_errs.o: budb_errs.c
+
+budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
+       rm -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client
+
+budb_errs.h: budb_errs.et
+       ${COMPILE_ET} budb_errs
+
+database.o: database.c budb_errs.h globals.h ${INCLS}
+db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
+dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS}
+db_lock.o:  db_lock.c budb_errs.h ${INCLS}
+db_text.o:  db_text.c budb_errs.h ${INCLS}
+db_hash.o: db_hash.c budb_errs.h ${INCLS}
+ol_verify.o:   ol_verify.c budb_errs.h ${INCLS}
+procs.o: procs.c budb_errs.h globals.h ${INCLS}
+server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
+
+# database verification and rebuild
+
+budb_server: $(SERVER_OBJS) ${LIBS}
+       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
+
+budb.xdr.c budb.cs.c budb.ss.c budb.h: budb.rg
+       ${RXGEN} budb.rg
+
+libbudb.a: ${LIB_BUDB_OBJS} AFS_component_version_number.o
+       -rm -f libbudb.a
+       ${AR} rv libbudb.a $(LIB_BUDB_OBJS) AFS_component_version_number.o
+       ${RANLIB} libbudb.a
+
+system: install
+install: all ${DESTDIR}lib/afs/libbudb.a ${DESTDIR}include/afs/budb.h ${DESTDIR}include/afs/budb_errs.h ${DESTDIR}include/afs/budb_client.h ${DESTDIR}root.server/usr/afs/bin/buserver
+
+${DESTDIR}lib/afs/libbudb.a: libbudb.a
+       ${INSTALL}  $? $@
+
+${DESTDIR}include/afs/budb.h: budb.h
+       ${INSTALL}  $? $@
+
+${DESTDIR}include/afs/budb_errs.h: budb_errs.h
+       ${INSTALL}  $? $@
+
+${DESTDIR}include/afs/budb_client.h: budb_client.h
+       ${INSTALL}  $? $@
+
+${DESTDIR}root.server/usr/afs/bin/buserver: budb_server
+       ${INSTALL} -f $? $@
diff --git a/src/butc/Makefile b/src/butc/Makefile
deleted file mode 100644 (file)
index 19a4701..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=butc
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs \
-       -I${SRCDIR}include/rx -I${SRCDIR}include
-
-INCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
-       ${SRCDIR}include/afs/vlserver.h ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h ${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/butc.h \
-       ${SRCDIR}include/afs/tcdata.h ${SRCDIR}include/afs/bubasics.h \
-       ${SRCDIR}include/afs/butm.h
-
-HACKS=${SRCDIR}lib/afs/libdir.a
-
-INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
-
-LIBS=${SRCDIR}lib/afs/libbudb.a \
-       $(SRCDIR)/lib/afs/libbxdb.a \
-       ${SRCDIR}lib/afs/libbubasics.a \
-        ${SRCDIR}lib/afs/libbutm.a \
-       ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/afs/vlib.a \
-       ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libprot.a      \
-        ${SRCDIR}lib/afs/libkauth.a \
-        ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-        ${SRCDIR}lib/afs/libsys.a  \
-        ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librx.a \
-        ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a \
-        ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libusd.a \
-       ${SRCDIR}lib/afs/libprocmgmt.a
-
-TESTOBJS=test.o
-
-SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \
-       dump.o tcstatus.o
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: butc read_tape
-
-butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS}
-       ${CC}  ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test
-
-tdump: tdump.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} tdump.c -o tdump
-
-butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
-       @case ${SYS_NAME} in \
-         rs_aix4*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \
-         *)        ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} -o butc;; \
-       esac
-
-tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c
-dbentries.o: dbentries.c ${INCLS}
-tcprocs.o: tcprocs.c ${INCLS}
-test.o: test.c ${INCLS} AFS_component_version_number.c
-lwps.o: lwps.c ${INCLS}
-list.o: list.c ${INCLS}
-recoverDb.o: recoverDb.c ${INCLS}
-tcudbprocs.o: tcudbprocs.c ${INCLS}
-dump.o: dump.c ${INCLS}
-tcstatus.o: tcstatus.c ${INCLS}
-
-read_tape: read_tape.c
-       ${CC} ${CFLAGS} -o read_tape read_tape.c \
-               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a \
-               ${SRCDIR}lib/afs/libusd.a
-       ${INSTALL} read_tape ${SRCDIR}etc
-
-clean:
-       rm -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c
-
-system: install
-install install.noversion: all
-       @case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \
-               echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
-       *) \
-               echo ${INSTALL} butc ${DESTDIR}etc/butc ; \
-               ${INSTALL} butc ${DESTDIR}etc/butc ;; \
-       esac
-
-lint:  tcmain.c dbentries.c tcprocs.c test.c lwps.c list.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcmain.c
-       lint -hb ${INCDIRS} ${INCLIBS} dbentries.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} lwps.c
-       lint -hb ${INCDIRS} ${INCLIBS} list.c
-       lint -hb ${INCDIRS} ${INCLIBS} test.c
-       lint -hb ${INCDIRS} ${INCLIBS} recoverDb.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcudbprocs.c
diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
new file mode 100644 (file)
index 0000000..78e742e
--- /dev/null
@@ -0,0 +1,120 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs \
+       -I${SRCDIR}include/rx -I${SRCDIR}include
+
+INCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
+       ${SRCDIR}include/afs/vlserver.h ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h ${SRCDIR}include/afs/keys.h \
+       ${SRCDIR}include/afs/cellconfig.h ${SRCDIR}include/ubik.h \
+       ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/butc.h \
+       ${SRCDIR}include/afs/tcdata.h ${SRCDIR}include/afs/bubasics.h \
+       ${SRCDIR}include/afs/butm.h
+
+HACKS=${SRCDIR}lib/afs/libdir.a
+
+INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
+
+LIBS=${SRCDIR}lib/afs/libbudb.a \
+       $(SRCDIR)/lib/afs/libbxdb.a \
+       ${SRCDIR}lib/afs/libbubasics.a \
+        ${SRCDIR}lib/afs/libbutm.a \
+       ${SRCDIR}lib/afs/libvolser.a \
+       ${SRCDIR}lib/afs/libvldb.a \
+        ${SRCDIR}lib/afs/vlib.a \
+       ${SRCDIR}/lib/afs/libacl.a \
+        ${SRCDIR}lib/afs/libprot.a      \
+        ${SRCDIR}lib/afs/libkauth.a \
+        ${SRCDIR}lib/libubik.a \
+        ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+        ${SRCDIR}lib/afs/libsys.a  \
+        ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/librx.a \
+        ${SRCDIR}lib/afs/libsys.a  \
+       ${SRCDIR}lib/liblwp.a \
+        ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a \
+       ${SRCDIR}lib/afs/libusd.a \
+       ${SRCDIR}lib/afs/libprocmgmt.a
+
+TESTOBJS=test.o
+
+SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \
+       dump.o tcstatus.o
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: butc read_tape
+
+butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS}
+       ${CC}  ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test
+
+tdump: tdump.c AFS_component_version_number.c
+       ${CC} ${CFLAGS} tdump.c -o tdump
+
+butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
+       @case ${SYS_NAME} in \
+         rs_aix4*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \
+         *)        ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} -o butc;; \
+       esac
+
+tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c
+dbentries.o: dbentries.c ${INCLS}
+tcprocs.o: tcprocs.c ${INCLS}
+test.o: test.c ${INCLS} AFS_component_version_number.c
+lwps.o: lwps.c ${INCLS}
+list.o: list.c ${INCLS}
+recoverDb.o: recoverDb.c ${INCLS}
+tcudbprocs.o: tcudbprocs.c ${INCLS}
+dump.o: dump.c ${INCLS}
+tcstatus.o: tcstatus.c ${INCLS}
+
+read_tape: read_tape.c
+       ${CC} ${CFLAGS} -o read_tape read_tape.c \
+               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a \
+               ${SRCDIR}lib/afs/libusd.a
+       ${INSTALL} read_tape ${SRCDIR}etc
+
+clean:
+       rm -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c
+
+system: install
+install install.noversion: all
+       @case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \
+               echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
+       *) \
+               echo ${INSTALL} butc ${DESTDIR}etc/butc ; \
+               ${INSTALL} butc ${DESTDIR}etc/butc ;; \
+       esac
+
+lint:  tcmain.c dbentries.c tcprocs.c test.c lwps.c list.c
+       lint -hb ${INCDIRS} ${INCLIBS} tcmain.c
+       lint -hb ${INCDIRS} ${INCLIBS} dbentries.c
+       lint -hb ${INCDIRS} ${INCLIBS} tcprocs.c
+       lint -hb ${INCDIRS} ${INCLIBS} lwps.c
+       lint -hb ${INCDIRS} ${INCLIBS} list.c
+       lint -hb ${INCDIRS} ${INCLIBS} test.c
+       lint -hb ${INCDIRS} ${INCLIBS} recoverDb.c
+       lint -hb ${INCDIRS} ${INCLIBS} tcudbprocs.c
diff --git a/src/butm/Makefile b/src/butm/Makefile
deleted file mode 100644 (file)
index 2a6a5f0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
-
-# */
-
-SHELL = /bin/sh
-SRCDIR=DEST/
-DESTDIR=DEST/
-
-CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
-INCLS= ${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
-
-LIBS=${SRCDIR}lib/afs/libbubasics.a \
-${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libusd.a \
-${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libbutm.a \
-${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${XLIBS}
-
-OBJS=file_tm.o 
-
-COMPONENT=butm
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-noversion: install
-
-all: libbutm.a 
-
-clean:
-       rm -f *.o *.a core test_ftm AFS_component_version_number.c
-
-file_tm.o: file_tm.c ${INCLS}
-
-test_ftm.o: test_ftm.c ${INCLS} AFS_component_version_number.c
-
-test_ftm: test_ftm.o libbutm.a
-       ${CC} ${LDFLAGS} -o test_ftm test_ftm.o libbutm.a ${LIBS}
-
-libbutm.a: ${OBJS} AFS_component_version_number.o
-       -rm -f libbutm.a
-       ${AR} rv libbutm.a $(OBJS) AFS_component_version_number.o
-       ${RANLIB} libbutm.a
-
-${DESTDIR}lib/afs/libbutm.a: libbutm.a
-       ${INSTALL}   $? $@
-
-system: install
-install install.noversion: all ${DESTDIR}lib/afs/libbutm.a
-
-test: test_ftm
-       echo 'Usage: ./test_ftm -conf config -tape xxx *'
-
-
diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in
new file mode 100644 (file)
index 0000000..f0a55b0
--- /dev/null
@@ -0,0 +1,60 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = -g ${XLDFLAGS}
+INCLS= ${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
+
+LIBS=${SRCDIR}lib/afs/libbubasics.a \
+${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libusd.a \
+${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libbutm.a \
+${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${XLIBS}
+
+OBJS=file_tm.o 
+
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+noversion: install
+
+all: libbutm.a 
+
+clean:
+       rm -f *.o *.a core test_ftm AFS_component_version_number.c
+
+file_tm.o: file_tm.c ${INCLS}
+
+test_ftm.o: test_ftm.c ${INCLS} AFS_component_version_number.c
+
+test_ftm: test_ftm.o libbutm.a
+       ${CC} ${LDFLAGS} -o test_ftm test_ftm.o libbutm.a ${LIBS}
+
+libbutm.a: ${OBJS} AFS_component_version_number.o
+       -rm -f libbutm.a
+       ${AR} rv libbutm.a $(OBJS) AFS_component_version_number.o
+       ${RANLIB} libbutm.a
+
+${DESTDIR}lib/afs/libbutm.a: libbutm.a
+       ${INSTALL}   $? $@
+
+system: install
+install install.noversion: all ${DESTDIR}lib/afs/libbutm.a
+
+test: test_ftm
+       echo 'Usage: ./test_ftm -conf config -tape xxx *'
+
+
diff --git a/src/cmd/Makefile b/src/cmd/Makefile
deleted file mode 100644 (file)
index 9f0107f..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
-
-# */
-
-SHELL = /bin/sh
-COMPONENT=cmd
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-INCLS=cmd.h ${XINCLS}
-LIBOBJS=cmd_errors.o cmd.o 
-LIB64OBJS=cmd_errors64.o cmd64.o 
-
-CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-include ../config/Makefile.version
-
-system install noversion: install.noversion
-
-all: libcmd.a
-
-test tests: 
-       (cd test; $(MAKE) )
-
-cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
-       rm -f cmd.h cmd_errors.c; ${COMPILE_ET} cmd_errors -h cmd
-
-cmd_errors.o: cmd_errors.c
-
-cmd.o: cmd.c ${INCLS}
-
-AFS_component_version_number64.o: AFS_component_version_number.c
-       ${CC} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c
-
-cmd_errors64.o: cmd_errors.c
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
-
-cmd64.o: cmd.c ${INCLS}
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd64.o cmd.c
-
-
-libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
-       -rm -f libcmd64.a
-       $(AR) r libcmd64.a ${LIB64OBJS} AFS_component_version_number64.o
-       $(RANLIB) libcmd64.a
-
-libcmd.a: ${LIBOBJS} AFS_component_version_number.o
-       -rm -f libcmd.a
-       $(AR) r libcmd.a ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) libcmd.a
-
-kinstall:
-       @echo No kernel source here.
-
-ukinstall webinstall: install
-
-install64: libcmd64.a
-       ${INSTALL} libcmd64.a  ${DESTDIR}lib/afs/libcmd64.a
-       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
-
-install.noversion: all
-       ${INSTALL} libcmd.a ${DESTDIR}lib/afs/libcmd.a
-       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
-
-clean:
-       rm -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
-
diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
new file mode 100644 (file)
index 0000000..ee22499
--- /dev/null
@@ -0,0 +1,77 @@
+# 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
+
+# */
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+INCLS=cmd.h ${XINCLS}
+LIBOBJS=cmd_errors.o cmd.o 
+LIB64OBJS=cmd_errors64.o cmd64.o 
+
+CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+include ../config/Makefile.version
+
+system install noversion: install.noversion
+
+all: libcmd.a
+
+test tests: 
+       (cd test; $(MAKE) )
+
+cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
+       rm -f cmd.h cmd_errors.c; ${COMPILE_ET} cmd_errors -h cmd
+
+cmd_errors.o: cmd_errors.c
+
+cmd.o: cmd.c ${INCLS}
+
+AFS_component_version_number64.o: AFS_component_version_number.c
+       ${CC} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c
+
+cmd_errors64.o: cmd_errors.c
+       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
+
+cmd64.o: cmd.c ${INCLS}
+       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd64.o cmd.c
+
+
+libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
+       -rm -f libcmd64.a
+       $(AR) r libcmd64.a ${LIB64OBJS} AFS_component_version_number64.o
+       $(RANLIB) libcmd64.a
+
+libcmd.a: ${LIBOBJS} AFS_component_version_number.o
+       -rm -f libcmd.a
+       $(AR) r libcmd.a ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) libcmd.a
+
+kinstall:
+       @echo No kernel source here.
+
+ukinstall webinstall: install
+
+install64: libcmd64.a
+       ${INSTALL} libcmd64.a  ${DESTDIR}lib/afs/libcmd64.a
+       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
+
+install.noversion: all
+       ${INSTALL} libcmd.a ${DESTDIR}lib/afs/libcmd.a
+       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
+
+clean:
+       rm -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
+
diff --git a/src/cmd/test/Makefile b/src/cmd/test/Makefile
deleted file mode 100644 (file)
index 68b235d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-DESTDIR=DEST/
-SRCDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. L${BACKDIR}lib -L${BACKDIR}lib/afs
-LIBS=-lcmd -lcom_err ${DESTDIR}lib/afs/util.a
-
-INCDIRS=  -I${SRCDIR}include -I${SRCDIR}include/afs -I.. -I${BACKDIR}include -I${BACKDIR}include/afs
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-all: test
-test tests: ctest dtest itest
-
-itest: itest.o 
-       cc ${CFLAGS} -o itest itest.o 
-
-ctest: ctest.o
-       cc ${CFLAGS} -o ctest ctest.o 
-
-dtest: dtest.o
-       cc ${CFLAGS} -o dtest dtest.o 
-
-system: test
-
-kinstall:
-       @echo No kernel source here.
-
-clean:
-       rm -f  *.a *.o ctest dtest itest core
-
diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
new file mode 100644 (file)
index 0000000..ccae8f9
--- /dev/null
@@ -0,0 +1,45 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS=-lcmd -lcom_err -lafsutil
+
+INCDIRS=  -I${SRCDIR}include -I${SRCDIR}include/afs -I.. -I${BACKDIR}include -I${BACKDIR}include/afs
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+all: test
+test tests: ctest dtest itest
+
+itest: itest.o 
+       cc ${CFLAGS} -o itest itest.o 
+
+ctest: ctest.o
+       cc ${CFLAGS} -o ctest ctest.o 
+
+dtest: dtest.o
+       cc ${CFLAGS} -o 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 b/src/comerr/Makefile
deleted file mode 100644 (file)
index 4070a4b..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Makefile for error-table routines
-#
-# Copyright 1987, 1989 MIT Student Information Processing Board
-# For copyright info, see mit-sipb-cr.h.
-#
-#      $Locker$
-#
-
-SHELL = /bin/sh
-COMPONENT=comerr
-include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-LINTFLAGS= -uhvpb
-LINTFILES= error_msg.c et_name.c com_err.c
-LIBOBJS= error_msg.o et_name.o com_err.o
-
-UKERNELDIR=../libuafs/
-
-CFLAGS= ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
-FILES= Makefile et_name.c error_msg.c compile_et.c \
-               error_table.y et_lex.lex.l \
-               com_err.c com_err.h \
-               error_table.h mit-sipb-cr.h \
-               test.c test1.et test2.et \
-               compiler.h internal.h
-
-CFILES=        compile_et.c error_table.c error_msg.c et_name.c \
-       com_err.c
-
-UKSRCS=com_err.c com_err.h error_msg.c error_table.h mit-sipb-cr.h internal.h et_name.c
-
-COMPONENT=comerr
-include ../config/Makefile.version
-
-utilib=${SRCDIR}lib/afs/util.a ${XLIBS}
-
-system noversion: install
-
-#
-# what to build...
-#
-${DESTDIR}bin/compile_et: compile_et
-       ${INSTALL} compile_et ${DESTDIR}bin/compile_et
-
-all:   libcom_err.a ${DESTDIR}bin/compile_et
-
-lint:  llib-lcom_err.ln
-
-archive:       et.tar
-
-doc:   com_err.dvi
-
-#
-# rules
-#
-.SUFFIXES: .l .h .c .et .ps .x9700 .mss .dvi .texinfo
-
-.l.c:
-       $(RM) -f $*.c
-       $(LEX) -t $*.l >$*.c
-
-.et.c:
-       ./compile_et $*.et
-
-.et.h:
-       ./compile_et $*.et
-
-.texinfo.dvi:
-       tex $<
-
-.dvi.ps:
-       rm -f $@.new
-       dvi2ps -r $< > $@.new
-       mv $@.new $@
-
-.c.o:
-#      ${CC} -c -pg ${CFLAGS} $*.c
-#      mv $*.o profiled/$*.o
-       ${CC} -c ${CFLAGS} $*.c
-
-#
-# real entries...
-#
-compile_et:    compile_et.o error_table.o
-       case $(SYS_NAME) in \
-       *_linux* ) \
-       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o ${utilib};; \
-       * ) \
-       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o ${utilib} -ll;; \
-       esac
-
-et.tar:        ${FILES}
-       rm -f et.tar
-       tar cfrlv et.tar ${FILES}
-
-tags:  TAGS
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall: install
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-install: all ukinstall
-       ${INSTALL} com_err.h ${DESTDIR}include/afs/com_err.h
-       ${INSTALL} error_table.h ${DESTDIR}include/afs/error_table.h
-       ${INSTALL} mit-sipb-cr.h ${DESTDIR}include/afs/mit-sipb-cr.h
-       ${INSTALL} libcom_err.a ${DESTDIR}lib/afs/libcom_err.a
-
-TAGS:  et_name.c error_msg.c compile_et.c error_table.c \
-               lex.yy.c perror.c
-       etags et_name.c error_msg.c compile_et.c \
-               error_table.c perror.c
-
-libcom_err.a:  $(LIBOBJS) AFS_component_version_number.o
-       - rm -f libcom_err.a
-       $(AR) cruv libcom_err.a $(LIBOBJS) AFS_component_version_number.o
-       $(RANLIB) libcom_err.a
-
-llib-lcom_err.ln: $(LINTFILES)
-       lint -Ccom_err $(LINTFLAGS) $(LINTFILES)
-
-clean:
-       -rm -f *~ \#* *.bak \
-               *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
-               *.cp *.fn *.ky *.log *.pg *.tp *.vr \
-               *.o libcom_err.a \
-               com_err.o compile_et \
-               et.ar TAGS y.tab.c lex.yy.c error_table.c \
-               et_lex.lex.c \
-               test1.h test1.c test2.h test2.c test \
-               eddep makedep core\
-               AFS_component_version_number.c
-
-test:
-       cd test; $(MAKE)
-
-# 'make depend' code
-depend: ${CFILES} et_lex.lex.c
-       rm -f eddep makedep
-       ${CC} -M ${CFLAGS} ${CFILES} | \
-       sed 's; ./; ;' | \
-       sed -e ':loop' \
-           -e 's/\.\.\/[^ /]*\/\.\./../' \
-           -e 't loop' > makedep
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ed - Makefile < eddep
-       rm eddep makedep
-
-compile_et.o:  AFS_component_version_number.c
-#
-# the last line in the makefile should be...
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-compile_et.o: compile_et.c 
-compile_et.o: mit-sipb-cr.h
-error_table.o: error_table.c
-error_table.o: internal.h
-error_table.o: mit-sipb-cr.h
-error_table.o: error_table.h
-error_table.o: mit-sipb-cr.h
-error_table.o: et_lex.lex.c
-error_msg.o: error_msg.c
-error_msg.o: error_table.h
-error_msg.o: mit-sipb-cr.h
-error_msg.o: internal.h
-error_msg.o: mit-sipb-cr.h
-et_name.o: et_name.c
-et_name.o: error_table.h
-et_name.o: mit-sipb-cr.h
-et_name.o: internal.h
-et_name.o: mit-sipb-cr.h
-perror.o: perror.c
-perror.o: internal.h
-perror.o: mit-sipb-cr.h
-perror.o: com_err.h
-perror.o: mit-sipb-cr.h
-perror.o: mit-sipb-cr.h
-com_err.o: com_err.c
-com_err.o: error_table.h
-com_err.o: mit-sipb-cr.h
-com_err.o: internal.h
-com_err.o: mit-sipb-cr.h
diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
new file mode 100644 (file)
index 0000000..07918f9
--- /dev/null
@@ -0,0 +1,191 @@
+#
+# Makefile for error-table routines
+#
+# Copyright 1987, 1989 MIT Student Information Processing Board
+# For copyright info, see mit-sipb-cr.h.
+#
+#      $Locker$
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+LINTFLAGS= -uhvpb
+LINTFILES= error_msg.c et_name.c com_err.c
+LIBOBJS= error_msg.o et_name.o com_err.o
+
+UKERNELDIR=../libuafs/
+
+CFLAGS= ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+FILES= Makefile et_name.c error_msg.c compile_et.c \
+               error_table.y et_lex.lex.l \
+               com_err.c com_err.h \
+               error_table.h mit-sipb-cr.h \
+               test.c test1.et test2.et \
+               compiler.h internal.h
+
+CFILES=        compile_et.c error_table.c error_msg.c et_name.c \
+       com_err.c
+
+UKSRCS=com_err.c com_err.h error_msg.c error_table.h mit-sipb-cr.h internal.h et_name.c
+
+
+include ../config/Makefile.version
+
+system noversion: install
+
+#
+# what to build...
+#
+${DESTDIR}bin/compile_et: compile_et
+       ${INSTALL} compile_et ${DESTDIR}bin/compile_et
+
+all:   libcom_err.a ${DESTDIR}bin/compile_et
+
+lint:  llib-lcom_err.ln
+
+archive:       et.tar
+
+doc:   com_err.dvi
+
+#
+# rules
+#
+.SUFFIXES: .l .h .c .et .ps .x9700 .mss .dvi .texinfo
+
+.l.c:
+       $(RM) -f $*.c
+       $(LEX) -t $*.l >$*.c
+
+.et.c:
+       ./compile_et $*.et
+
+.et.h:
+       ./compile_et $*.et
+
+.texinfo.dvi:
+       tex $<
+
+.dvi.ps:
+       rm -f $@.new
+       dvi2ps -r $< > $@.new
+       mv $@.new $@
+
+.c.o:
+#      ${CC} -c -pg ${CFLAGS} $*.c
+#      mv $*.o profiled/$*.o
+       ${CC} -c ${CFLAGS} $*.c
+
+#
+# real entries...
+#
+compile_et:    compile_et.o error_table.o
+       case $(SYS_NAME) in \
+       *_linux* ) \
+       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil;; \
+       * ) \
+       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \
+       esac
+
+et.tar:        ${FILES}
+       rm -f et.tar
+       tar cfrlv et.tar ${FILES}
+
+tags:  TAGS
+
+kinstall:
+       @echo No $@ source here.
+
+ukinstall webinstall: install
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+install: all ukinstall
+       ${INSTALL} com_err.h ${DESTDIR}include/afs/com_err.h
+       ${INSTALL} error_table.h ${DESTDIR}include/afs/error_table.h
+       ${INSTALL} mit-sipb-cr.h ${DESTDIR}include/afs/mit-sipb-cr.h
+       ${INSTALL} libcom_err.a ${DESTDIR}lib/afs/libcom_err.a
+
+TAGS:  et_name.c error_msg.c compile_et.c error_table.c \
+               lex.yy.c perror.c
+       etags et_name.c error_msg.c compile_et.c \
+               error_table.c perror.c
+
+libcom_err.a:  $(LIBOBJS) AFS_component_version_number.o
+       - rm -f libcom_err.a
+       $(AR) cruv libcom_err.a $(LIBOBJS) AFS_component_version_number.o
+       $(RANLIB) libcom_err.a
+
+llib-lcom_err.ln: $(LINTFILES)
+       lint -Ccom_err $(LINTFLAGS) $(LINTFILES)
+
+clean:
+       -rm -f *~ \#* *.bak \
+               *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
+               *.cp *.fn *.ky *.log *.pg *.tp *.vr \
+               *.o libcom_err.a \
+               com_err.o compile_et \
+               et.ar TAGS y.tab.c lex.yy.c error_table.c \
+               et_lex.lex.c \
+               test1.h test1.c test2.h test2.c test \
+               eddep makedep core\
+               AFS_component_version_number.c
+
+test:
+       cd test; $(MAKE)
+
+# 'make depend' code
+depend: ${CFILES} et_lex.lex.c
+       rm -f eddep makedep
+       ${CC} -M ${CFLAGS} ${CFILES} | \
+       sed 's; ./; ;' | \
+       sed -e ':loop' \
+           -e 's/\.\.\/[^ /]*\/\.\./../' \
+           -e 't loop' > makedep
+       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
+       echo '$$r makedep' >>eddep
+       echo 'w' >>eddep
+       cp Makefile Makefile.bak
+       ed - Makefile < eddep
+       rm eddep makedep
+
+compile_et.o:  AFS_component_version_number.c
+#
+# the last line in the makefile should be...
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+compile_et.o: compile_et.c 
+compile_et.o: mit-sipb-cr.h
+error_table.o: error_table.c
+error_table.o: internal.h
+error_table.o: mit-sipb-cr.h
+error_table.o: error_table.h
+error_table.o: mit-sipb-cr.h
+error_table.o: et_lex.lex.c
+error_msg.o: error_msg.c
+error_msg.o: error_table.h
+error_msg.o: mit-sipb-cr.h
+error_msg.o: internal.h
+error_msg.o: mit-sipb-cr.h
+et_name.o: et_name.c
+et_name.o: error_table.h
+et_name.o: mit-sipb-cr.h
+et_name.o: internal.h
+et_name.o: mit-sipb-cr.h
+perror.o: perror.c
+perror.o: internal.h
+perror.o: mit-sipb-cr.h
+perror.o: com_err.h
+perror.o: mit-sipb-cr.h
+perror.o: mit-sipb-cr.h
+com_err.o: com_err.c
+com_err.o: error_table.h
+com_err.o: mit-sipb-cr.h
+com_err.o: internal.h
+com_err.o: mit-sipb-cr.h
diff --git a/src/comerr/test/Makefile b/src/comerr/test/Makefile
deleted file mode 100644 (file)
index a04dd0c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lcom_err
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-system:        test 
-
-clean:
-       rm -f *.o *.a test core
-
-test:  test.o test1.o test2.o 
-       $(CC)  ${CFLAGS} -o test test.o test1.o test2.o 
-test.o:        test1.h test2.h
-test1.o : test1.c
-test1.c : test1.et
-test2.o : test2.c
-test2.c : test2.et
-
-kinstall:
-       @echo No kernel source here.
-
-clean:
-       rm -f *~ \#* *.bak \
-               *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
-               *.cp *.fn *.ky *.log *.pg *.tp *.vr \
-               *.o libcom_err.a \
-               com_err.o compile_et \
-               et.ar TAGS y.tab.c lex.yy.c error_table.c \
-               et_lex.lex.c \
-               test1.h test1.c test2.h test2.c test \
-               eddep makedep core
-
diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in
new file mode 100644 (file)
index 0000000..0da1e54
--- /dev/null
@@ -0,0 +1,43 @@
+TOP_SRCDIR=@DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS= -lcom_err
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+system:        test 
+
+clean:
+       rm -f *.o *.a test core
+
+test:  test.o test1.o test2.o 
+       $(CC)  ${CFLAGS} -o test test.o test1.o test2.o 
+test.o:        test1.h test2.h
+test1.o : test1.c
+test1.c : test1.et
+test2.o : test2.c
+test2.c : test2.et
+
+kinstall:
+       @echo No kernel source here.
+
+clean:
+       rm -f *~ \#* *.bak \
+               *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
+               *.cp *.fn *.ky *.log *.pg *.tp *.vr \
+               *.o libcom_err.a \
+               com_err.o compile_et \
+               et.ar TAGS y.tab.c lex.yy.c error_table.c \
+               et_lex.lex.c \
+               test1.h test1.c test2.h test2.c test \
+               eddep makedep core
+
diff --git a/src/config/Makefile b/src/config/Makefile
deleted file mode 100644 (file)
index b83c73a..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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
-
-KERNELDIR=../libafs
-UKERNELDIR=../libuafs
-SHELL=/bin/sh
-COMPONENT=config
-include Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-CFLAGS=-g -I${DESTDIR}include ${XCFLAGS}
-
-noversion: install.noversion
-
-KDIRS = ${KERNELDIR}/afs ${KERNELDIR}/rx ${KERNELDIR}/afsint \
-       ${DESTDIR}include/afs ${KERNELDIR}/config
-
-UKDIRS = ${UKERNELDIR}/afs ${UKERNELDIR}/rx ${UKERNELDIR}/afsint \
-        ${UKERNELDIR}/config
-
-noversionMakef: $(KDIRS)
-       -if [ ! -f Makefile.version ] ; \
-       then \
-               $(CP) Makefile.version-NOCML Makefile.version; \
-               $(MAKE) -f Makefile.version  AFS_component_version_number.c; \
-       fi; 
-
-version: ${DESTDIR}bin/mkvers Makefile.version
-       $(MAKE) -f Makefile.version  AFS_component_version_number.c
-
-${DESTDIR}bin/mkvers: mkvers.c
-       set ${DESTDIR}bin; $(MKDIR_IF_NEEDED)
-       $(CC) -o ${DESTDIR}bin/mkvers mkvers.c
-
-Makefile.version: Makefile.version-CML Makefile.version-NOCML
-       $(RM) -f Makefile.version
-       set -x ; \
-       if      [ -r SRC/../CML/state ] ; \
-       then    $(CP) Makefile.version-CML Makefile.version ; \
-       else    $(CP) Makefile.version-NOCML Makefile.version ; \
-       fi
-
-all: config
-
-mc.o: mc.c
-
-config.o: config.c AFS_component_version_number.c
-
-config: config.o mc.o
-       $(SPEW) $(CC) $(CFLAGS) -o config config.o mc.o
-
-param.xxx:
-
-$(KDIRS): 
-       set $@; $(MKDIR_IF_NEEDED)
-
-${KERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
-       -$(RM) -f $@; $(CP) $? $@
-
-${KERNELDIR}/afs/param.h ${DESTDIR}include/afs/param.h :: param.${SYS_NAME}.h
-       -$(RM) -f $@; $(CP) $? $@
-
-${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}include/afs/afs_sysnames.h :: afs_sysnames.h
-       $(RM) -f $@; $(CP) $? $@
-
-DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h  ${DESTDIR}include/afs/param.h  ${DESTDIR}include/afs/stds.h  ${DESTDIR}include/afs/icl.h 
-
-${KERNELDIR}/afs/stds.h ${DESTDIR}include/afs/stds.h :: stds.h
-       $(RM) -f $@; $(CP) $? $@
-
-${KERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME}
-       $(RM) -f $@; $(CP) $? $@
-
-${KERNELDIR}/afs/icl.h ${DESTDIR}include/afs/icl.h :: icl.h 
-       $(RM) -f $@; $(CP) $? $@
-
-${KERNELDIR}/afs/afs_args.h ${DESTDIR}include/afs/afs_args.h :: afs_args.h 
-       $(RM) -f $@; $(CP) $? $@
-
-${DESTDIR}include/afs/venus.h :: venus.h 
-       $(RM) -f $@; $(CP) $? $@
-
-${DESTDIR}include/afs/debug.h :: debug.h 
-       $(RM) -f $@; $(CP) $? $@
-
-$(UKDIRS): 
-       set $@; $(MKDIR_IF_NEEDED)
-
-${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
-       -$(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/param.h :: param.${SYS_NAME}_usr.h
-       -$(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/afs_sysnames.h :: afs_sysnames.h
-       $(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/stds.h :: stds.h
-       $(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME}
-       $(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/icl.h :: icl.h 
-       $(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/venus.h :: venus.h 
-       $(RM) -f $@; $(CP) $? $@
-
-${UKERNELDIR}/afs/afs_args.h :: afs_args.h 
-       $(RM) -f $@; $(CP) $? $@
-
-# lkversion is the target the Linux build uses to verify the build machine
-# has headers in the right place for the requested kernel builds.
-#
-# To add AFS support to a new Linux kernel rev, see comments in the file
-# ./linux-version.
-#
-lkversion:
-       case ${SYS_NAME} in \
-       *linux* ) \
-               LINUX_SRCDIR="$(LINUX_SRCDIR)"; export LINUX_SRCDIR; \
-               LINUX_VERS="$(LINUX_VERS)"; export LINUX_VERS; \
-               sh ./linux-version ; \
-       esac
-
-install.noversion: $(KDIRS) noversionMakef all $(DESTINCLS) venus.h
-
-system: install
-install: version install.noversion kinstall ukinstall
-
-# 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
-# file is needed by param.h to create unique identifiers for each SYS_TYPE.
-
-# lkversion
-kinstall: config $(KDIRS) ${KERNELDIR}/afs/param.h \
-       ${KERNELDIR}/afs/stds.h \
-       ${KERNELDIR}/afs/afs_sysnames.h \
-       ${KERNELDIR}/config/Makefile.${SYS_NAME} \
-       ${KERNELDIR}/afs/afs_args.h \
-       ${KERNELDIR}/afs/icl.h \
-       ${KERNELDIR}/afs/AFS_component_version_number.c
-
-ukinstall webinstall: $(DESTINCLS) config $(UKDIRS) ${UKERNELDIR}/afs/param.h ${UKERNELDIR}/afs/stds.h \
-       ${UKERNELDIR}/afs/afs_sysnames.h \
-       ${UKERNELDIR}/config/Makefile.${SYS_NAME} \
-       ${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 core xprt AFS_component_version_number.c
index ae78604e17c1576dcaeb2bd7f37e9a31dc81284e..10b6780e639bb2e5b0bb0796a2a532e3c76e68dc 100644 (file)
@@ -21,7 +21,6 @@ OPTMZ=-O2
 DBG=-g3
 CSTATIC=-non_shared
 RANLIB=/bin/true
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 CP=cp
 
index 45cbccb9c6ea560428c0cfcf271b7c5372e9ff5b..000238df65f25f9140d4d91b227d2ca329d623f7 100644 (file)
@@ -22,7 +22,6 @@ DBG=-g3
 CP=cp
 CSTATIC=-non_shared
 RANLIB=/bin/true
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 
 #this is for the vol package
index f26b67d31a4c0ac96b8c7420693fe99f6623f021..7e9d5b1f2377836ab73e3d022a0ef13f03386cb8 100644 (file)
@@ -38,7 +38,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index f23fc92d677834d1503a83a746948388ed080dc5..83840939458c9b0f862352f47bc7b17a3d19f89a 100644 (file)
@@ -21,7 +21,6 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=ranlib
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 RM=/bin/rm
 CP=/bin/cp
index 058e1f18b4176cb48fbedbcf9473ff97e9f18bc8..aa034ccfbe4a79157e9c9a15216c6b56352d77e6 100644 (file)
@@ -21,7 +21,6 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=ranlib
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 RM=/bin/rm
 CP=/bin/cp
index fc57153ecd0f5d841494f2832ef0336b6cfc4859..f5843b66cbeb5127b724f99dfa67303b430dfc8c 100644 (file)
@@ -9,8 +9,6 @@
 #
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DJGPP
-DESTDIR=DEST/
-SRCDIR=DEST/
 
 # compilation and link editor flags
 #DBG=-g
@@ -40,7 +38,6 @@ RANLIB=dos-ranlib
 MT_CC=dos-gcc -bmmap
 MV=mv
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index a627efa32ccf184fa3bdebf73259d33bc1d5af84..56435d331a12785f0d7a926ac66b6c02d6879d34 100644 (file)
@@ -4,9 +4,6 @@
 #
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = FBSD
-# Pointers to destination and source directories
-DESTDIR=DEST/
-SRCDIR=DEST/
 # Base directory for linux kernel source. Actually a prefix which is complete
 # when LINUX_VERS is appended to it.
 # LINUX_SRCDIR = /usr/src/linux-
@@ -43,7 +40,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index 1f47b49b9170cb95434fe17d25e73519c1697f71..3dae1eb28865a5d30e18a1d27e082dbbe30cafbc 100644 (file)
@@ -44,7 +44,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index 38c7dfba1a6a5aebfd36c7dd68cf6b787717c9fc..3de5076791cd7718a7f84b6f0a4453d9eb36e581 100644 (file)
@@ -35,7 +35,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
diff --git a/src/config/Makefile.in b/src/config/Makefile.in
new file mode 100644 (file)
index 0000000..5de7b3e
--- /dev/null
@@ -0,0 +1,165 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+KERNELDIR=../libafs
+UKERNELDIR=../libuafs
+SHELL=/bin/sh
+
+include Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+CFLAGS=-g -I${DESTDIR}include ${XCFLAGS}
+
+noversion: install.noversion
+
+KDIRS = ${KERNELDIR}/afs ${KERNELDIR}/rx ${KERNELDIR}/afsint \
+       ${DESTDIR}include/afs ${KERNELDIR}/config
+
+UKDIRS = ${UKERNELDIR}/afs ${UKERNELDIR}/rx ${UKERNELDIR}/afsint \
+        ${UKERNELDIR}/config
+
+noversionMakef: $(KDIRS)
+       -if [ ! -f Makefile.version ] ; \
+       then \
+               $(CP) Makefile.version-NOCML Makefile.version; \
+               $(MAKE) -f Makefile.version  AFS_component_version_number.c; \
+       fi; 
+
+version: ${DESTDIR}bin/mkvers Makefile.version
+       $(MAKE) -f Makefile.version  AFS_component_version_number.c
+
+${DESTDIR}bin/mkvers: mkvers.c
+       set ${DESTDIR}bin; $(MKDIR_IF_NEEDED)
+       $(CC) -o ${DESTDIR}bin/mkvers mkvers.c
+
+Makefile.version: Makefile.version-CML Makefile.version-NOCML
+       $(RM) -f Makefile.version
+       set -x ; \
+       if      [ -r SRC/../CML/state ] ; \
+       then    $(CP) Makefile.version-CML Makefile.version ; \
+       else    $(CP) Makefile.version-NOCML Makefile.version ; \
+       fi
+
+all: config
+
+mc.o: mc.c
+
+config.o: config.c AFS_component_version_number.c
+
+config: config.o mc.o
+       $(SPEW) $(CC) $(CFLAGS) -o config config.o mc.o
+
+param.xxx:
+
+$(KDIRS): 
+       set $@; $(MKDIR_IF_NEEDED)
+
+${KERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
+       -$(RM) -f $@; $(CP) $? $@
+
+${KERNELDIR}/afs/param.h ${DESTDIR}include/afs/param.h :: param.${SYS_NAME}.h
+       -$(RM) -f $@; $(CP) $? $@
+
+${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}include/afs/afs_sysnames.h :: afs_sysnames.h
+       $(RM) -f $@; $(CP) $? $@
+
+DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h  ${DESTDIR}include/afs/param.h  ${DESTDIR}include/afs/stds.h  ${DESTDIR}include/afs/icl.h 
+
+${KERNELDIR}/afs/stds.h ${DESTDIR}include/afs/stds.h :: stds.h
+       $(RM) -f $@; $(CP) $? $@
+
+${KERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME}
+       $(RM) -f $@; $(CP) $? $@
+
+${KERNELDIR}/afs/icl.h ${DESTDIR}include/afs/icl.h :: icl.h 
+       $(RM) -f $@; $(CP) $? $@
+
+${KERNELDIR}/afs/afs_args.h ${DESTDIR}include/afs/afs_args.h :: afs_args.h 
+       $(RM) -f $@; $(CP) $? $@
+
+${DESTDIR}include/afs/venus.h :: venus.h 
+       $(RM) -f $@; $(CP) $? $@
+
+${DESTDIR}include/afs/debug.h :: debug.h 
+       $(RM) -f $@; $(CP) $? $@
+
+$(UKDIRS): 
+       set $@; $(MKDIR_IF_NEEDED)
+
+${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
+       -$(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/param.h :: param.${SYS_NAME}_usr.h
+       -$(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/afs_sysnames.h :: afs_sysnames.h
+       $(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/stds.h :: stds.h
+       $(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME}
+       $(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/icl.h :: icl.h 
+       $(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/venus.h :: venus.h 
+       $(RM) -f $@; $(CP) $? $@
+
+${UKERNELDIR}/afs/afs_args.h :: afs_args.h 
+       $(RM) -f $@; $(CP) $? $@
+
+# lkversion is the target the Linux build uses to verify the build machine
+# has headers in the right place for the requested kernel builds.
+#
+# To add AFS support to a new Linux kernel rev, see comments in the file
+# ./linux-version.
+#
+lkversion:
+       case ${SYS_NAME} in \
+       *linux* ) \
+               LINUX_SRCDIR="$(LINUX_SRCDIR)"; export LINUX_SRCDIR; \
+               LINUX_VERS="$(LINUX_VERS)"; export LINUX_VERS; \
+               sh ./linux-version ; \
+       esac
+
+install.noversion: $(KDIRS) noversionMakef all $(DESTINCLS) venus.h
+
+system: install
+install: version install.noversion kinstall ukinstall
+
+# 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
+# file is needed by param.h to create unique identifiers for each SYS_TYPE.
+
+# lkversion
+kinstall: config $(KDIRS) ${KERNELDIR}/afs/param.h \
+       ${KERNELDIR}/afs/stds.h \
+       ${KERNELDIR}/afs/afs_sysnames.h \
+       ${KERNELDIR}/config/Makefile.${SYS_NAME} \
+       ${KERNELDIR}/afs/afs_args.h \
+       ${KERNELDIR}/afs/icl.h \
+       ${KERNELDIR}/afs/AFS_component_version_number.c
+
+ukinstall webinstall: $(DESTINCLS) config $(UKDIRS) ${UKERNELDIR}/afs/param.h ${UKERNELDIR}/afs/stds.h \
+       ${UKERNELDIR}/afs/afs_sysnames.h \
+       ${UKERNELDIR}/config/Makefile.${SYS_NAME} \
+       ${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 core xprt AFS_component_version_number.c
index 6edb0b62eaaaf697dcc96f8ad9b64c42799a9ad0..3b8ca52b63eb2d8789283c2ce98939224085a7c1 100644 (file)
@@ -3,9 +3,6 @@
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DARWIN
 #
-# Pointers to destination and source directories
-DESTDIR=DEST/
-DESTDIR=DEST/
 #
 # compilation and link editor flags
 XCFLAGS=-traditional-cpp
index 6edb0b62eaaaf697dcc96f8ad9b64c42799a9ad0..3b8ca52b63eb2d8789283c2ce98939224085a7c1 100644 (file)
@@ -3,9 +3,6 @@
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DARWIN
 #
-# Pointers to destination and source directories
-DESTDIR=DEST/
-DESTDIR=DEST/
 #
 # compilation and link editor flags
 XCFLAGS=-traditional-cpp
index e67acec07873667b7ecdad9fc60f263e49484da9..07925bf6909633f0d27c64f133f9822b25fe42cf 100644 (file)
@@ -36,7 +36,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index 72aeaef0dc2ec288805c9fadcaefbcdb2ed2cfb6..c64b7243f44a383faaf01743b3448ce412ccf8da 100644 (file)
@@ -35,7 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
+
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index 81c039b44ae0d8f5973f47ace2e9f8b29e1d6331..1e96eccf234636abf99cb73ef68467f9e3527e51 100644 (file)
@@ -34,7 +34,6 @@ LEX=lex
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
index 9de4d60c5efbb3d08bdd99922cbddba8587448c5..994004646963c58252233203c06ab6df0fcce958 100644 (file)
@@ -40,7 +40,6 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index 74bffa280e2bb23a1f00478ea7ac60423d8664f8..1920d8ce73dc87c6d754ab19d6dda21e6d8ccb95 100644 (file)
@@ -40,7 +40,6 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index 587636880f06ba650b93020472ede43076c23fc4..2de0753d6455ad33b812752b4ea564552e965968 100644 (file)
@@ -38,7 +38,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
index 55aa0e3392cc63d17ee2dd9e348d657ce8155f05..e427a36ade8d8f0c269da5cddefc267202fe592e 100644 (file)
@@ -38,5 +38,4 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
index 61b385dab049a58f0db4c41d43833649966c2335..dc7e30f9c0789b5e0d379f2baa2af5ec5c271261 100644 (file)
@@ -39,7 +39,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
index 925e626afff6fe7b2c6dbf1208aeed342379fa59..2bdd7edf95b2883d2343d5b8ca363a814c2944be 100644 (file)
@@ -39,7 +39,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
index a8d184fd90a3e912eebe09c23cc45af4c2342fb5..e1e515d0584d6ac02e93237abb4cdb19e9a30841 100644 (file)
@@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index a8d184fd90a3e912eebe09c23cc45af4c2342fb5..e1e515d0584d6ac02e93237abb4cdb19e9a30841 100644 (file)
@@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index a8d184fd90a3e912eebe09c23cc45af4c2342fb5..e1e515d0584d6ac02e93237abb4cdb19e9a30841 100644 (file)
@@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
index 8d8d8d941c43bf6cf0f0cf85e359f26e585ec7c0..89ae2929a9b9d632831a54ed8b984c5737f8e76f 100644 (file)
@@ -39,7 +39,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
index e6a173baea3734911d009ce607a5420ff2710872..c35b019ab0f17193de1797e9bdff88bbb7eeba7c 100644 (file)
@@ -43,7 +43,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
index 75614135c371a0e2b095011080e25682be936c2d..b669ee3d189d91b2118ecdb7007873bc6bb7315d 100644 (file)
@@ -47,7 +47,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
index 2b4bf1020444c6e4654866af72dc29df294880e4..fac5d19645eb5a2f9527f9089eca413b7f4f131f 100644 (file)
@@ -40,7 +40,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
index b874f4a6c2ce0242fcf8c1d987b3717ec8861f6f..7f71a1bf88ac9b87007093ae5b44cb5217be2dd1 100644 (file)
@@ -20,5 +20,4 @@ AR = /usr/ccs/bin/ar
 LD = /usr/ccs/bin/ld
 LORDER = /usr/ccs/bin/lorder
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
diff --git a/src/dauth/Makefile b/src/dauth/Makefile
deleted file mode 100644 (file)
index 5e7da38..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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
-
-SHELL =        /bin/sh
-COMPONENT=     dauth
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET =   ${SRCDIR}bin/compile_et
-OPTMZ= -g
-
-CFLAGS =       ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS =      ${OPTMZ} ${XLDFLAGS}
-
-INCLS=         ${SRCDIR}include/ubik.h \
-               ${SRCDIR}include/lwp.h \
-               ${SRCDIR}include/lock.h  \
-               ${SRCDIR}include/rx/rx.h \
-               ${SRCDIR}include/rx/xdr.h \
-               ${SRCDIR}include/afs/com_err.h
-
-VERS = AFS_component_version_number.o
-OBJS =         adkint.cs.o adkint.xdr.o
-
-LIBS =                 ${SRCDIR}lib/afs/libkauth.a \
-               ${SRCDIR}lib/afs/libauth.a \
-               ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/libcom_err.a \
-               ${SRCDIR}lib/libubik.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/liblwp.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/afs/util.a 
-
-CELL=          `pwd|awk -F/ '{print $$3}'`
-USNS=          cellname
-
-include ../config/Makefile.version
-
-ukinstall webinstall:
-               echo No $@ source here
-
-noversion:     install
-
-all:           dlog dpass
-
-clean:
-               rm -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c
-
-adkint.cs.o:   adkint.cs.c
-adkint.xdr.o:  adkint.xdr.c adkint.h
-adkint.cs.c    adkint.xdr.c adkint.h: adkint.xg
-               ${SRCDIR}bin/rxgen adkint.xg
-
-dlog:          dlog.o $(VERS) $(OBJS) $(LIBS)
-               $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \
-                               ${XLIBS}
-
-dlog.o:        dlog.c adkint.h
-
-dpass:         dpass.o $(VERS) $(LIBS)
-               $(CC) ${LDFLAGS} -o dpass dpass.o $(VERS) $(LIBS) ${XLIBS}
-
-# Test version of dlog just checks ASN.1 date conversion.
-dlog_test:     dlog.c $(OBJS) $(LIBS)
-               $(CC) $(LDFLAGS) -DDLOG_TEST -o dlog_test dlog.c $(OBJS) \
-                       $(LIBS) ${XLIBS}
-
-system:        install
-
-${DESTDIR}bin/dlog: dlog
-       ${INSTALL}   $? $@
-
-${DESTDIR}bin/dpass: dpass
-       ${INSTALL}   $? $@
-
-
-install:       all ${DESTDIR}bin/dlog ${DESTDIR}bin/dpass
diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in
new file mode 100644 (file)
index 0000000..11708a3
--- /dev/null
@@ -0,0 +1,88 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL =        /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET =   ${SRCDIR}bin/compile_et
+OPTMZ= -g
+
+CFLAGS =       ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS =      ${OPTMZ} ${XLDFLAGS}
+
+INCLS=         ${SRCDIR}include/ubik.h \
+               ${SRCDIR}include/lwp.h \
+               ${SRCDIR}include/lock.h  \
+               ${SRCDIR}include/rx/rx.h \
+               ${SRCDIR}include/rx/xdr.h \
+               ${SRCDIR}include/afs/com_err.h
+
+VERS = AFS_component_version_number.o
+OBJS =         adkint.cs.o adkint.xdr.o
+
+LIBS =                 ${SRCDIR}lib/afs/libkauth.a \
+               ${SRCDIR}lib/afs/libauth.a \
+               ${SRCDIR}lib/afs/libcmd.a \
+               ${SRCDIR}lib/afs/libcom_err.a \
+               ${SRCDIR}lib/libubik.a \
+               ${SRCDIR}lib/librxkad.a \
+               ${SRCDIR}lib/libdes.a \
+               ${SRCDIR}lib/librx.a \
+               ${SRCDIR}lib/liblwp.a \
+               ${SRCDIR}lib/afs/libsys.a \
+               ${SRCDIR}lib/afs/util.a 
+
+CELL=          `pwd|awk -F/ '{print $$3}'`
+USNS=          cellname
+
+include ../config/Makefile.version
+
+ukinstall webinstall:
+               echo No $@ source here
+
+noversion:     install
+
+all:           dlog dpass
+
+clean:
+               rm -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c
+
+adkint.cs.o:   adkint.cs.c
+adkint.xdr.o:  adkint.xdr.c adkint.h
+adkint.cs.c    adkint.xdr.c adkint.h: adkint.xg
+               ${SRCDIR}bin/rxgen adkint.xg
+
+dlog:          dlog.o $(VERS) $(OBJS) $(LIBS)
+               $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \
+                               ${XLIBS}
+
+dlog.o:        dlog.c adkint.h
+
+dpass:         dpass.o $(VERS) $(LIBS)
+               $(CC) ${LDFLAGS} -o dpass dpass.o $(VERS) $(LIBS) ${XLIBS}
+
+# Test version of dlog just checks ASN.1 date conversion.
+dlog_test:     dlog.c $(OBJS) $(LIBS)
+               $(CC) $(LDFLAGS) -DDLOG_TEST -o dlog_test dlog.c $(OBJS) \
+                       $(LIBS) ${XLIBS}
+
+system:        install
+
+${DESTDIR}bin/dlog: dlog
+       ${INSTALL}   $? $@
+
+${DESTDIR}bin/dpass: dpass
+       ${INSTALL}   $? $@
+
+
+install:       all ${DESTDIR}bin/dlog ${DESTDIR}bin/dpass
diff --git a/src/des/Makefile b/src/des/Makefile
deleted file mode 100644 (file)
index 178ae5f..0000000
+++ /dev/null
@@ -1,436 +0,0 @@
-#
-# Copyright 1987 by the Massachusetts Institute of Technology.
-#
-# For copying and distribution information,
-# please see the file <mit-cpyright.h>.
-#
-# Makefile for BSD DES library
-#
-# First define machine type, compiler, and object file suffix
-# Could be for VAX or PC-DOS
-#
-# Some of these files are cross compiled on the vax for the pc8086,
-# using the MIT LCS cross-compilation environment
-# Others are always executed on the vax(host).
-#
-# A machine, e.g. Vax, pc8086, IBM experimental workstation, is 
-# described in terms of defines for its word length
-# (BITS32 or BITS16), byte ordering (LSBFIRST or MSBFIRST) and 
-# operating system (BSDUNIX or CROSSMSDOS).
-#
-# Make sure these are properly defined for any new machine types.
-# target machine for run-time code (may cross-compile),
-# override as needed 
-
-SHELL = /bin/sh
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR=../libuafs/
-SRC    =.
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-UKSRCS=des.h mit-cpyright.h
-
-K_INC  = ${SRCDIR}include
-DBG    =
-GPROF  =
-# by default do not try to hide entry points
-F_CC   = -c ${GPROF} ${DBG} ${XCFLAGS}
-F_CPP  = -I${K_INC} -I. -I${TOP_SRCDIR}/config 
-MK_STR = "     \$${CC} -I\$${SRC} \$${F_CPP} \$${F_CC}" -I${TOP_SRCDIR}/config 
-LDFLAGS = ${XLDFLAGS}
-
-# dont use optimizer, since it pessimizes on uvax2,
-# somehow -pg makes it faster.
-
-TAGS   = /bin/ctags
-
-DES_LIB  = libdes.a
-DEP_LIBS = ${DES_LIB} ${NDES_LIB}
-LIBS    = ${DEP_LIBS} ${XLIBS}
-LLIB    = llib-ldes.ln
-
-SRCHOST        = \
-       ${SRC}/make_keyperm.c \
-       ${SRC}/make_ip.c \
-       ${SRC}/make_fp.c \
-       ${SRC}/make_p.c \
-       ${SRC}/make_s.c \
-       ${SRC}/make_s_table.c \
-       ${SRC}/make_p_table.c \
-       ${SRC}/make_odd.c \
-       ${SRC}/misc.c
-
-OBJHOST        = \
-       make_keyperm.o \
-       make_ip.o \
-       make_fp.o \
-       make_e.o \
-       make_p.o \
-       make_s.o \
-       make_s_table.o \
-       make_p_table.o \
-       make_odd.o \
-       misc.o
-
-SRCTARG        = \
-       ${SRC}/key_sched.c \
-       ${SRC}/des.c \
-       ${SRC}/cbc_encrypt.c \
-       ${SRC}/read_pssword.c \
-       ${SRC}/pcbc_encrypt.c \
-       ${SRC}/cksum.c \
-       ${SRC}/quad_cksum.c \
-       ${SRC}/new_rnd_key.c \
-       ${SRC}/key_parity.c \
-       ${SRC}/weak_key.c \
-       ${SRC}/util.c \
-       ${SRC}/strng_to_key.c \
-       ${SRC}/debug_decl.c
-
-OBJTARG        = \
-       key_sched.o \
-       des.o \
-       cbc_encrypt.o \
-       read_pssword.o \
-       pcbc_encrypt.o \
-       cksum.o \
-       quad_cksum.o \
-       key_parity.o \
-       weak_key.o \
-       new_rnd_key.o \
-       util.o \
-       strng_to_key.o \
-       debug_decl.o
-
-CFILES = ${SRCHOST} ${SRCTARG}
-OBJECTS        = ${OBJHOST} ${OBJTARG}
-
-CODE   = ${CFILES} ${SRC}/Makefile
-
-# Generated files
-GFILES = \
-       key_perm.h \
-       p_table.h \
-       s_table.h \
-       odd.h \
-       p.c \
-       s.c \
-       fp.c \
-       ip.c
-
-# Programs to create generated files
-GPROGS = \
-       make_keyperm \
-       make_p_table \
-       make_s_table \
-       make_odd \
-       make_p \
-       make_s \
-       make_fp \
-       make_ip
-
-XGPROGS = \
-       misc \
-       make_e
-
-# Library component lists.
-
-TARGOBJS = \
-       des.o \
-       cbc_encrypt.o \
-       pcbc_encrypt.o \
-       cksum.o \
-       new_rnd_key.o \
-       key_sched.o \
-       debug_decl.o \
-       quad_cksum.o \
-       key_parity.o \
-       weak_key.o \
-       read_pssword.o \
-       strng_to_key.o \
-       misco.o \
-       ${CRYPT_OBJ} \
-       util.o
-
-COMPONENT=des
-include ../config/Makefile.version
-
-# This is required to get compiler flags, but not use CFLAGS.
-AFS_component_version_number.o: AFS_component_version_number.c
-       $(CC) ${XCFLAGS} -c AFS_component_version_number.c
-
-noversion: install
-
-all:   ${GFILES} ${CFILES} ${DEP_LIBS}
-
-gprogs: ${GPROGS}
-
-test: 
-       cd test; $(MAKE)
-
-system: install
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall: all ${UKSRCS}
-       set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}des
-       ${INSTALL} libdes.a ${UKERNELDIR}des/libdes.a
-
-${DESTDIR}lib/libdes.a: libdes.a
-       ${INSTALL} $? $@
-
-install install.noversion: all ukinstall ${DESTDIR}lib/libdes.a
-       ${INSTALL} des.h des_conf.h mit-cpyright.h ${DESTDIR}include
-       ${INSTALL} odd.h ${DESTDIR}include/des_odd.h
-
-clean:
-       rm -f ${OBJECTS} ${DEP_LIBS} ${PROGS} ${GPROGS} ${GFILES} AFS_component_version_number.c misco.c
-       rm -f *.s *.o *.b core *~ *.com *.ld
-       rm -f tags TAGS ${LLIB}
-
-tags:  ${CFILES}
-       rm -f tags; ${TAGS} ${CFILES}
-
-print: ${CODE}
-       lpr -p ${CODE}
-
-src:   ${CODE}
-
-${CODE}:
-       (cd ${SRC}; co -q $@)
-
-lint:  ${LLIB}
-
-${LLIB}: ${CFILES}
-       lint -I${K_INC} ${CFILES}
-
-${DES_LIB}: ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
-       rm -f ${DES_LIB}
-       ar r ${DES_LIB} ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
-       $(RANLIB) ${DES_LIB}
-
-#      host system stuff
-make_ip: make_ip.o misc.o
-       ${CC} make_ip.o misc.o ${LDFLAGS} -o make_ip
-make_fp: make_fp.o misc.o
-       ${CC} make_fp.o misc.o ${LDFLAGS} -o make_fp
-make_odd: make_odd.o misc.o
-       ${CC} ${LDFLAGS} make_odd.o -o make_odd misc.o
-make_s_table: make_s_table.o misc.o    
-       ${CC} ${LDFLAGS} make_s_table.o misc.o -o make_s_table
-make_p_table: make_p_table.o misc.o    
-       ${CC} ${LDFLAGS} make_p_table.o misc.o -o make_p_table
-make_keyperm:  make_keyperm.o misc.o
-       ${CC} make_keyperm.o misc.o ${LDFLAGS} -o make_keyperm
-make_e:        make_e.o misc.o
-       ${CC} make_e.o misc.o ${LDFLAGS} -o make_e
-make_p:        make_p.o misc.o
-       ${CC} make_p.o misc.o ${LDFLAGS} -o make_p
-make_s:        make_s.o misc.o
-       ${CC} make_s.o misc.o ${LDFLAGS} -o make_s
-
-odd.h: make_odd
-       -./make_odd odd.h
-s_table.h: make_s_table
-       -./make_s_table s_table.h
-p_table.h: make_p_table
-       -./make_p_table p_table.h
-key_perm.h: make_keyperm
-       -./make_keyperm key_perm.h
-ip.c:  make_ip
-       -./make_ip ip.c
-p.c:   make_p
-       -./make_p p.c
-s.c:   make_s
-       -./make_s s.c
-fp.c:  make_fp
-       -./make_fp fp.c
-
-depend: ${CFILES} AFS_component_version_number.o
-       -${CC} -M ${F_CPP} ${CFILES} | \
-       sed -e ':loop' \
-       -e 't loop' | \
-       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
-                  else rec = rec " " $$2 } } \
-         END { print rec } ' > makedep
-       for file in ${OBJECTS} ; do \
-       echo "$$file:" >> makedep; \
-       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
-       done
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ex - Makefile < eddep
-       rm eddep makedep
-       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
-       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-       echo ' (see make depend above)' >> Makefile
-       make depend2 SRCDIR=${SRCDIR}
-
-depend2: ${CFILES} ${GFILES}
-       ${CC} -M ${F_CPP} ${CFILES} | \
-       sed -e ':loop' \
-       -e 't loop' | \
-       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
-                  else rec = rec " " $$2 } } \
-         END { print rec } ' > makedep
-       for file in ${OBJECTS} ; do \
-       echo "$$file:" >> makedep; \
-       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
-       done
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ex - Makefile < eddep
-       rm eddep makedep
-       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
-       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-       echo ' (see make depend above)' >> Makefile
-
-misc.o make_e.o: AFS_component_version_number.c
-# DO NOT DELETE THIS LINE
-
-make_keyperm.o: make_keyperm.c 
-make_keyperm.o: 
-make_ip.o: make_ip.c 
-make_ip.o: tables.h
-make_fp.o: make_fp.c 
-make_fp.o: tables.h
-make_p.o: make_p.c
-make_p.o: conf.h tables.h
-make_s.o: make_s.c ./s_table.h
-make_s_table.o: make_s_table.c
-make_s_table.o: tables.h
-make_p_table.o: make_p_table.c 
-make_p_table.o: conf.h
-make_p_table.o: tables.h
-make_odd.o: make_odd.c 
-misc.o: misc.c des_internal.h
-misc.o: conf.h
-key_sched.o: key_sched.c
-key_sched.o: conf.h 
-key_sched.o: des.h des_internal.h
-key_sched.o: mit-cpyright.h
-key_sched.o: des_conf.h ./key_perm.h ./odd.h
-key_test.o: key_test.c
-key_test.o: des.h
-key_test.o: mit-cpyright.h
-key_test.o: des_conf.h
-testit.o: testit.c
-testit.o: des.h
-testit.o: mit-cpyright.h
-testit.o: des_conf.h
-des.o: des.c des_internal.h
-des.o: des.h
-des.o: mit-cpyright.h
-des.o: des_conf.h ./s_table.h ./p_table.h ./ip.c
-des.o: ./p.c ./fp.c
-cbc_encrypt.o: cbc_encrypt.c 
-cbc_encrypt.o: des.h
-cbc_encrypt.o: mit-cpyright.h
-cbc_encrypt.o: des_conf.h
-verify.o: verify.c 
-verify.o: des.h
-verify.o: mit-cpyright.h
-verify.o: des_conf.h
-read_pssword.o: read_pssword.c
-read_pssword.o: des.h
-read_pssword.o: mit-cpyright.h
-read_pssword.o: des_conf.h 
-pcbc_encrypt.o: pcbc_encrypt.c
-pcbc_encrypt.o: des.h des_internal.h
-pcbc_encrypt.o: mit-cpyright.h
-pcbc_encrypt.o: des_conf.h
-cksum.o: des.h
-cksum.o: mit-cpyright.h
-cksum.o: des_conf.h
-quad_cksum.o: quad_cksum.c 
-quad_cksum.o: des.h
-quad_cksum.o: mit-cpyright.h
-quad_cksum.o: des_conf.h
-#random_key.o: random_key.c 
-#random_key.o: des.h
-#random_key.o: mit-cpyright.h
-#random_key.o: des_conf.h 
-key_parity.o: key_parity.c des.h odd.h
-weak_key.o: weak_key.c des.h des_internal.h
-new_rnd_key.o: des.h des_internal.h 
-util.o: util.c
-util.o: des.h
-util.o: mit-cpyright.h
-util.o: des_conf.h
-strng_to_key.o: strng_to_key.c 
-strng_to_key.o: des.h
-strng_to_key.o: mit-cpyright.h
-strng_to_key.o: des_conf.h ./odd.h
-debug_decl.o: debug_decl.c
-make_e.o: make_e.c
-make_keyperm.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_keyperm.c
-make_ip.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_ip.c
-make_fp.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_fp.c
-make_p.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p.c
-make_s.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s.c
-make_s_table.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s_table.c
-make_p_table.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p_table.c
-make_odd.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_odd.c
-misc.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/misc.c
-misco.c: misc.c
-       -ln -s misc.c misco.c
-misco.o: misco.c
-        ${CC} -I${SRC} ${F_CPP} ${F_CC} -o misco.o misco.c -DDONT_INCL_MAIN
-key_sched.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_sched.c
-key_test.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_test.c
-testit.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/testit.c
-crypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/crypt.c
-des.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/des.c
-cbc_encrypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cbc_encrypt.c
-verify.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/verify.c
-read_pssword.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/read_pssword.c
-pcbc_encrypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/pcbc_encrypt.c
-cksum.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cksum.c
-quad_cksum.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/quad_cksum.c
-#random_key.o:
-#      ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/random_key.c
-key_parity.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_parity.c
-weak_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/weak_key.c
-new_rnd_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/new_rnd_key.c
-util.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/util.c
-strng_to_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/strng_to_key.c
-debug_decl.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/debug_decl.c
-make_e.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_e.c
-# DEPENDENCIES MUST END AT END OF FILE
-# IF YOU PUT STUFF HERE IT WILL GO AWAY (see make depend above)
diff --git a/src/des/Makefile.in b/src/des/Makefile.in
new file mode 100644 (file)
index 0000000..5a00a7d
--- /dev/null
@@ -0,0 +1,441 @@
+#
+# Copyright 1987 by the Massachusetts Institute of Technology.
+#
+# For copying and distribution information,
+# please see the file <mit-cpyright.h>.
+#
+# Makefile for BSD DES library
+#
+# First define machine type, compiler, and object file suffix
+# Could be for VAX or PC-DOS
+#
+# Some of these files are cross compiled on the vax for the pc8086,
+# using the MIT LCS cross-compilation environment
+# Others are always executed on the vax(host).
+#
+# A machine, e.g. Vax, pc8086, IBM experimental workstation, is 
+# described in terms of defines for its word length
+# (BITS32 or BITS16), byte ordering (LSBFIRST or MSBFIRST) and 
+# operating system (BSDUNIX or CROSSMSDOS).
+#
+# Make sure these are properly defined for any new machine types.
+# target machine for run-time code (may cross-compile),
+# override as needed 
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../config/Makefile.${SYS_NAME}
+
+UKERNELDIR=../libuafs/
+SRC    =.
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+UKSRCS=des.h mit-cpyright.h
+
+K_INC  = ${SRCDIR}include
+DBG    =
+GPROF  =
+# by default do not try to hide entry points
+F_CC   = -c ${GPROF} ${DBG} ${XCFLAGS}
+F_CPP  = -I${K_INC} -I. -I${TOP_SRCDIR}/config 
+MK_STR = "     \$${CC} -I\$${SRC} \$${F_CPP} \$${F_CC}" -I${TOP_SRCDIR}/config 
+LDFLAGS = ${XLDFLAGS}
+
+# dont use optimizer, since it pessimizes on uvax2,
+# somehow -pg makes it faster.
+
+TAGS   = /bin/ctags
+
+DES_LIB  = libdes.a
+DEP_LIBS = ${DES_LIB} ${NDES_LIB}
+LIBS    = ${DEP_LIBS} ${XLIBS}
+LLIB    = llib-ldes.ln
+
+SRCHOST        = \
+       ${SRC}/make_keyperm.c \
+       ${SRC}/make_ip.c \
+       ${SRC}/make_fp.c \
+       ${SRC}/make_p.c \
+       ${SRC}/make_s.c \
+       ${SRC}/make_s_table.c \
+       ${SRC}/make_p_table.c \
+       ${SRC}/make_odd.c \
+       ${SRC}/misc.c
+
+OBJHOST        = \
+       make_keyperm.o \
+       make_ip.o \
+       make_fp.o \
+       make_e.o \
+       make_p.o \
+       make_s.o \
+       make_s_table.o \
+       make_p_table.o \
+       make_odd.o \
+       misc.o
+
+SRCTARG        = \
+       ${SRC}/key_sched.c \
+       ${SRC}/des.c \
+       ${SRC}/cbc_encrypt.c \
+       ${SRC}/read_pssword.c \
+       ${SRC}/pcbc_encrypt.c \
+       ${SRC}/cksum.c \
+       ${SRC}/quad_cksum.c \
+       ${SRC}/new_rnd_key.c \
+       ${SRC}/key_parity.c \
+       ${SRC}/weak_key.c \
+       ${SRC}/util.c \
+       ${SRC}/strng_to_key.c \
+       ${SRC}/debug_decl.c
+
+OBJTARG        = \
+       key_sched.o \
+       des.o \
+       cbc_encrypt.o \
+       read_pssword.o \
+       pcbc_encrypt.o \
+       cksum.o \
+       quad_cksum.o \
+       key_parity.o \
+       weak_key.o \
+       new_rnd_key.o \
+       util.o \
+       strng_to_key.o \
+       debug_decl.o
+
+CFILES = ${SRCHOST} ${SRCTARG}
+OBJECTS        = ${OBJHOST} ${OBJTARG}
+
+CODE   = ${CFILES} ${SRC}/Makefile
+
+# Generated files
+GFILES = \
+       key_perm.h \
+       p_table.h \
+       s_table.h \
+       odd.h \
+       p.c \
+       s.c \
+       fp.c \
+       ip.c
+
+# Programs to create generated files
+GPROGS = \
+       make_keyperm \
+       make_p_table \
+       make_s_table \
+       make_odd \
+       make_p \
+       make_s \
+       make_fp \
+       make_ip
+
+XGPROGS = \
+       misc \
+       make_e
+
+# Library component lists.
+
+TARGOBJS = \
+       des.o \
+       cbc_encrypt.o \
+       pcbc_encrypt.o \
+       cksum.o \
+       new_rnd_key.o \
+       key_sched.o \
+       debug_decl.o \
+       quad_cksum.o \
+       key_parity.o \
+       weak_key.o \
+       read_pssword.o \
+       strng_to_key.o \
+       misco.o \
+       ${CRYPT_OBJ} \
+       util.o
+
+
+include ../config/Makefile.version
+
+# This is required to get compiler flags, but not use CFLAGS.
+AFS_component_version_number.o: AFS_component_version_number.c
+       $(CC) ${XCFLAGS} -c AFS_component_version_number.c
+
+noversion: install
+
+all:   ${GFILES} ${CFILES} ${DEP_LIBS}
+
+gprogs: ${GPROGS}
+
+test: 
+       cd test; $(MAKE)
+
+system: install
+
+kinstall:
+       @echo No $@ source here.
+
+ukinstall webinstall: all ${UKSRCS}
+       set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}des
+       ${INSTALL} libdes.a ${UKERNELDIR}des/libdes.a
+
+${DESTDIR}lib/libdes.a: libdes.a
+       ${INSTALL} $? $@
+
+install install.noversion: all ukinstall ${DESTDIR}lib/libdes.a
+       ${INSTALL} des.h des_conf.h mit-cpyright.h ${DESTDIR}include
+       ${INSTALL} odd.h ${DESTDIR}include/des_odd.h
+
+clean:
+       rm -f ${OBJECTS} ${DEP_LIBS} ${PROGS} ${GPROGS} ${GFILES} AFS_component_version_number.c misco.c
+       rm -f *.s *.o *.b core *~ *.com *.ld
+       rm -f tags TAGS ${LLIB}
+
+tags:  ${CFILES}
+       rm -f tags; ${TAGS} ${CFILES}
+
+print: ${CODE}
+       lpr -p ${CODE}
+
+src:   ${CODE}
+
+${CODE}:
+       (cd ${SRC}; co -q $@)
+
+lint:  ${LLIB}
+
+${LLIB}: ${CFILES}
+       lint -I${K_INC} ${CFILES}
+
+${DES_LIB}: ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
+       rm -f ${DES_LIB}
+       ar r ${DES_LIB} ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
+       $(RANLIB) ${DES_LIB}
+
+#      host system stuff
+make_ip: make_ip.o misc.o
+       ${CC} make_ip.o misc.o ${LDFLAGS} -o make_ip
+make_fp: make_fp.o misc.o
+       ${CC} make_fp.o misc.o ${LDFLAGS} -o make_fp
+make_odd: make_odd.o misc.o
+       ${CC} ${LDFLAGS} make_odd.o -o make_odd misc.o
+make_s_table: make_s_table.o misc.o    
+       ${CC} ${LDFLAGS} make_s_table.o misc.o -o make_s_table
+make_p_table: make_p_table.o misc.o    
+       ${CC} ${LDFLAGS} make_p_table.o misc.o -o make_p_table
+make_keyperm:  make_keyperm.o misc.o
+       ${CC} make_keyperm.o misc.o ${LDFLAGS} -o make_keyperm
+make_e:        make_e.o misc.o
+       ${CC} make_e.o misc.o ${LDFLAGS} -o make_e
+make_p:        make_p.o misc.o
+       ${CC} make_p.o misc.o ${LDFLAGS} -o make_p
+make_s:        make_s.o misc.o
+       ${CC} make_s.o misc.o ${LDFLAGS} -o make_s
+
+odd.h: make_odd
+       -./make_odd odd.h
+s_table.h: make_s_table
+       -./make_s_table s_table.h
+p_table.h: make_p_table
+       -./make_p_table p_table.h
+key_perm.h: make_keyperm
+       -./make_keyperm key_perm.h
+ip.c:  make_ip
+       -./make_ip ip.c
+p.c:   make_p
+       -./make_p p.c
+s.c:   make_s
+       -./make_s s.c
+fp.c:  make_fp
+       -./make_fp fp.c
+
+depend: ${CFILES} AFS_component_version_number.o
+       -${CC} -M ${F_CPP} ${CFILES} | \
+       sed -e ':loop' \
+       -e 't loop' | \
+       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
+       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
+                  else rec = rec " " $$2 } } \
+         END { print rec } ' > makedep
+       for file in ${OBJECTS} ; do \
+       echo "$$file:" >> makedep; \
+       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
+       done
+       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
+       echo '$$r makedep' >>eddep
+       echo 'w' >>eddep
+       cp Makefile Makefile.bak
+       ex - Makefile < eddep
+       rm eddep makedep
+       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
+       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
+       echo ' (see make depend above)' >> Makefile
+       make depend2 SRCDIR=${SRCDIR}
+
+depend2: ${CFILES} ${GFILES}
+       ${CC} -M ${F_CPP} ${CFILES} | \
+       sed -e ':loop' \
+       -e 't loop' | \
+       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
+       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
+                  else rec = rec " " $$2 } } \
+         END { print rec } ' > makedep
+       for file in ${OBJECTS} ; do \
+       echo "$$file:" >> makedep; \
+       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
+       done
+       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
+       echo '$$r makedep' >>eddep
+       echo 'w' >>eddep
+       cp Makefile Makefile.bak
+       ex - Makefile < eddep
+       rm eddep makedep
+       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
+       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
+       echo ' (see make depend above)' >> Makefile
+
+misc.o make_e.o: AFS_component_version_number.c
+# DO NOT DELETE THIS LINE
+
+make_keyperm.o: make_keyperm.c 
+make_keyperm.o: 
+make_ip.o: make_ip.c 
+make_ip.o: tables.h
+make_fp.o: make_fp.c 
+make_fp.o: tables.h
+make_p.o: make_p.c
+make_p.o: conf.h tables.h
+make_s.o: make_s.c ./s_table.h
+make_s_table.o: make_s_table.c
+make_s_table.o: tables.h
+make_p_table.o: make_p_table.c 
+make_p_table.o: conf.h
+make_p_table.o: tables.h
+make_odd.o: make_odd.c 
+misc.o: misc.c des_internal.h
+misc.o: conf.h
+key_sched.o: key_sched.c
+key_sched.o: conf.h 
+key_sched.o: des.h des_internal.h
+key_sched.o: mit-cpyright.h
+key_sched.o: des_conf.h ./key_perm.h ./odd.h
+key_test.o: key_test.c
+key_test.o: des.h
+key_test.o: mit-cpyright.h
+key_test.o: des_conf.h
+testit.o: testit.c
+testit.o: des.h
+testit.o: mit-cpyright.h
+testit.o: des_conf.h
+des.o: des.c des_internal.h
+des.o: des.h
+des.o: mit-cpyright.h
+des.o: des_conf.h ./s_table.h ./p_table.h ./ip.c
+des.o: ./p.c ./fp.c
+cbc_encrypt.o: cbc_encrypt.c 
+cbc_encrypt.o: des.h
+cbc_encrypt.o: mit-cpyright.h
+cbc_encrypt.o: des_conf.h
+verify.o: verify.c 
+verify.o: des.h
+verify.o: mit-cpyright.h
+verify.o: des_conf.h
+read_pssword.o: read_pssword.c
+read_pssword.o: des.h
+read_pssword.o: mit-cpyright.h
+read_pssword.o: des_conf.h 
+pcbc_encrypt.o: pcbc_encrypt.c
+pcbc_encrypt.o: des.h des_internal.h
+pcbc_encrypt.o: mit-cpyright.h
+pcbc_encrypt.o: des_conf.h
+cksum.o: des.h
+cksum.o: mit-cpyright.h
+cksum.o: des_conf.h
+quad_cksum.o: quad_cksum.c 
+quad_cksum.o: des.h
+quad_cksum.o: mit-cpyright.h
+quad_cksum.o: des_conf.h
+#random_key.o: random_key.c 
+#random_key.o: des.h
+#random_key.o: mit-cpyright.h
+#random_key.o: des_conf.h 
+key_parity.o: key_parity.c des.h odd.h
+weak_key.o: weak_key.c des.h des_internal.h
+new_rnd_key.o: des.h des_internal.h 
+util.o: util.c
+util.o: des.h
+util.o: mit-cpyright.h
+util.o: des_conf.h
+strng_to_key.o: strng_to_key.c 
+strng_to_key.o: des.h
+strng_to_key.o: mit-cpyright.h
+strng_to_key.o: des_conf.h ./odd.h
+debug_decl.o: debug_decl.c
+make_e.o: make_e.c
+make_keyperm.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_keyperm.c
+make_ip.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_ip.c
+make_fp.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_fp.c
+make_p.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p.c
+make_s.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s.c
+make_s_table.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s_table.c
+make_p_table.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p_table.c
+make_odd.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_odd.c
+misc.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/misc.c
+misco.c: misc.c
+       -ln -s misc.c misco.c
+misco.o: misco.c
+        ${CC} -I${SRC} ${F_CPP} ${F_CC} -o misco.o misco.c -DDONT_INCL_MAIN
+key_sched.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_sched.c
+key_test.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_test.c
+testit.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/testit.c
+crypt.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/crypt.c
+des.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/des.c
+cbc_encrypt.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cbc_encrypt.c
+verify.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/verify.c
+read_pssword.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/read_pssword.c
+pcbc_encrypt.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/pcbc_encrypt.c
+cksum.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cksum.c
+quad_cksum.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/quad_cksum.c
+#random_key.o:
+#      ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/random_key.c
+key_parity.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_parity.c
+weak_key.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/weak_key.c
+new_rnd_key.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/new_rnd_key.c
+util.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/util.c
+strng_to_key.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/strng_to_key.c
+debug_decl.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/debug_decl.c
+make_e.o:
+       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_e.c
+# DEPENDENCIES MUST END AT END OF FILE
+# IF YOU PUT STUFF HERE IT WILL GO AWAY (see make depend above)
diff --git a/src/des/test/Makefile b/src/des/test/Makefile
deleted file mode 100644 (file)
index 79b0d23..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-CC     = cc
-#  Test programs
-PROGS  = \
-       key_test \
-       testit \
-       verify
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -ldes
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-all system test: $(PROGS)
-
-clean:
-       rm -f *.o *.a testit verify key_test core
-
-kinstall:
-       @echo No kernel source here.
-
-testit: testit.o 
-       ${CC} ${CFLAGS} testit.o -o testit
-verify: verify.o libdes.a
-       ${CC} ${CFLAGS} verify.o -o verify
-key_test: key_test.o libdes.a
-       ${CC}  ${CFLAGS} key_test.o -o key_test
-
diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in
new file mode 100644 (file)
index 0000000..6356801
--- /dev/null
@@ -0,0 +1,38 @@
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+CC     = cc
+#  Test programs
+PROGS  = \
+       key_test \
+       testit \
+       verify
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS= -ldes
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+all system test: $(PROGS)
+
+clean:
+       rm -f *.o *.a testit verify key_test core
+
+kinstall:
+       @echo No kernel source here.
+
+testit: testit.o 
+       ${CC} ${CFLAGS} testit.o -o testit
+verify: verify.o libdes.a
+       ${CC} ${CFLAGS} verify.o -o verify
+key_test: key_test.o libdes.a
+       ${CC}  ${CFLAGS} key_test.o -o key_test
+
diff --git a/src/des_stub/Makefile b/src/des_stub/Makefile
deleted file mode 100644 (file)
index c1ce990..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-
-# Install the des libraries and header files from the 
-# PARENT link instead of building them.
-#
-
-SHELL  = /bin/sh
-include ../config/Makefile.${SYS_NAME}
-
-RM     = /bin/rm
-UKERNELDIR=../libuafs/
-SRC    =.
-DESPAR =../../../DESLIB/dest/
-DESINC =${DESPAR}include/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-all:
-
-kinstall:
-       @echo No $@ source here.
-ukinstall webinstall: ${DESINC}des.h ${DESINC}mit-cpyright.h
-       set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${DESINC}des.h ${UKERNELDIR}des/des.h
-       ${INSTALL} ${DESINC}mit-cpyright.h ${UKERNELDIR}des/mit-cpyright.h
-       ${INSTALL} ${DESPAR}lib/libdes.a ${UKERNELDIR}des/libdes.a
-
-install install.noversion noversion system: ukinstall
-       echo "Installing des stubs from ${DESPAR}:" `cd ${DESPAR};/bin/pwd`
-       ${RM} -f ${DESTDIR}lib/libdes.a
-       ${INSTALL} ${DESPAR}lib/libdes.a ${DESTDIR}lib/libdes.a
-       ${INSTALL} ${DESINC}des.h ${DESINC}des_conf.h ${DESINC}mit-cpyright.h ${DESTDIR}include
-       ${INSTALL} ${DESINC}des_odd.h ${DESTDIR}include/des_odd.h
-
-clean:
-
-lint:
-
diff --git a/src/des_stub/Makefile.in b/src/des_stub/Makefile.in
new file mode 100644 (file)
index 0000000..0b69de2
--- /dev/null
@@ -0,0 +1,46 @@
+# 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
+
+# Install the des libraries and header files from the 
+# PARENT link instead of building them.
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL  = /bin/sh
+include ../config/Makefile.${SYS_NAME}
+
+RM     = /bin/rm
+UKERNELDIR=../libuafs/
+SRC    =.
+DESPAR =../../../DESLIB/dest/
+DESINC =${DESPAR}include/
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+all:
+
+kinstall:
+       @echo No $@ source here.
+ukinstall webinstall: ${DESINC}des.h ${DESINC}mit-cpyright.h
+       set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${DESINC}des.h ${UKERNELDIR}des/des.h
+       ${INSTALL} ${DESINC}mit-cpyright.h ${UKERNELDIR}des/mit-cpyright.h
+       ${INSTALL} ${DESPAR}lib/libdes.a ${UKERNELDIR}des/libdes.a
+
+install install.noversion noversion system: ukinstall
+       echo "Installing des stubs from ${DESPAR}:" `cd ${DESPAR};/bin/pwd`
+       ${RM} -f ${DESTDIR}lib/libdes.a
+       ${INSTALL} ${DESPAR}lib/libdes.a ${DESTDIR}lib/libdes.a
+       ${INSTALL} ${DESINC}des.h ${DESINC}des_conf.h ${DESINC}mit-cpyright.h ${DESTDIR}include
+       ${INSTALL} ${DESINC}des_odd.h ${DESTDIR}include/des_odd.h
+
+clean:
+
+lint:
+
diff --git a/src/dir/Makefile b/src/dir/Makefile
deleted file mode 100644 (file)
index e28dad7..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=dir
-include ../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XINCLS}
-CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
-
-OBJS=buffer.o dir.o salvage.o
-include ../config/Makefile.version
-
-system noversion: install
-
-cmdall: all test
-
-all: libdir.a
-
-libdir.a: ${OBJS} AFS_component_version_number.o
-       rm -f libdir.a
-       ar rv libdir.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libdir.a
-
-kinstall:
-       ${INSTALL} dir.h ${KERNELDIR}afs
-       ${INSTALL} dir.c ${KERNELDIR}afs/afs_dir.c
-
-ukinstall webinstall:
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} dir.h ${UKERNELDIR}afs
-       ${INSTALL} dir.c ${UKERNELDIR}afs/afs_dir.c
-
-install:       all kinstall ukinstall
-       ${INSTALL} libdir.a ${DESTDIR}lib/afs
-       ${INSTALL} dir.h ${DESTDIR}include/afs
-
-test: 
-       (cd test; $(MAKE) )
-
-buffer.o: buffer.c
-
-dir.o: dir.c dir.h
-
-salvage.o: salvage.c dir.h
-
-#doc:
-#      ${INSTALL} -m 644 dir.vdoc ${DESTDIR}doc/vdoc
-
-clean:
-       rm -f *.o *.a core AFS_component_version_number.c
-
-beancount:
-       wc -l *.c *.h
-
diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in
new file mode 100644 (file)
index 0000000..41f186f
--- /dev/null
@@ -0,0 +1,68 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XINCLS}
+CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
+
+OBJS=buffer.o dir.o salvage.o
+include ../config/Makefile.version
+
+system noversion: install
+
+cmdall: all test
+
+all: libdir.a
+
+libdir.a: ${OBJS} AFS_component_version_number.o
+       rm -f libdir.a
+       ar rv libdir.a $(OBJS) AFS_component_version_number.o
+       $(RANLIB) libdir.a
+
+kinstall:
+       ${INSTALL} dir.h ${KERNELDIR}afs
+       ${INSTALL} dir.c ${KERNELDIR}afs/afs_dir.c
+
+ukinstall webinstall:
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} dir.h ${UKERNELDIR}afs
+       ${INSTALL} dir.c ${UKERNELDIR}afs/afs_dir.c
+
+install:       all kinstall ukinstall
+       ${INSTALL} libdir.a ${DESTDIR}lib/afs
+       ${INSTALL} dir.h ${DESTDIR}include/afs
+
+test: 
+       (cd test; $(MAKE) )
+
+buffer.o: buffer.c
+
+dir.o: dir.c dir.h
+
+salvage.o: salvage.c dir.h
+
+#doc:
+#      ${INSTALL} -m 644 dir.vdoc ${DESTDIR}doc/vdoc
+
+clean:
+       rm -f *.o *.a core AFS_component_version_number.c
+
+beancount:
+       wc -l *.c *.h
+
diff --git a/src/dir/test/Makefile b/src/dir/test/Makefile
deleted file mode 100644 (file)
index 83c0d5c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=dtest
-include ../../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-INSTALL = ${SRCDIR}bin/install
-
-INCDIRS= -I${DESTDIR}include ${XINCLS}
-LIBS = ${SRCDIR}lib/afs/libdir.a ${SRCDIR}lib/afs/util.a 
-CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
-
-OBJS=test-salvage.o physio.o dtest.o
-
-install:       dtest 
-
-clean:
-       rm -f *.o *.a test dtest core
-
-dtest:         dtest.o 
-       $(CC) $(LDFLAGS) -o dtest dtest.o $(LIBS)
-
-dtest.o:       dtest.c 
-       $(CC) $(CFLAGS) -c dtest.c 
-
-#test-salvage:         test-salvage.o  physio.o
-#      $(CC) $(LDFLAGS) -o test-salvage test-salvage.o physio.o $(LIBS)
-#
-#test-salvage.o:       test-salvage.c  physio.c
-#      $(CC) $(CFLAGS) -c test-salvage.c 
-#
-#physio.o:     physio.c 
-#      $(CC) $(CFLAGS) -c physio.c 
diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in
new file mode 100644 (file)
index 0000000..d596972
--- /dev/null
@@ -0,0 +1,44 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+INSTALL = ${SRCDIR}bin/install
+
+INCDIRS= -I${DESTDIR}include ${XINCLS}
+LIBS = ${SRCDIR}lib/afs/libdir.a ${SRCDIR}lib/afs/util.a 
+CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
+
+OBJS=test-salvage.o physio.o dtest.o
+
+install:       dtest 
+
+clean:
+       rm -f *.o *.a test dtest core
+
+dtest:         dtest.o 
+       $(CC) $(LDFLAGS) -o dtest dtest.o $(LIBS)
+
+dtest.o:       dtest.c 
+       $(CC) $(CFLAGS) -c dtest.c 
+
+#test-salvage:         test-salvage.o  physio.o
+#      $(CC) $(LDFLAGS) -o test-salvage test-salvage.o physio.o $(LIBS)
+#
+#test-salvage.o:       test-salvage.c  physio.c
+#      $(CC) $(CFLAGS) -c test-salvage.c 
+#
+#physio.o:     physio.c 
+#      $(CC) $(CFLAGS) -c physio.c 
diff --git a/src/export/Makefile b/src/export/Makefile
deleted file mode 100644 (file)
index 98469f2..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-
-# $Locker$
-#
-# Makefile for EXPORT kernel extension, and friends
-#
-
-COMPONENT=export
-include ../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-     DEFS =
-     INCS = -I${TOP_SRCDIR}/config -I${SRCDIR}include
-   CFLAGS = ${OPTMZ} ${DEFS} ${INCS}
-  EXPORTS = -bexport:export.exp
-  IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp
-     KOBJ = export.o symtab.o
-
-include ../config/Makefile.version
-
-all: export.ext export.ext.nonfs cfgexport cfgafs
-
-noversion system: install
-
-install: all kinstall ukinstall
-       ${INSTALL} export.ext ${DESTDIR}root.client/usr/vice/etc/dkload
-       ${INSTALL} export.ext.nonfs ${DESTDIR}root.client/usr/vice/etc/dkload
-       ${INSTALL} export.exp ${DESTDIR}lib/afs/export.exp
-       ${INSTALL} extras.exp ${DESTDIR}lib/afs/extras.exp
-       ${INSTALL} cfgexport  ${DESTDIR}root.client/usr/vice/etc/dkload/cfgexport
-       ${INSTALL} cfgafs     ${DESTDIR}root.client/usr/vice/etc/dkload/cfgafs
-
-kinstall:
-       ${INSTALL} export.h ${DESTDIR}include
-       ${INSTALL} export.h ../libafs
-       ${INSTALL} export.exp ${DESTDIR}lib
-       ${INSTALL} export.exp ../libafs
-
-ukinstall webinstall:
-       ${INSTALL} export.h ${UKERNELDIR}
-       ${INSTALL} export.exp ${UKERNELDIR}
-
-export.ext: ${KOBJ}
-       ${LD} -o export.ext -eexport ${IMPORTS} ${KOBJ} ${EXPORTS} -lcsys
-
-export.ext.nonfs: export.nonfs.o symtab.o
-       ${LD} -o export.ext.nonfs -eexport ${IMPORTS} export.nonfs.o symtab.o ${EXPORTS} -lcsys
-
-export.nonfs.o:
-       ${CC} ${INCS} -DAFS_NONFSTRANS -c export.c
-       -mv export.o export.nonfs.o
-
-cfgexport: cfgexport.o
-       ${CC} ${INCS} -O -o cfgexport cfgexport.o
-
-cfgafs: cfgafs.o
-       ${CC} ${INCS} -O -o cfgafs cfgafs.o
-
-cfgexport.o: cfgexport.c AFS_component_version_number.c
-cfgafs.o: cfgafs.c AFS_component_version_number.c
-
-clean:
-       rm -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c
diff --git a/src/export/Makefile.in b/src/export/Makefile.in
new file mode 100644 (file)
index 0000000..f02fe4c
--- /dev/null
@@ -0,0 +1,73 @@
+# 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
+
+# $Locker$
+#
+# Makefile for EXPORT kernel extension, and friends
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+     DEFS =
+     INCS = -I${TOP_SRCDIR}/config -I${SRCDIR}include
+   CFLAGS = ${OPTMZ} ${DEFS} ${INCS}
+  EXPORTS = -bexport:export.exp
+  IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp
+     KOBJ = export.o symtab.o
+
+include ../config/Makefile.version
+
+all: export.ext export.ext.nonfs cfgexport cfgafs
+
+noversion system: install
+
+install: all kinstall ukinstall
+       ${INSTALL} export.ext ${DESTDIR}root.client/usr/vice/etc/dkload
+       ${INSTALL} export.ext.nonfs ${DESTDIR}root.client/usr/vice/etc/dkload
+       ${INSTALL} export.exp ${DESTDIR}lib/afs/export.exp
+       ${INSTALL} extras.exp ${DESTDIR}lib/afs/extras.exp
+       ${INSTALL} cfgexport  ${DESTDIR}root.client/usr/vice/etc/dkload/cfgexport
+       ${INSTALL} cfgafs     ${DESTDIR}root.client/usr/vice/etc/dkload/cfgafs
+
+kinstall:
+       ${INSTALL} export.h ${DESTDIR}include
+       ${INSTALL} export.h ../libafs
+       ${INSTALL} export.exp ${DESTDIR}lib
+       ${INSTALL} export.exp ../libafs
+
+ukinstall webinstall:
+       ${INSTALL} export.h ${UKERNELDIR}
+       ${INSTALL} export.exp ${UKERNELDIR}
+
+export.ext: ${KOBJ}
+       ${LD} -o export.ext -eexport ${IMPORTS} ${KOBJ} ${EXPORTS} -lcsys
+
+export.ext.nonfs: export.nonfs.o symtab.o
+       ${LD} -o export.ext.nonfs -eexport ${IMPORTS} export.nonfs.o symtab.o ${EXPORTS} -lcsys
+
+export.nonfs.o:
+       ${CC} ${INCS} -DAFS_NONFSTRANS -c export.c
+       -mv export.o export.nonfs.o
+
+cfgexport: cfgexport.o
+       ${CC} ${INCS} -O -o cfgexport cfgexport.o
+
+cfgafs: cfgafs.o
+       ${CC} ${INCS} -O -o cfgafs cfgafs.o
+
+cfgexport.o: cfgexport.c AFS_component_version_number.c
+cfgafs.o: cfgafs.c AFS_component_version_number.c
+
+clean:
+       rm -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c
diff --git a/src/finale/Makefile b/src/finale/Makefile
deleted file mode 100644 (file)
index 67099f6..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
-
-# */
-
-
-SHELL = /bin/sh
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = -g ${XLDFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/lock.h  \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/com_err.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h \
-       ${SRCDIR}include/afs/pterror.h \
-       ${SRCDIR}include/afs/kautils.h \
-       ${SRCDIR}include/afs/bnode.h \
-       ${SRCDIR}include/afs/vlserver.h
-
-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-vllib=${SRCDIR}lib/afs/libvldb.a
-boslib=${SRCDIR}lib/afs/libbos.a
-volserlib=${SRCDIR}lib/afs/libvolser.a
-utilib=${SRCDIR}lib/afs/util.a
-
-LIBS=${SRCDIR}lib/libubik.a ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a ${authlib} ${SRCDIR}lib/afs/libsys.a ${deslib} ${rxkadlib} ${cmdlib} ${vllib} ${boslib} ${SRCDIR}lib/afs/libcom_err.a ${volserlib} ${utilib} ${SRCDIR}lib/afs/libkauth.a ${SRCDIR}lib/afs/libprot.a ${SRCDIR}lib/libdes.a ${XLIBS}
-
-COMPONENT=finale
-include ../config/Makefile.version
-
-all:  translate_et
-
-clean:
-       rm -f *.o translate_et core AFS_component_version_number.c
-
-translate_et: translate_et.o ${INCLS}
-       ${CC} ${LDFLAGS} -o translate_et translate_et.o ${LIBS}
-
-translate_et.o: AFS_component_version_number.c
-
-test: translate_et
-       echo -n > /tmp/translate_et.output
-       -./translate_et >> /tmp/translate_et.output 2>&1
-       ./translate_et 55 >> /tmp/translate_et.output
-       ./translate_et 110 >> /tmp/translate_et.output
-       ./translate_et 255 >> /tmp/translate_et.output
-       ./translate_et 256 >> /tmp/translate_et.output
-       ./translate_et -1 -451 >> /tmp/translate_et.output
-       ./translate_et 1613147 >> /tmp/translate_et.output
-       ./translate_et 19270407 >> /tmp/translate_et.output
-       ./translate_et 180511 >> /tmp/translate_et.output
-       diff test.output /tmp/translate_et.output
-       rm /tmp/translate_et.output
-
-system: install
-
-noversion install.noversion install: all
-       ${INSTALL} translate_et ${DESTDIR}bin/translate_et
diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in
new file mode 100644 (file)
index 0000000..4da24c3
--- /dev/null
@@ -0,0 +1,81 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = -g ${XLDFLAGS}
+INCLS=${SRCDIR}include/ubik.h \
+       ${SRCDIR}include/lwp.h \
+       ${SRCDIR}include/lock.h  \
+       ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h \
+       ${SRCDIR}include/rx/rxkad.h \
+       ${SRCDIR}include/afs/com_err.h \
+       ${SRCDIR}include/afs/auth.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/afs/cmd.h \
+       ${SRCDIR}include/afs/pterror.h \
+       ${SRCDIR}include/afs/kautils.h \
+       ${SRCDIR}include/afs/bnode.h \
+       ${SRCDIR}include/afs/vlserver.h
+
+LIBS=${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libvldb.a \
+       ${SRCDIR}lib/afs/libbos.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/libvolser.a \
+       ${SRCDIR}lib/afs/util.a \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libprot.a \
+       ${SRCDIR}lib/libdes.a \
+       ${XLIBS}
+
+include ../config/Makefile.version
+
+all:  translate_et
+
+clean:
+       rm -f *.o translate_et core AFS_component_version_number.c
+
+translate_et: translate_et.o ${INCLS}
+       ${CC} ${LDFLAGS} -o translate_et translate_et.o ${LIBS}
+
+translate_et.o: AFS_component_version_number.c
+
+test: translate_et
+       echo -n > /tmp/translate_et.output
+       -./translate_et >> /tmp/translate_et.output 2>&1
+       ./translate_et 55 >> /tmp/translate_et.output
+       ./translate_et 110 >> /tmp/translate_et.output
+       ./translate_et 255 >> /tmp/translate_et.output
+       ./translate_et 256 >> /tmp/translate_et.output
+       ./translate_et -1 -451 >> /tmp/translate_et.output
+       ./translate_et 1613147 >> /tmp/translate_et.output
+       ./translate_et 19270407 >> /tmp/translate_et.output
+       ./translate_et 180511 >> /tmp/translate_et.output
+       diff test.output /tmp/translate_et.output
+       rm /tmp/translate_et.output
+
+system: install
+
+noversion install.noversion install: all
+       ${INSTALL} translate_et ${DESTDIR}bin/translate_et
diff --git a/src/fsint/Makefile b/src/fsint/Makefile
deleted file mode 100644 (file)
index 861d529..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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
-
-COMPONENT=fsint
-include ../config/Makefile.${SYS_NAME}
-SHELL = /bin/sh
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
-CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-KDSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h \
-afsint.h
-KSRCS=${KDSRCS} afsaux.c
-UKSRCS=${KSRCS}
-UTILS=$(SRCDIR)/bin/rxgen
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: libafsint.a $(KSRCS)
-
-libafsint.a: ${OBJS} AFS_component_version_number.o
-       -rm -f $@
-       $(AR) rv $@ ${OBJS} AFS_component_version_number.o
-       $(RANLIB) $@
-
-afsaux.o: afsaux.c afsint.h
-
-Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -C -o Kcallback.cs.c afscbint.xg
-
-Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -S -o Kcallback.ss.c afscbint.xg
-
-Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -y -c -o Kcallback.xdr.c afscbint.xg
-
-Kvice.cs.c: common.xg afsint.xg Kvice.h  $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -C -o Kvice.cs.c afsint.xg
-
-Kvice.ss.c: common.xg afsint.xg Kvice.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -S -o Kvice.ss.c afsint.xg
-
-Kvice.xdr.c: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -c -o Kvice.xdr.c afsint.xg
-
-Kvice.h: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -h -o Kvice.h afsint.xg
-
-Kcallback.h: common.xg afscbint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -h -o Kcallback.h afscbint.xg
-
-afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -C -o afscbint.cs.c afscbint.xg
-
-afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -S -o afscbint.ss.c afscbint.xg
-
-afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -y -c -o afscbint.xdr.c afscbint.xg
-
-afsint.cs.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -C -o afsint.cs.c afsint.xg
-
-afsint.ss.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -S -o afsint.ss.c afsint.xg
-
-afsint.xdr.c: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -c -o afsint.xdr.c afsint.xg
-
-afsint.h: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -h -o afsint.h afsint.xg
-
-afscbint.h: common.xg afscbint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -h -o afscbint.h afscbint.xg
-
-system: install
-
-kinstall: ${KSRCS}
-       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
-       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${KERNELDIR}afsint
-       -${INSTALL} ${KERNELDIR}rx/rx.h ${KERNELDIR}afsint/rx.h
-       ${INSTALL} afscbint.h ${KERNELDIR}afs
-
-ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
-       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${UKERNELDIR}afsint
-       -${INSTALL} ${UKERNELDIR}rx/rx.h ${UKERNELDIR}afsint/rx.h
-       ${INSTALL} afscbint.h ${UKERNELDIR}afs
-
-install:  all  kinstall ukinstall
-       ${INSTALL} libafsint.a ${DESTDIR}lib/afs
-       ${INSTALL} afsint.h ${DESTDIR}include/afs
-       ${INSTALL} afscbint.h ${DESTDIR}include/afs
-
-clean:
-       rm -f *.o *.cs.c *.ss.c *.er.c afsint.h afsint.xdr.c libafsint.a $(KDSRCS) core AFS_component_version_number.c afscbint.xdr.c
diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in
new file mode 100644 (file)
index 0000000..46f75c9
--- /dev/null
@@ -0,0 +1,111 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.${SYS_NAME}
+SHELL = /bin/sh
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
+CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+KDSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h \
+afsint.h
+KSRCS=${KDSRCS} afsaux.c
+UKSRCS=${KSRCS}
+UTILS=$(SRCDIR)/bin/rxgen
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: libafsint.a $(KSRCS)
+
+libafsint.a: ${OBJS} AFS_component_version_number.o
+       -rm -f $@
+       $(AR) rv $@ ${OBJS} AFS_component_version_number.o
+       $(RANLIB) $@
+
+afsaux.o: afsaux.c afsint.h
+
+Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -C -o Kcallback.cs.c afscbint.xg
+
+Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -S -o Kcallback.ss.c afscbint.xg
+
+Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -y -c -o Kcallback.xdr.c afscbint.xg
+
+Kvice.cs.c: common.xg afsint.xg Kvice.h  $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -C -o Kvice.cs.c afsint.xg
+
+Kvice.ss.c: common.xg afsint.xg Kvice.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -S -o Kvice.ss.c afsint.xg
+
+Kvice.xdr.c: common.xg afsint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -c -o Kvice.xdr.c afsint.xg
+
+Kvice.h: common.xg afsint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -h -o Kvice.h afsint.xg
+
+Kcallback.h: common.xg afscbint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -k -h -o Kcallback.h afscbint.xg
+
+afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -C -o afscbint.cs.c afscbint.xg
+
+afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -S -o afscbint.ss.c afscbint.xg
+
+afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -y -c -o afscbint.xdr.c afscbint.xg
+
+afsint.cs.c: common.xg afsint.xg afsint.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -C -o afsint.cs.c afsint.xg
+
+afsint.ss.c: common.xg afsint.xg afsint.h $(UTILS)
+       ${SRCDIR}bin/rxgen -x -S -o afsint.ss.c afsint.xg
+
+afsint.xdr.c: common.xg afsint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -c -o afsint.xdr.c afsint.xg
+
+afsint.h: common.xg afsint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -h -o afsint.h afsint.xg
+
+afscbint.h: common.xg afscbint.xg $(UTILS)
+       ${SRCDIR}bin/rxgen -x -h -o afscbint.h afscbint.xg
+
+system: install
+
+kinstall: ${KSRCS}
+       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
+       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${KERNELDIR}afsint
+       -${INSTALL} ${KERNELDIR}rx/rx.h ${KERNELDIR}afsint/rx.h
+       ${INSTALL} afscbint.h ${KERNELDIR}afs
+
+ukinstall webinstall: ${UKSRCS}
+       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
+       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${UKERNELDIR}afsint
+       -${INSTALL} ${UKERNELDIR}rx/rx.h ${UKERNELDIR}afsint/rx.h
+       ${INSTALL} afscbint.h ${UKERNELDIR}afs
+
+install:  all  kinstall ukinstall
+       ${INSTALL} libafsint.a ${DESTDIR}lib/afs
+       ${INSTALL} afsint.h ${DESTDIR}include/afs
+       ${INSTALL} afscbint.h ${DESTDIR}include/afs
+
+clean:
+       rm -f *.o *.cs.c *.ss.c *.er.c afsint.h afsint.xdr.c libafsint.a $(KDSRCS) core AFS_component_version_number.c afscbint.xdr.c
diff --git a/src/fsprobe/Makefile b/src/fsprobe/Makefile
deleted file mode 100644 (file)
index 97ac1db..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
-
-# Makefile for fsprobe and its test program, all part of the AFS
-# navigation and monitoring tool (gator).
-#
-SHELL = /bin/sh
-COMPONENT=fsprobe
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS=-g -I. \
-       -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
-       -I${SRCDIR} \
-       -I/usr/include ${XCFLAGS}
-
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
-
-INCLS=fsprobe.h ${RPCINCLS}
-
-LIBS=  ${SRCDIR}lib/afs/libvolser.a ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
-        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a 
-
-OBJS=fsprobe.o \
-       fsprobe_callback.o
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: libfsprobe.a fsprobe_test
-
-libfsprobe.a: ${OBJS} AFS_component_version_number.o
-       -rm -f libfsprobe.a
-       ${AR} rv libfsprobe.a ${OBJS} AFS_component_version_number.o
-       ${RANLIB} libfsprobe.a
-
-fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c
-
-fsprobe_callback.o: fsprobe_callback.c ${INCLS}
-
-fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS}
-       ${CC} ${CFLAGS} -o fsprobe_test fsprobe_test.o libfsprobe.a \
-               ${LIBS} ${XLIBS}
-
-#
-# Misc others
-#
-system: install
-
-install: all
-       ${INSTALL} fsprobe.h    ${DESTDIR}include/afs
-       ${INSTALL} libfsprobe.a ${DESTDIR}lib/afs
-
-clean:
-       rm -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c
diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
new file mode 100644 (file)
index 0000000..4f05bb1
--- /dev/null
@@ -0,0 +1,76 @@
+# 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
+
+# Makefile for fsprobe and its test program, all part of the AFS
+# navigation and monitoring tool (gator).
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS=-g -I. \
+       -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include \
+       -I${SRCDIR}include/afs \
+       -I${SRCDIR} \
+       -I/usr/include ${XCFLAGS}
+
+RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
+
+INCLS=fsprobe.h ${RPCINCLS}
+
+LIBS=  ${SRCDIR}lib/afs/libvolser.a ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
+        ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/afs/libvldb.a \
+        ${SRCDIR}lib/libubik.a \
+        ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/afs/libsys.a \
+        ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
+        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libaudit.a \
+       ${SRCDIR}lib/afs/libafsint.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/util.a 
+
+OBJS=fsprobe.o \
+       fsprobe_callback.o
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: libfsprobe.a fsprobe_test
+
+libfsprobe.a: ${OBJS} AFS_component_version_number.o
+       -rm -f libfsprobe.a
+       ${AR} rv libfsprobe.a ${OBJS} AFS_component_version_number.o
+       ${RANLIB} libfsprobe.a
+
+fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c
+
+fsprobe_callback.o: fsprobe_callback.c ${INCLS}
+
+fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS}
+       ${CC} ${CFLAGS} -o fsprobe_test fsprobe_test.o libfsprobe.a \
+               ${LIBS} ${XLIBS}
+
+#
+# Misc others
+#
+system: install
+
+install: all
+       ${INSTALL} fsprobe.h    ${DESTDIR}include/afs
+       ${INSTALL} libfsprobe.a ${DESTDIR}lib/afs
+
+clean:
+       rm -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c
diff --git a/src/ftpd43+/Makefile b/src/ftpd43+/Makefile
deleted file mode 100644 (file)
index dd15e67..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#      @(#)Makefile    5.8 (Berkeley) 9/22/88
-
-
-COMPONENT=ftpd43+
-include ../config/Makefile.version
-include ../config/Makefile.${SYS_NAME}
-
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a \
-          ${LIBDIR}afs/libaudit.a
-
-LIBS = ${AFSLIBS} 
-CFLAGS=        ${OPTMZ} -I${DESTDIR}include ${XCFLAGS}
-LIBC=  /lib/libc.a 
-SRCS=  ftpd.c ftpcmd.c getusershell.c glob.c logwtmp.c popen.c vers.c
-OBJS=  ftpd.o ftpcmd.o getusershell.o glob.o logwtmp.o popen.o vers.o
-MAN=   ftpd.8
-
-
-noversion: install
-
-all: ftpd
-
-system: install
-
-ftpd: ${OBJS} ${LIBS}
-       case ${SYS_NAME} in \
-       sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-               ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -lsocket -lnsl -lauth -ldl ;; \
-       rs_aix*) \
-               ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -ls  ;; \
-         * )   ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} ;; \
-       esac
-
-ftpd.o: ftpd.c AFS_component_version_number.c
-
-vers.o: ftpd.c ftpcmd.y
-#      sh newvers.sh
-       ${CC} ${CFLAGS} -c vers.c
-
-clean:
-       rm -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN} all
-       ${INSTALL} -s -m 755 ftpd ${DESTDIR}/etc/ftpd
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in
new file mode 100644 (file)
index 0000000..11992f0
--- /dev/null
@@ -0,0 +1,80 @@
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    5.8 (Berkeley) 9/22/88
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.version
+include ../config/Makefile.${SYS_NAME}
+
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a \
+          ${LIBDIR}afs/libaudit.a
+
+LIBS = ${AFSLIBS} 
+CFLAGS=        ${OPTMZ} -I${DESTDIR}include ${XCFLAGS}
+LIBC=  /lib/libc.a 
+SRCS=  ftpd.c ftpcmd.c getusershell.c glob.c logwtmp.c popen.c vers.c
+OBJS=  ftpd.o ftpcmd.o getusershell.o glob.o logwtmp.o popen.o vers.o
+MAN=   ftpd.8
+
+
+noversion: install
+
+all: ftpd
+
+system: install
+
+ftpd: ${OBJS} ${LIBS}
+       case ${SYS_NAME} in \
+       sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
+               ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -lsocket -lnsl -lauth -ldl ;; \
+       rs_aix*) \
+               ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} -ls  ;; \
+         * )   ${CC} -o $@ ${OBJS} ${LIBS} ${XLIBS} ;; \
+       esac
+
+ftpd.o: ftpd.c AFS_component_version_number.c
+
+vers.o: ftpd.c ftpcmd.y
+#      sh newvers.sh
+       ${CC} ${CFLAGS} -c vers.c
+
+clean:
+       rm -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep ${CFLAGS} ${SRCS}
+
+install: ${MAN} all
+       ${INSTALL} -s -m 755 ftpd ${DESTDIR}/etc/ftpd
+
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
diff --git a/src/gtx/Makefile b/src/gtx/Makefile
deleted file mode 100644 (file)
index 63c028d..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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
-
-# Makefile for gtx, a display-independent, object-oriented window toolkit.
-
-
-SHELL=/bin/sh
-COMPONENT=gtx
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET=$(SRCDIR)bin/compile_et
-CFLAGS= ${DBUG} -I. -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
-LDFLAGS = ${XLDFLAGS}
-#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
-RPCINCLS=
-INCLS=gtxobjects.h \
-       gtxwindows.h \
-       gtxcurseswin.h \
-       gtxinput.h \
-       gtxdumbwin.h \
-       gtxX11win.h \
-       gtxobjects.h \
-       gtxkeymap.h \
-       gtxlightobj.h \
-       gtxtextobj.h \
-       gtxframe.h \
-       gtxobjdict.h \
-       ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h
-
-LIBS= \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a
-
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
-
-LINT_LIBS = /usr/lib/lint/llib-lcurses.ln
-
-KEYMAP_SRCS=keymap.c input.c frame.c
-
-KEYMAP_OBJS=keymap.o input.o frame.o
-
-WINDOW_SRCS=curseswindows.c \
-       dumbwindows.c \
-       X11windows.c \
-       windows.c
-
-WINDOW_OBJS=curseswindows.o \
-       dumbwindows.o \
-       X11windows.o \
-       windows.o
-
-OBJECT_SRCS=objects.c \
-       lightobject.c \
-       textobject.c
-
-OBJECT_OBJS=objects.o \
-       lightobject.o \
-       textobject.o
-
-DICT_SRCS=objdict.c
-DICT_OBJS=objdict.o
-
-CB_SRCS=textcb.c
-CB_OBJS=textcb.o
-
-#ERROBJS=err.o
-ERRSRCS=
-ERROJBS=
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: libgtx.a gtxtest
-
-tests: object_test screen_test curses_test cb_test gtxtest
-
-# All objects in the library
-LIBSRCS = ${KEYMAP_SRCS} ${WINDOW_SRCS} ${OBJECT_SRCS} ${DICT_SRCS} \
-       ${ERRSRCS} ${CB_SRCS}
-LIBOBJS = $(KEYMAP_OBJS) ${WINDOW_OBJS} ${OBJECT_OBJS} ${DICT_OBJS} \
-       ${ERROBJS} ${CB_OBJS}
-
-${LIBSRCS}: ${INCLS}
-$(LIBOBJS): ${INCLS}
-
-err.c: err.et
-       rm -f err.h err.c; $(COMPILE_ET) err -h err
-
-keymap.o: keymap.c ${INCLS}
-
-frame.o: frame.c $(INCLS)
-
-input.o: input.c ${INCLS}
-
-curseswindows.o: curseswindows.c ${INCLS}
-
-dumbwindows.o: dumbwindows.c ${INCLS}
-
-X11windows.o: X11windows.c ${INCLS}
-
-windows.o: windows.c ${INCLS}
-
-lightobject.o: lightobject.c ${INCLS}
-
-textobject.o: textobject.c ${INCLS}
-
-textcb.o: textcb.c ${INCLS}
-
-#
-# Test programs.
-#
-curses_test.o: curses_test.c ${INCLS} AFS_component_version_number.o
-
-curses_test: curses_test.o $(LIBS)
-       ${CC} ${CFLAGS} -o curses_test curses_test.o $(LIBS) ${EXTRA_LIBS}
-
-curses_test.lint: curses_test.c $(LINT_LIBS)
-       lint ${CFLAGS} curses_test.c ${LINT_LIBS}
-
-screen_test.o: screen_test.c ${INCLS} AFS_component_version_number.o
-
-screen_test: screen_test.o ${WINDOW_OBJS} ${LIBS}
-       ${CC} ${CFLAGS} -o screen_test screen_test.o ${WINDOW_OBJS} ${LIBS} ${EXTRA_LIBS}
-
-screen_test.lint: screen_test.o ${WINDOW_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} screen_test.c ${WINDOW_SRCS} ${LINT_LIBS}
-
-cb_test.o: cb_test.c ${INCLS} AFS_component_version_number.o
-
-cb_test: cb_test.o ${CB_OBJS} ${LIBS}
-       ${CC} ${CFLAGS} -o cb_test cb_test.o ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
-
-cb_test.lint: cb_test.c ${CB_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} cb_test.c ${CB_SRCS} ${LINT_LIBS}
-
-gtxtest.o: gtxtest.c ${INCLS} AFS_component_version_number.o
-
-gtxtest: gtxtest.o libgtx.a ${LIBS}
-       ${CC} ${LDFLAGS} -o gtxtest gtxtest.o libgtx.a ${LIBS} ${EXTRA_LIBS}
-
-gtxtest.lint: gtxtest.c llib-lgtx.ln ${LINT_LIBS}
-       lint $(CFLAGS) gtxtest.c llib-lgtx.ln ${LINT_LIBS}
-
-object_test.o: object_test.c ${INCLS} AFS_component_version_number.o
-
-object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS}
-       ${CC} ${CFLAGS} -o object_test object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
-
-object_test.lint: object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
-
-#
-# Misc others
-#
-system: install
-
-libgtx.a: ${LIBOBJS} AFS_component_version_number.o
-       -rm -f $@
-       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
-       ${RANLIB} $@
-
-llib-lgtx.ln: ${LIBSRCS}
-       lint -Cgtx ${CFLAGS} ${LIBSRCS}
-
-lint: llib-lgtx.ln \
-       curses_test.lint \
-       screen_test.lint \
-       cb_test.lint \
-       gtxtest.lint \
-       object_test.lint
-
-install: all
-       ${INSTALL} gtx*.h ${DESTDIR}include/afs
-       ${INSTALL} libgtx.a ${DESTDIR}lib/afs
-
-clean:
-       rm -f  *.o *.a *.ln object_test screen_test curses_test err.c core cb_test gtxtest AFS_component_version_number.c
diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in
new file mode 100644 (file)
index 0000000..6ff3f8e
--- /dev/null
@@ -0,0 +1,198 @@
+# 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
+
+# Makefile for gtx, a display-independent, object-oriented window toolkit.
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET=$(SRCDIR)bin/compile_et
+CFLAGS= ${DBUG} -I. -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
+#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
+RPCINCLS=
+INCLS=gtxobjects.h \
+       gtxwindows.h \
+       gtxcurseswin.h \
+       gtxinput.h \
+       gtxdumbwin.h \
+       gtxX11win.h \
+       gtxobjects.h \
+       gtxkeymap.h \
+       gtxlightobj.h \
+       gtxtextobj.h \
+       gtxframe.h \
+       gtxobjdict.h \
+       ${RPCINCLS} \
+       ${SRCDIR}include/afs/keys.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/afs/cmd.h
+
+LIBS= \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a
+
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
+
+LINT_LIBS = /usr/lib/lint/llib-lcurses.ln
+
+KEYMAP_SRCS=keymap.c input.c frame.c
+
+KEYMAP_OBJS=keymap.o input.o frame.o
+
+WINDOW_SRCS=curseswindows.c \
+       dumbwindows.c \
+       X11windows.c \
+       windows.c
+
+WINDOW_OBJS=curseswindows.o \
+       dumbwindows.o \
+       X11windows.o \
+       windows.o
+
+OBJECT_SRCS=objects.c \
+       lightobject.c \
+       textobject.c
+
+OBJECT_OBJS=objects.o \
+       lightobject.o \
+       textobject.o
+
+DICT_SRCS=objdict.c
+DICT_OBJS=objdict.o
+
+CB_SRCS=textcb.c
+CB_OBJS=textcb.o
+
+#ERROBJS=err.o
+ERRSRCS=
+ERROJBS=
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: libgtx.a gtxtest
+
+tests: object_test screen_test curses_test cb_test gtxtest
+
+# All objects in the library
+LIBSRCS = ${KEYMAP_SRCS} ${WINDOW_SRCS} ${OBJECT_SRCS} ${DICT_SRCS} \
+       ${ERRSRCS} ${CB_SRCS}
+LIBOBJS = $(KEYMAP_OBJS) ${WINDOW_OBJS} ${OBJECT_OBJS} ${DICT_OBJS} \
+       ${ERROBJS} ${CB_OBJS}
+
+${LIBSRCS}: ${INCLS}
+$(LIBOBJS): ${INCLS}
+
+err.c: err.et
+       rm -f err.h err.c; $(COMPILE_ET) err -h err
+
+keymap.o: keymap.c ${INCLS}
+
+frame.o: frame.c $(INCLS)
+
+input.o: input.c ${INCLS}
+
+curseswindows.o: curseswindows.c ${INCLS}
+
+dumbwindows.o: dumbwindows.c ${INCLS}
+
+X11windows.o: X11windows.c ${INCLS}
+
+windows.o: windows.c ${INCLS}
+
+lightobject.o: lightobject.c ${INCLS}
+
+textobject.o: textobject.c ${INCLS}
+
+textcb.o: textcb.c ${INCLS}
+
+#
+# Test programs.
+#
+curses_test.o: curses_test.c ${INCLS} AFS_component_version_number.o
+
+curses_test: curses_test.o $(LIBS)
+       ${CC} ${CFLAGS} -o curses_test curses_test.o $(LIBS) ${EXTRA_LIBS}
+
+curses_test.lint: curses_test.c $(LINT_LIBS)
+       lint ${CFLAGS} curses_test.c ${LINT_LIBS}
+
+screen_test.o: screen_test.c ${INCLS} AFS_component_version_number.o
+
+screen_test: screen_test.o ${WINDOW_OBJS} ${LIBS}
+       ${CC} ${CFLAGS} -o screen_test screen_test.o ${WINDOW_OBJS} ${LIBS} ${EXTRA_LIBS}
+
+screen_test.lint: screen_test.o ${WINDOW_SRCS} ${LINT_LIBS}
+       lint ${CFLAGS} screen_test.c ${WINDOW_SRCS} ${LINT_LIBS}
+
+cb_test.o: cb_test.c ${INCLS} AFS_component_version_number.o
+
+cb_test: cb_test.o ${CB_OBJS} ${LIBS}
+       ${CC} ${CFLAGS} -o cb_test cb_test.o ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
+
+cb_test.lint: cb_test.c ${CB_SRCS} ${LINT_LIBS}
+       lint ${CFLAGS} cb_test.c ${CB_SRCS} ${LINT_LIBS}
+
+gtxtest.o: gtxtest.c ${INCLS} AFS_component_version_number.o
+
+gtxtest: gtxtest.o libgtx.a ${LIBS}
+       ${CC} ${LDFLAGS} -o gtxtest gtxtest.o libgtx.a ${LIBS} ${EXTRA_LIBS}
+
+gtxtest.lint: gtxtest.c llib-lgtx.ln ${LINT_LIBS}
+       lint $(CFLAGS) gtxtest.c llib-lgtx.ln ${LINT_LIBS}
+
+object_test.o: object_test.c ${INCLS} AFS_component_version_number.o
+
+object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS}
+       ${CC} ${CFLAGS} -o object_test object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
+
+object_test.lint: object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
+       lint ${CFLAGS} object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
+
+#
+# Misc others
+#
+system: install
+
+libgtx.a: ${LIBOBJS} AFS_component_version_number.o
+       -rm -f $@
+       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
+       ${RANLIB} $@
+
+llib-lgtx.ln: ${LIBSRCS}
+       lint -Cgtx ${CFLAGS} ${LIBSRCS}
+
+lint: llib-lgtx.ln \
+       curses_test.lint \
+       screen_test.lint \
+       cb_test.lint \
+       gtxtest.lint \
+       object_test.lint
+
+install: all
+       ${INSTALL} gtx*.h ${DESTDIR}include/afs
+       ${INSTALL} libgtx.a ${DESTDIR}lib/afs
+
+clean:
+       rm -f  *.o *.a *.ln object_test screen_test curses_test err.c core cb_test gtxtest AFS_component_version_number.c
diff --git a/src/inetd/Makefile b/src/inetd/Makefile
deleted file mode 100644 (file)
index 37aea02..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-SHELL=/bin/sh
-COMPONENT=inetd
-include ../config/Makefile.${SYS_NAME}
-
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include
-DEFINES = ${INCLUDES}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a \
-                  ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
-LIBRES = 
-LIBS = ${AFSLIBS} ${LIBRES} ${XLIBS}
-OBJS = inetd.o setenv.o getenv.o
-CFLAGS = ${DEFINES} ${DBUG} ${XCFLAGS}
-
-include ../config/Makefile.version
-
-noversion: install
-
-# ta-rauth.o is used by rlogin, rsh, rcp, rlogind
-all : inetd ta-rauth.o
-
-system: install
-
-inetd: ${OBJS}
-       set -x; \
-       case "${SYS_NAME}" in \
-       alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_dux?? ) \
-               ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} -lutil ;; \
-       sgi_6* ) \
-               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ;; \
-       *) \
-               ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} ;; \
-       esac
-
-inetd.o: inetd.c AFS_component_version_number.c
-ta-rauth.o: ta-rauth.c
-
-clean:
-       rm -f inetd *.o *.BAK *~ core AFS_component_version_number.c
-
-install: all
-       ${INSTALL} -s -m 755 inetd ${DESTDIR}etc/inetd
-       set -x; \
-       case "${SYS_NAME}" in \
-       sun4* ) \
-               ${INSTALL} -m 644 -f inetd.conf.solaris ${DESTDIR}etc/inetd.conf ;; \
-       sgi_* ) \
-               ${INSTALL} -m 644 -f inetd.conf.sgi ${DESTDIR}etc/inetd.conf ;; \
-       alpha_dux?? ) \
-               ${INSTALL} -m 644 -f inetd.conf.dux40 ${DESTDIR}etc/inetd.conf ;; \
-       * ) \
-               ${INSTALL} -m 644 inetd.conf ${DESTDIR}etc/inetd.conf ;; \
-       esac
diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in
new file mode 100644 (file)
index 0000000..56de9e3
--- /dev/null
@@ -0,0 +1,64 @@
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include
+DEFINES = ${INCLUDES}
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
+                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
+                  ${LIBDIR}librx.a \
+                  ${LIBDIR}afs/libsys.a \
+                  ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
+                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
+                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
+LIBRES = 
+LIBS = ${AFSLIBS} ${LIBRES} ${XLIBS}
+OBJS = inetd.o setenv.o getenv.o
+CFLAGS = ${DEFINES} ${DBUG} ${XCFLAGS}
+
+include ../config/Makefile.version
+
+noversion: install
+
+# ta-rauth.o is used by rlogin, rsh, rcp, rlogind
+all : inetd ta-rauth.o
+
+system: install
+
+inetd: ${OBJS}
+       set -x; \
+       case "${SYS_NAME}" in \
+       alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_dux?? ) \
+               ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} -lutil ;; \
+       sgi_6* ) \
+               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ;; \
+       *) \
+               ${CC} -o $@ ${DEFINES} ${OBJS} ${LIBS} ;; \
+       esac
+
+inetd.o: inetd.c AFS_component_version_number.c
+ta-rauth.o: ta-rauth.c
+
+clean:
+       rm -f inetd *.o *.BAK *~ core AFS_component_version_number.c
+
+install: all
+       ${INSTALL} -s -m 755 inetd ${DESTDIR}etc/inetd
+       set -x; \
+       case "${SYS_NAME}" in \
+       sun4* ) \
+               ${INSTALL} -m 644 -f inetd.conf.solaris ${DESTDIR}etc/inetd.conf ;; \
+       sgi_* ) \
+               ${INSTALL} -m 644 -f inetd.conf.sgi ${DESTDIR}etc/inetd.conf ;; \
+       alpha_dux?? ) \
+               ${INSTALL} -m 644 -f inetd.conf.dux40 ${DESTDIR}etc/inetd.conf ;; \
+       * ) \
+               ${INSTALL} -m 644 inetd.conf ${DESTDIR}etc/inetd.conf ;; \
+       esac
diff --git a/src/kauth/Makefile b/src/kauth/Makefile
deleted file mode 100644 (file)
index b4124f6..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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
-
-# */
-
-
-SHELL = /bin/sh
-COMPONENT=kauth
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = ${OPTMZ} ${XLDFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-            ${SRCDIR}include/rx/rxkad.h \
-            ${SRCDIR}include/afs/com_err.h \
-       kaserver.h kauth.h kautils.h 
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-LIBS = ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${authlib} \
-       ${rxkadlib} \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a \
-       ${deslib} \
-       ${cmdlib} \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${utilib} \
-       $(DBM)
-
-UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \
-       kalocalcell.c client.c kaerrors.c
-
-KLIBS = ${SRCDIR}lib/libubik.a ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/afs/libauth.krb.a ${rxkadlib} ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a ${deslib} ${cmdlib} \
-       ${SRCDIR}lib/afs/libcom_err.a ${utilib}
-
-OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
-KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: knfs kaserver kas klog klog.krb kpasswd klogin klogin.krb rebuild kdb kpwvalid
-
-test tests: install
-       cd test; $(MAKE)
-
-clean:
-       rm -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c
-
-kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) ${auditlib}
-       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${auditlib}
-
-kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o
-
-kautils.o: kautils.c ${INCLS}
-
-kalocalcell.o: kalocalcell.c ${INCLS}
-
-kadatabase.o: kadatabase.c ${INCLS}
-       ${CC} ${CFLAGS} -c kadatabase.c 
-
-kaprocs.o: kaprocs.c ${INCLS} kaport.h
-       ${CC} ${CFLAGS} -c kaprocs.c 
-
-authclient.o: authclient.c ${INCLS}
-
-
-#authserver.o: authserver.c ${INCLS}
-
-kaerrors.o: kaerrors.c
-
-kaerrors.c kautils.h: kaerrors.et kautils.p.h
-       rm -f kautils.h kaerrors.c; ${COMPILE_ET} kaerrors -h kautils
-
-kauth.ss.o: kauth.ss.c
-kauth.cs.o: kauth.cs.c
-kauth.xdr.o: kauth.xdr.c kauth.h
-
-kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg
-       ${SRCDIR}bin/rxgen -x kauth.rg
-
-Kkauth.cs.c: kauth.rg Kkauth.h
-       ${SRCDIR}bin/rxgen -x -k -C -o Kkauth.cs.c kauth.rg
-
-Kkauth.xdr.c: kauth.rg
-       ${SRCDIR}bin/rxgen -x -k -c -o Kkauth.xdr.c kauth.rg
-
-Kkauth.h: kauth.rg
-       ${SRCDIR}bin/rxgen -x -k -h -o Kkauth.h kauth.rg
-
-libkauth.a: $(OBJS) AFS_component_version_number.o
-       -rm -f libkauth.a
-       ar rv libkauth.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libkauth.a
-
-
-libkauth.krb.a: $(KOBJS) AFS_component_version_number.o
-       -rm -f libkauth.krb.a
-       ar rv libkauth.krb.a $(KOBJS) AFS_component_version_number.o
-       $(RANLIB) libkauth.krb.a
-
-
-read_passwd.o: read_passwd.c
-       echo These changes to read_password.c need to be mailed to the Kerberos people; ${CC} ${CFLAGS} -c read_passwd.c
-
-token.o: token.c ${INCLS}
-
-client.o: client.c ${INCLS} AFS_component_version_number.o
-
-kas.o: kas.c ${INCLS} AFS_component_version_number.o
-
-admin_tools.o: admin_tools.c ${INCLS} kaport.h
-
-kkids.o: kkids.c ${INCLS}
-
-krb_tf.o: krb_tf.c ${INCLS}
-
-kas: kauth.h kautils.h admin_tools.o libkauth.a $(LIBS) kas.o kkids.o
-       ${CC} ${LDFLAGS} -o kas kas.o admin_tools.o kkids.o libkauth.a \
-                       ${LIBS} ${XLIBS}
-
-klog: AFS_component_version_number.o kauth.h kautils.h libkauth.a $(LIBS) \
-       klog.o
-       ${CC} ${LDFLAGS} -o klog klog.o libkauth.a ${LIBS} ${XLIBS}
-
-klog.o: klog.c kauth.h kautils.h AFS_component_version_number.o
-
-klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o
-       ${CC} ${LDFLAGS} -o klog.krb klog.o libkauth.krb.a ${KLIBS} ${XLIBS}
-
-knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o
-       ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS}
-knfs.o: knfs.c AFS_component_version_number.o
-
-klogin.o: klogin.c ${INCLS} AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c klogin.c -DKAUTH
-
-klogin: libkauth.a $(LIBS) klogin.o
-       ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS}
-
-klogin.krb: libkauth.a $(KLIBS) klogin.o
-       ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS}
-
-kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c kpasswd.c 
-
-kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
-       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a \
-       ${LIBS} ${XLIBS}
-
-kpwvalid.o: kpwvalid.c AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c kpwvalid.c
-
-kpwvalid: kpwvalid.o $(LIBS)
-       ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS}
-
-user.krb.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c user.c -o user.krb.o
-
-user.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
-       ${CC} ${CFLAGS} -c user.c
-
-kdb: kdb.o ${INCLS}
-       ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
-kdb.o: kdb.c AFS_component_version_number.o
-
-krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \
-          ${SRCDIR}include/lwp.h AFS_component_version_number.o
-
-krb_udp: krb_udp.o libkauth.a
-       ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${deslib} ${rxkadlib} ${SRCDIR}lib/afs/libcom_err.a ${utilib} ${auditlib}
-
-rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o
-
-rebuild: rebuild.o kautils.o ${SRCDIR}lib/afs/libcom_err.a ${utilib} $(deslib)
-       ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \
-               ${SRCDIR}lib/afs/libcom_err.a ${utilib} $(deslib) ${XLIBS} ${cmdlib}
-       ${INSTALL} -f rebuild ${DESTDIR}etc/kadb_check
-
-system: install
-
-${DESTDIR}root.server/usr/afs/bin/kaserver: kaserver
-       ${INSTALL} -s $? $@
-
-${DESTDIR}etc/kas ${DESTDIR}root.server/usr/afs/bin/kas: kas 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/kpwvalid ${DESTDIR}etc/kpwvalid \
-${DESTDIR}root.server/usr/afs/bin/kpwvalid: kpwvalid 
-       ${INSTALL} $? $@
-
-${DESTDIR}bin/klog ${DESTDIR}root.server/usr/afs/bin/klog: klog 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/klog.krb ${DESTDIR}root.server/usr/afs/bin/klog.krb: klog.krb 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/knfs: knfs 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/kpasswd: kpasswd 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}lib/afs/libkauth.a: libkauth.a 
-       ${INSTALL} $? $@
-
-${DESTDIR}lib/afs/libkauth.krb.a: libkauth.krb.a 
-       ${INSTALL} $? $@
-
-${DESTDIR}etc/kdb: kdb 
-       ${INSTALL} -s $? $@
-
-ukinstall webinstall: ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kkauth.h ${UKERNELDIR}afsint/kauth.h
-       ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}afsint/kauth.xdr.c
-       ${INSTALL} Kkauth.cs.c ${UKERNELDIR}afsint/kauth.cs.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-
-install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/kaserver \
-       ${DESTDIR}etc/kas ${DESTDIR}etc/kpwvalid \
-       ${DESTDIR}root.server/usr/afs/bin/kas \
-       ${DESTDIR}root.server/usr/afs/bin/kpwvalid \
-       ${DESTDIR}bin/klog ${DESTDIR}bin/klog.krb \
-       ${DESTDIR}root.server/usr/afs/bin/klog \
-       ${DESTDIR}root.server/usr/afs/bin/klog.krb \
-       ${DESTDIR}bin/knfs ${DESTDIR}bin/kpasswd \
-       ${DESTDIR}bin/kpwvalid ${DESTDIR}lib/afs/libkauth.a \
-       ${DESTDIR}lib/afs/libkauth.krb.a ${DESTDIR}etc/kdb
-       ${INSTALL} kautils.h kauth.h kaport.h ${DESTDIR}include/afs
-
-
-
-
-
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
new file mode 100644 (file)
index 0000000..a909b12
--- /dev/null
@@ -0,0 +1,266 @@
+# 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
+
+# */
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+UKERNELDIR = ../libuafs/
+COMPILE_ET = ${SRCDIR}bin/compile_et
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = ${OPTMZ} ${XLDFLAGS}
+INCLS=${SRCDIR}include/ubik.h \
+             ${SRCDIR}include/lwp.h \
+             ${SRCDIR}include/lock.h  \
+             ${SRCDIR}include/rx/rx.h \
+             ${SRCDIR}include/rx/xdr.h \
+            ${SRCDIR}include/rx/rxkad.h \
+            ${SRCDIR}include/afs/com_err.h \
+       kaserver.h kauth.h kautils.h 
+
+LIBS = ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libprot.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/librxstat.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a  \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a \
+       $(DBM)
+
+UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \
+       kalocalcell.c client.c kaerrors.c
+
+KLIBS = ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libprot.a \
+       ${SRCDIR}lib/afs/libauth.krb.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a  \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a 
+
+OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
+KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: knfs kaserver kas klog klog.krb kpasswd klogin klogin.krb rebuild kdb kpwvalid
+
+test tests: install
+       cd test; $(MAKE)
+
+clean:
+       rm -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c
+
+kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
+       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libaudit.a
+
+kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o
+
+kautils.o: kautils.c ${INCLS}
+
+kalocalcell.o: kalocalcell.c ${INCLS}
+
+kadatabase.o: kadatabase.c ${INCLS}
+       ${CC} ${CFLAGS} -c kadatabase.c 
+
+kaprocs.o: kaprocs.c ${INCLS} kaport.h
+       ${CC} ${CFLAGS} -c kaprocs.c 
+
+authclient.o: authclient.c ${INCLS}
+
+
+#authserver.o: authserver.c ${INCLS}
+
+kaerrors.o: kaerrors.c
+
+kaerrors.c kautils.h: kaerrors.et kautils.p.h
+       rm -f kautils.h kaerrors.c; ${COMPILE_ET} kaerrors -h kautils
+
+kauth.ss.o: kauth.ss.c
+kauth.cs.o: kauth.cs.c
+kauth.xdr.o: kauth.xdr.c kauth.h
+
+kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg
+       ${SRCDIR}bin/rxgen -x kauth.rg
+
+Kkauth.cs.c: kauth.rg Kkauth.h
+       ${SRCDIR}bin/rxgen -x -k -C -o Kkauth.cs.c kauth.rg
+
+Kkauth.xdr.c: kauth.rg
+       ${SRCDIR}bin/rxgen -x -k -c -o Kkauth.xdr.c kauth.rg
+
+Kkauth.h: kauth.rg
+       ${SRCDIR}bin/rxgen -x -k -h -o Kkauth.h kauth.rg
+
+libkauth.a: $(OBJS) AFS_component_version_number.o
+       -rm -f libkauth.a
+       ar rv libkauth.a $(OBJS) AFS_component_version_number.o
+       $(RANLIB) libkauth.a
+
+
+libkauth.krb.a: $(KOBJS) AFS_component_version_number.o
+       -rm -f libkauth.krb.a
+       ar rv libkauth.krb.a $(KOBJS) AFS_component_version_number.o
+       $(RANLIB) libkauth.krb.a
+
+
+read_passwd.o: read_passwd.c
+       echo These changes to read_password.c need to be mailed to the Kerberos people; ${CC} ${CFLAGS} -c read_passwd.c
+
+token.o: token.c ${INCLS}
+
+client.o: client.c ${INCLS} AFS_component_version_number.o
+
+kas.o: kas.c ${INCLS} AFS_component_version_number.o
+
+admin_tools.o: admin_tools.c ${INCLS} kaport.h
+
+kkids.o: kkids.c ${INCLS}
+
+krb_tf.o: krb_tf.c ${INCLS}
+
+kas: kauth.h kautils.h admin_tools.o libkauth.a $(LIBS) kas.o kkids.o
+       ${CC} ${LDFLAGS} -o kas kas.o admin_tools.o kkids.o libkauth.a \
+                       ${LIBS} ${XLIBS}
+
+klog: AFS_component_version_number.o kauth.h kautils.h libkauth.a $(LIBS) \
+       klog.o
+       ${CC} ${LDFLAGS} -o klog klog.o libkauth.a ${LIBS} ${XLIBS}
+
+klog.o: klog.c kauth.h kautils.h AFS_component_version_number.o
+
+klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o
+       ${CC} ${LDFLAGS} -o klog.krb klog.o libkauth.krb.a ${KLIBS} ${XLIBS}
+
+knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o
+       ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS}
+knfs.o: knfs.c AFS_component_version_number.o
+
+klogin.o: klogin.c ${INCLS} AFS_component_version_number.o
+       ${CC} ${CFLAGS} -c klogin.c -DKAUTH
+
+klogin: libkauth.a $(LIBS) klogin.o
+       ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS}
+
+klogin.krb: libkauth.a $(KLIBS) klogin.o
+       ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS}
+
+kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o
+       ${CC} ${CFLAGS} -c kpasswd.c 
+
+kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
+       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a \
+       ${LIBS} ${XLIBS}
+
+kpwvalid.o: kpwvalid.c AFS_component_version_number.o
+       ${CC} ${CFLAGS} -c kpwvalid.c
+
+kpwvalid: kpwvalid.o $(LIBS)
+       ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS}
+
+user.krb.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c user.c -o user.krb.o
+
+user.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
+       ${CC} ${CFLAGS} -c user.c
+
+kdb: kdb.o ${INCLS}
+       ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
+kdb.o: kdb.c AFS_component_version_number.o
+
+krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \
+          ${SRCDIR}include/lwp.h AFS_component_version_number.o
+
+krb_udp: krb_udp.o libkauth.a
+       ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/libdes.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/libutil.a ${SRCDIR}lib/afs/libaudit.a
+
+rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o
+
+rebuild: rebuild.o kautils.o ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a
+       ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \
+               ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
+       ${INSTALL} -f rebuild ${DESTDIR}etc/kadb_check
+
+system: install
+
+${DESTDIR}root.server/usr/afs/bin/kaserver: kaserver
+       ${INSTALL} -s $? $@
+
+${DESTDIR}etc/kas ${DESTDIR}root.server/usr/afs/bin/kas: kas 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/kpwvalid ${DESTDIR}etc/kpwvalid \
+${DESTDIR}root.server/usr/afs/bin/kpwvalid: kpwvalid 
+       ${INSTALL} $? $@
+
+${DESTDIR}bin/klog ${DESTDIR}root.server/usr/afs/bin/klog: klog 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/klog.krb ${DESTDIR}root.server/usr/afs/bin/klog.krb: klog.krb 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/knfs: knfs 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/kpasswd: kpasswd 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}lib/afs/libkauth.a: libkauth.a 
+       ${INSTALL} $? $@
+
+${DESTDIR}lib/afs/libkauth.krb.a: libkauth.krb.a 
+       ${INSTALL} $? $@
+
+${DESTDIR}etc/kdb: kdb 
+       ${INSTALL} -s $? $@
+
+ukinstall webinstall: ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kkauth.h ${UKERNELDIR}afsint/kauth.h
+       ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}afsint/kauth.xdr.c
+       ${INSTALL} Kkauth.cs.c ${UKERNELDIR}afsint/kauth.cs.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+
+install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/kaserver \
+       ${DESTDIR}etc/kas ${DESTDIR}etc/kpwvalid \
+       ${DESTDIR}root.server/usr/afs/bin/kas \
+       ${DESTDIR}root.server/usr/afs/bin/kpwvalid \
+       ${DESTDIR}bin/klog ${DESTDIR}bin/klog.krb \
+       ${DESTDIR}root.server/usr/afs/bin/klog \
+       ${DESTDIR}root.server/usr/afs/bin/klog.krb \
+       ${DESTDIR}bin/knfs ${DESTDIR}bin/kpasswd \
+       ${DESTDIR}bin/kpwvalid ${DESTDIR}lib/afs/libkauth.a \
+       ${DESTDIR}lib/afs/libkauth.krb.a ${DESTDIR}etc/kdb
+       ${INSTALL} kautils.h kauth.h kaport.h ${DESTDIR}include/afs
+
+
+
+
+
diff --git a/src/kauth/test/Makefile b/src/kauth/test/Makefile
deleted file mode 100644 (file)
index b8361e8..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
-
-utilib=${SRCDIR}lib/afs/util.a
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-system: all
-
-# the only tests _known_ to work are multiklog and the tcl scripts.
-
-all test tests: multiklog 
-
-clean:
-       rm -f *.o core
-
-multiklog: multiklog.o
-       cc -o  multiklog ${CFLAGS} multiklog.o ${utilib}
-
-test_date: ../kautils.o test_date.o ${utilib}
-       cc -o test_date ${CFLAGS} test_date.o ../kautils.o ${utilib}
-
-test_badtix: test_badtix.o
-       cc -o test_badtix ${CFLAGS} test_badtix.o
-
-decode_ticket: decode_ticket.o
-       cc -o decode_ticket ${CFLAGS} decode_ticket.o 
-
-test_interim_ktc: test_interim_ktc.o
-       cc -o test_interim_ktc ${CFLAGS} test_interim_ktc.o
-
-test_rxkad_free: test_rxkad_free.o 
-       cc -o test_rxkad_free  ${CFLAGS} test_rxkad_free.o 
-
-test_getticket: test_getticket.o 
-       cc -o test_getticket  ${CFLAGS} test_getticket.o 
-
-background: background.c
-       cc -o background background.c
-
-# test_interim_ktc depends on normally running ka & pr servers.  Also on
-# the current user having write access to the working directory.  Also
-# on the user "tester" being defined with ViceId=1031.  The password
-# must be specified on the make line the others can be overridden by
-# specifying a value for TESTERVALUES.  To test remote authentication, a
-# test account in another cell must be available.  The default is the
-# cell "cellname" and the user tester with Vice Id 510, and the
-# same password as in the local cell.  These can be over-ridden by
-# specifying a difference value for REMOTETESTER.  An empty value for
-# REMOTETESTER will disable testing of remote authentication.
-
-TESTERNAME=xxx
-TESTERPASSWORD=xxx
-#TESTERVALUES=-tester tester -testId 1031
-TESTERVALUES=
-REMOTEPASSWORD=${TESTERPASSWORD}
-REMOTETESTER=-remoteTester $(TESTERNAME) -remoteTestPassword ${REMOTEPASSWORD} -remoteTestId 510 -remoteCell cellname
-
-# test_kaserver starts a server in the background and tests it.
-
-# test_rxkad_free checks for rxkad object/connection usage and checks for
-#   core leaks.  Normally it makes 100 calls to the kaserver, doing a GetEntry
-#   call.  This requests an admin ticket 100 times and creates a ubik
-#   connection 100 times.  With the -doauth switch specified it calls
-#   ka_UserAuthenticate instead, which uses rxnull connections, but also
-#   exercises the ptserver code, particularly, pr_Initialize, 100 times.
-
-runtest: background multiklog test_badtix test_interim_ktc test_rxkad_free
-       test_interim_ktc ${TESTERVALUES} -testPassword ${TESTERPASSWORD} ${REMOTETESTER}
-       test_kaserver
-       test_rxkad_free -waitforreap -a $(TESTERNAME) -p $(TESTERPASSWORD)
-       test_rxkad_free -doauth -waitforreap -a $(TESTERNAME) -p $(TESTERPASSWORD)
diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in
new file mode 100644 (file)
index 0000000..7300b44
--- /dev/null
@@ -0,0 +1,88 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+system: all
+
+# the only tests _known_ to work are multiklog and the tcl scripts.
+
+all test tests: multiklog 
+
+clean:
+       rm -f *.o core
+
+multiklog: multiklog.o
+       cc -o  multiklog ${CFLAGS} multiklog.o -lafsutil
+
+test_date: ../kautils.o test_date.o ${utilib}
+       cc -o test_date ${CFLAGS} test_date.o ../kautils.o -lafsutil
+
+test_badtix: test_badtix.o
+       cc -o test_badtix ${CFLAGS} test_badtix.o
+
+decode_ticket: decode_ticket.o
+       cc -o decode_ticket ${CFLAGS} decode_ticket.o 
+
+test_interim_ktc: test_interim_ktc.o
+       cc -o test_interim_ktc ${CFLAGS} test_interim_ktc.o
+
+test_rxkad_free: test_rxkad_free.o 
+       cc -o test_rxkad_free  ${CFLAGS} test_rxkad_free.o 
+
+test_getticket: test_getticket.o 
+       cc -o test_getticket  ${CFLAGS} test_getticket.o 
+
+background: background.c
+       cc -o background background.c
+
+# test_interim_ktc depends on normally running ka & pr servers.  Also on
+# the current user having write access to the working directory.  Also
+# on the user "tester" being defined with ViceId=1031.  The password
+# must be specified on the make line the others can be overridden by
+# specifying a value for TESTERVALUES.  To test remote authentication, a
+# test account in another cell must be available.  The default is the
+# cell "cellname" and the user tester with Vice Id 510, and the
+# same password as in the local cell.  These can be over-ridden by
+# specifying a difference value for REMOTETESTER.  An empty value for
+# REMOTETESTER will disable testing of remote authentication.
+
+TESTERNAME=xxx
+TESTERPASSWORD=xxx
+#TESTERVALUES=-tester tester -testId 1031
+TESTERVALUES=
+REMOTEPASSWORD=${TESTERPASSWORD}
+REMOTETESTER=-remoteTester $(TESTERNAME) -remoteTestPassword ${REMOTEPASSWORD} -remoteTestId 510 -remoteCell cellname
+
+# test_kaserver starts a server in the background and tests it.
+
+# test_rxkad_free checks for rxkad object/connection usage and checks for
+#   core leaks.  Normally it makes 100 calls to the kaserver, doing a GetEntry
+#   call.  This requests an admin ticket 100 times and creates a ubik
+#   connection 100 times.  With the -doauth switch specified it calls
+#   ka_UserAuthenticate instead, which uses rxnull connections, but also
+#   exercises the ptserver code, particularly, pr_Initialize, 100 times.
+
+runtest: background multiklog test_badtix test_interim_ktc test_rxkad_free
+       test_interim_ktc ${TESTERVALUES} -testPassword ${TESTERPASSWORD} ${REMOTETESTER}
+       test_kaserver
+       test_rxkad_free -waitforreap -a $(TESTERNAME) -p $(TESTERPASSWORD)
+       test_rxkad_free -doauth -waitforreap -a $(TESTERNAME) -p $(TESTERPASSWORD)
diff --git a/src/libacl/Makefile b/src/libacl/Makefile
deleted file mode 100644 (file)
index 6656f35..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=libacl
-include ../config/Makefile.${SYS_NAME}
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I.. \
-       -I${BACKDIR}include -I${DESTDIR}include/afs 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-
-CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-LIBOBJS=aclprocs.o netprocs.o
-
-include ../config/Makefile.version
-
-all: libacl.a
-
-libacl.a: $(LIBOBJS)  AFS_component_version_number.o
-       rm -f libacl.a
-       ar rv libacl.a $(LIBOBJS) AFS_component_version_number.o
-       $(RANLIB) libacl.a
-
-aclprocs.o: aclprocs.c acl.h
-
-netprocs.o: netprocs.c acl.h
-
-clean: 
-       rm -f acltest *.o libacl.a core AFS_component_version_number.c
-
-system: install
-
-kinstall:
-       ${INSTALL} prs_fs.h ${KERNELDIR}afs/prs_fs.h
-
-ukinstall webinstall:
-       ${INSTALL} prs_fs.h ${UKERNELDIR}afs/prs_fs.h
-
-install: libacl.a kinstall ukinstall
-       ${INSTALL} libacl.a ${DESTDIR}lib/afs/libacl.a
-       ${INSTALL} acl.h ${DESTDIR}include/afs/acl.h
-       ${INSTALL} prs_fs.h ${DESTDIR}include/afs/prs_fs.h
-
-test:
-       cd test; $(MAKE)
diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in
new file mode 100644 (file)
index 0000000..136fe33
--- /dev/null
@@ -0,0 +1,56 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I.. \
+       -I${BACKDIR}include -I${DESTDIR}include/afs 
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+
+CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+LIBOBJS=aclprocs.o netprocs.o
+
+include ../config/Makefile.version
+
+all: libacl.a
+
+libacl.a: $(LIBOBJS)  AFS_component_version_number.o
+       rm -f libacl.a
+       ar rv libacl.a $(LIBOBJS) AFS_component_version_number.o
+       $(RANLIB) libacl.a
+
+aclprocs.o: aclprocs.c acl.h
+
+netprocs.o: netprocs.c acl.h
+
+clean: 
+       rm -f acltest *.o libacl.a core AFS_component_version_number.c
+
+system: install
+
+kinstall:
+       ${INSTALL} prs_fs.h ${KERNELDIR}afs/prs_fs.h
+
+ukinstall webinstall:
+       ${INSTALL} prs_fs.h ${UKERNELDIR}afs/prs_fs.h
+
+install: libacl.a kinstall ukinstall
+       ${INSTALL} libacl.a ${DESTDIR}lib/afs/libacl.a
+       ${INSTALL} acl.h ${DESTDIR}include/afs/acl.h
+       ${INSTALL} prs_fs.h ${DESTDIR}include/afs/prs_fs.h
+
+test:
+       cd test; $(MAKE)
diff --git a/src/libacl/test/Makefile b/src/libacl/test/Makefile
deleted file mode 100644 (file)
index a1b4abb..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-system:        acltest
-
-clean:
-       rm -f *.o *.a acltest core
-
-acltest: acltest.o
-       $(CC) -o acltest acltest.o $(CFLAGS)
-
-acltest.o: acltest.c 
-
-kinstall:
-       @echo No kernel source here.
-
-
diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in
new file mode 100644 (file)
index 0000000..cbe76ec
--- /dev/null
@@ -0,0 +1,37 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+system:        acltest
+
+clean:
+       rm -f *.o *.a acltest core
+
+acltest: acltest.o
+       $(CC) -o acltest acltest.o $(CFLAGS)
+
+acltest.o: acltest.c 
+
+kinstall:
+       @echo No kernel source here.
+
+
diff --git a/src/libadmin/Makefile b/src/libadmin/Makefile
deleted file mode 100644 (file)
index 84fed28..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-
-include ../config/Makefile.${SYS_NAME}
-
-system install: 
-       ${INSTALL} afs_Admin.h ${DESTDIR}include/afs
-
-clean:
-
diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in
new file mode 100644 (file)
index 0000000..c84ba62
--- /dev/null
@@ -0,0 +1,19 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+system install: 
+       ${INSTALL} afs_Admin.h ${DESTDIR}include/afs
+
+clean:
+
diff --git a/src/libadmin/adminutil/Makefile b/src/libadmin/adminutil/Makefile
deleted file mode 100644 (file)
index 14ac506..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-CCRULE = ${CC} ${CFLAGS} -c $?
-COMPILE_ET = ${SRCDIR}bin/compile_et
-RXKAD = ../../rxkad
-AUTH = ../../auth
-BOZO = ../../bozo
-CMD = ../../cmd
-KAUTH = ../../kauth
-PTSERVER = ../../ptserver
-UBIK = ../../ubik
-VLSERVER = ../../vlserver
-VOLSER = ../../volser
-
-afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et
-       ${INSTALL} afs_AdminErrors.h ${DESTDIR}include/afs
-       rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h
-       ${COMPILE_ET} afs_AdminBosErrors.et -h afs_AdminBosErrors
-       cp afs_AdminBosErrors.h ${DESTDIR}/include/afs/afs_AdminBosErrors.h
-
-afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.et
-       rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h
-       ${COMPILE_ET} afs_AdminCfgErrors.et -h afs_AdminCfgErrors
-       cp afs_AdminCfgErrors.h ${DESTDIR}/include/afs/afs_AdminCfgErrors.h
-afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et
-       rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h
-       ${COMPILE_ET} afs_AdminClientErrors.et -h afs_AdminClientErrors
-       cp afs_AdminClientErrors.h ${DESTDIR}/include/afs/afs_AdminClientErrors.h
-afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et
-       rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h
-       ${COMPILE_ET} afs_AdminMiscErrors.et -h afs_AdminMiscErrors
-       cp afs_AdminMiscErrors.h ${DESTDIR}/include/afs/afs_AdminMiscErrors.h
-afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et
-       rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h
-       ${COMPILE_ET} afs_AdminCommonErrors.et -h afs_AdminCommonErrors
-       cp afs_AdminCommonErrors.h ${DESTDIR}/include/afs/afs_AdminCommonErrors.h
-afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et
-       rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h
-       ${COMPILE_ET} afs_AdminKasErrors.et -h afs_AdminKasErrors
-       cp afs_AdminKasErrors.h ${DESTDIR}/include/afs/afs_AdminKasErrors.h
-afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et
-       rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h
-       ${COMPILE_ET} afs_AdminPtsErrors.et -h afs_AdminPtsErrors
-       cp afs_AdminPtsErrors.h ${DESTDIR}/include/afs/afs_AdminPtsErrors.h
-afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et
-       rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h
-       ${COMPILE_ET} afs_AdminUtilErrors.et -h afs_AdminUtilErrors
-       cp afs_AdminUtilErrors.h ${DESTDIR}/include/afs/afs_AdminUtilErrors.h
-afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et
-       rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h
-       ${COMPILE_ET} afs_AdminVosErrors.et -h afs_AdminVosErrors
-       cp afs_AdminVosErrors.h ${DESTDIR}/include/afs/afs_AdminVosErrors.h
-
-ERROROBJS = \
-       rxkad_errs.o \
-       boserr.o \
-       kaerrors.o \
-       ktc_errors.o \
-       cmd_errors.o \
-       pterror.o \
-       uerrors.o \
-       vl_errors.o \
-       acfg_errors.o \
-       volerr.o
-
-ADMINOBJS = \
-       afs_AdminBosErrors.o \
-       afs_AdminCfgErrors.o \
-       afs_AdminClientErrors.o \
-       afs_AdminCommonErrors.o \
-       afs_AdminKasErrors.o \
-       afs_AdminMiscErrors.o \
-       afs_AdminPtsErrors.o \
-       afs_AdminUtilErrors.o \
-       afs_AdminVosErrors.o \
-       afs_utilAdmin.o
-
-LIBOBJS = ${ADMINOBJS} ${ERROROBJS}
-
-LIBADMINUTIL = ${DESTDIR}/lib/afs/libafsadminutil.a
-
-system install: ${LIBADMINUTIL}
-
-${LIBADMINUTIL}: libafsadminutil.a
-       ${INSTALL} afs_utilAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libafsadminutil.a ${LIBADMINUTIL}
-
-libafsadminutil.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_utilAdmin.o: afs_utilAdmin.h
-
-ktc_errors.o: ${AUTH}/ktc_errors.c
-       ${CCRULE}
-       
-acfg_errors.o: ${AUTH}/acfg_errors.c
-       ${CCRULE}
-       
-boserr.o: ${BOZO}/boserr.c
-       ${CCRULE}
-
-cmd_errors.o: ${CMD}/cmd_errors.c
-       ${CCRULE}
-
-kaerrors.o: ${KAUTH}/kaerrors.c
-       ${CCRULE}
-
-pterror.o: ${PTSERVER}/pterror.c
-       ${CCRULE}
-
-rxkad_errs.o: ${RXKAD}/rxkad_errs.c
-       ${CCRULE}
-
-uerrors.o: ${UBIK}/uerrors.c
-       ${CCRULE}
-
-vl_errors.o: ${VLSERVER}/vl_errors.c
-       ${CCRULE}
-
-volerr.o: ${VOLSER}/volerr.c
-       ${CCRULE}
-
-clean:
-       rm -f *.o libafsadminutil*
-       rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h
-       rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h
-       rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h
-       rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h
-       rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h
-       rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h
-       rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h
-       rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h
-       rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h
diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in
new file mode 100644 (file)
index 0000000..648cc37
--- /dev/null
@@ -0,0 +1,157 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+CCRULE = ${CC} ${CFLAGS} -c $?
+COMPILE_ET = ${SRCDIR}bin/compile_et
+RXKAD = ../../rxkad
+AUTH = ../../auth
+BOZO = ../../bozo
+CMD = ../../cmd
+KAUTH = ../../kauth
+PTSERVER = ../../ptserver
+UBIK = ../../ubik
+VLSERVER = ../../vlserver
+VOLSER = ../../volser
+
+afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et
+       ${INSTALL} afs_AdminErrors.h ${DESTDIR}include/afs
+       rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h
+       ${COMPILE_ET} afs_AdminBosErrors.et -h afs_AdminBosErrors
+       cp afs_AdminBosErrors.h ${DESTDIR}/include/afs/afs_AdminBosErrors.h
+
+afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.et
+       rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h
+       ${COMPILE_ET} afs_AdminCfgErrors.et -h afs_AdminCfgErrors
+       cp afs_AdminCfgErrors.h ${DESTDIR}/include/afs/afs_AdminCfgErrors.h
+afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et
+       rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h
+       ${COMPILE_ET} afs_AdminClientErrors.et -h afs_AdminClientErrors
+       cp afs_AdminClientErrors.h ${DESTDIR}/include/afs/afs_AdminClientErrors.h
+afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et
+       rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h
+       ${COMPILE_ET} afs_AdminMiscErrors.et -h afs_AdminMiscErrors
+       cp afs_AdminMiscErrors.h ${DESTDIR}/include/afs/afs_AdminMiscErrors.h
+afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et
+       rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h
+       ${COMPILE_ET} afs_AdminCommonErrors.et -h afs_AdminCommonErrors
+       cp afs_AdminCommonErrors.h ${DESTDIR}/include/afs/afs_AdminCommonErrors.h
+afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et
+       rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h
+       ${COMPILE_ET} afs_AdminKasErrors.et -h afs_AdminKasErrors
+       cp afs_AdminKasErrors.h ${DESTDIR}/include/afs/afs_AdminKasErrors.h
+afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et
+       rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h
+       ${COMPILE_ET} afs_AdminPtsErrors.et -h afs_AdminPtsErrors
+       cp afs_AdminPtsErrors.h ${DESTDIR}/include/afs/afs_AdminPtsErrors.h
+afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et
+       rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h
+       ${COMPILE_ET} afs_AdminUtilErrors.et -h afs_AdminUtilErrors
+       cp afs_AdminUtilErrors.h ${DESTDIR}/include/afs/afs_AdminUtilErrors.h
+afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et
+       rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h
+       ${COMPILE_ET} afs_AdminVosErrors.et -h afs_AdminVosErrors
+       cp afs_AdminVosErrors.h ${DESTDIR}/include/afs/afs_AdminVosErrors.h
+
+ERROROBJS = \
+       rxkad_errs.o \
+       boserr.o \
+       kaerrors.o \
+       ktc_errors.o \
+       cmd_errors.o \
+       pterror.o \
+       uerrors.o \
+       vl_errors.o \
+       acfg_errors.o \
+       volerr.o
+
+ADMINOBJS = \
+       afs_AdminBosErrors.o \
+       afs_AdminCfgErrors.o \
+       afs_AdminClientErrors.o \
+       afs_AdminCommonErrors.o \
+       afs_AdminKasErrors.o \
+       afs_AdminMiscErrors.o \
+       afs_AdminPtsErrors.o \
+       afs_AdminUtilErrors.o \
+       afs_AdminVosErrors.o \
+       afs_utilAdmin.o
+
+LIBOBJS = ${ADMINOBJS} ${ERROROBJS}
+
+LIBADMINUTIL = ${DESTDIR}/lib/afs/libafsadminutil.a
+
+system install: ${LIBADMINUTIL}
+
+${LIBADMINUTIL}: libafsadminutil.a
+       ${INSTALL} afs_utilAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libafsadminutil.a ${LIBADMINUTIL}
+
+libafsadminutil.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_utilAdmin.o: afs_utilAdmin.h
+
+ktc_errors.o: ${AUTH}/ktc_errors.c
+       ${CCRULE}
+       
+acfg_errors.o: ${AUTH}/acfg_errors.c
+       ${CCRULE}
+       
+boserr.o: ${BOZO}/boserr.c
+       ${CCRULE}
+
+cmd_errors.o: ${CMD}/cmd_errors.c
+       ${CCRULE}
+
+kaerrors.o: ${KAUTH}/kaerrors.c
+       ${CCRULE}
+
+pterror.o: ${PTSERVER}/pterror.c
+       ${CCRULE}
+
+rxkad_errs.o: ${RXKAD}/rxkad_errs.c
+       ${CCRULE}
+
+uerrors.o: ${UBIK}/uerrors.c
+       ${CCRULE}
+
+vl_errors.o: ${VLSERVER}/vl_errors.c
+       ${CCRULE}
+
+volerr.o: ${VOLSER}/volerr.c
+       ${CCRULE}
+
+clean:
+       rm -f *.o libafsadminutil*
+       rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h
+       rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h
+       rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h
+       rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h
+       rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h
+       rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h
+       rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h
+       rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h
+       rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h
diff --git a/src/libadmin/bos/Makefile b/src/libadmin/bos/Makefile
deleted file mode 100644 (file)
index 5114af0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} 
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-BOZO = ../../bozo/
-
-ADMINOBJS = afs_bosAdmin.o
-
-BOZOOBJS = bosint.xdr.o bosint.cs.o
-
-LIBOBJS = ${ADMINOBJS} ${BOZOOBJS}
-
-LIBBOSADMIN = ${DESTDIR}/lib/afs/libbosadmin.a
-
-system install: ${LIBBOSADMIN}
-
-${LIBBOSADMIN}: libbosadmin.a
-       ${INSTALL} afs_bosAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libbosadmin.a ${LIBBOSADMIN}
-
-libbosadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_bosAdmin.o: afs_bosAdmin.h
-
-bosint.xdr.o: ${BOZO}/bosint.xdr.c
-       ${CCRULE}
-
-bosint.cs.o: ${BOZO}/bosint.cs.c
-       ${CCRULE}
-
-clean:
-       rm -f *.o libbosadmin*
diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in
new file mode 100644 (file)
index 0000000..f045fa4
--- /dev/null
@@ -0,0 +1,50 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} 
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+BOZO = ../../bozo/
+
+ADMINOBJS = afs_bosAdmin.o
+
+BOZOOBJS = bosint.xdr.o bosint.cs.o
+
+LIBOBJS = ${ADMINOBJS} ${BOZOOBJS}
+
+LIBBOSADMIN = ${DESTDIR}/lib/afs/libbosadmin.a
+
+system install: ${LIBBOSADMIN}
+
+${LIBBOSADMIN}: libbosadmin.a
+       ${INSTALL} afs_bosAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libbosadmin.a ${LIBBOSADMIN}
+
+libbosadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_bosAdmin.o: afs_bosAdmin.h
+
+bosint.xdr.o: ${BOZO}/bosint.xdr.c
+       ${CCRULE}
+
+bosint.cs.o: ${BOZO}/bosint.cs.c
+       ${CCRULE}
+
+clean:
+       rm -f *.o libbosadmin*
diff --git a/src/libadmin/cfg/Makefile b/src/libadmin/cfg/Makefile
deleted file mode 100644 (file)
index 54a8021..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-UBIKOBJS=\
-       ubik_int.cs.o \
-       ubik_int.xdr.o
-
-CFGOBJS=\
-       cfgclient.o \
-       cfgdb.o \
-       cfghost.o \
-       cfgservers.o \
-       cfginternal.o
-
-LIBOBJS =\
-       ${UBIKOBJS} \
-       ${CFGOBJS}
-
-
-LIBCFGADMIN = ${DESTDIR}/lib/afs/libcfgadmin.a
-
-system install: ${LIBCFGADMIN}
-
-${LIBCFGADMIN}: libcfgadmin.a
-       ${INSTALL} afs_cfgAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libcfgadmin.a ${LIBCFGADMIN}
-
-libcfgadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-UBIKDIR=../../ubik
-
-ubik_int.cs.o: ${UBIKDIR}/ubik_int.cs.c
-       ${CCRULE}
-
-ubik_int.xdr.o: ${UBIKDIR}/ubik_int.xdr.c
-       ${CCRULE}
-
-${CFGOBJS}: afs_cfgAdmin.h
-
-clean:
-       rm -f *.o libcfgadmin*
diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in
new file mode 100644 (file)
index 0000000..34c027b
--- /dev/null
@@ -0,0 +1,59 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+UBIKOBJS=\
+       ubik_int.cs.o \
+       ubik_int.xdr.o
+
+CFGOBJS=\
+       cfgclient.o \
+       cfgdb.o \
+       cfghost.o \
+       cfgservers.o \
+       cfginternal.o
+
+LIBOBJS =\
+       ${UBIKOBJS} \
+       ${CFGOBJS}
+
+
+LIBCFGADMIN = ${DESTDIR}/lib/afs/libcfgadmin.a
+
+system install: ${LIBCFGADMIN}
+
+${LIBCFGADMIN}: libcfgadmin.a
+       ${INSTALL} afs_cfgAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libcfgadmin.a ${LIBCFGADMIN}
+
+libcfgadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+UBIKDIR=../../ubik
+
+ubik_int.cs.o: ${UBIKDIR}/ubik_int.cs.c
+       ${CCRULE}
+
+ubik_int.xdr.o: ${UBIKDIR}/ubik_int.xdr.c
+       ${CCRULE}
+
+${CFGOBJS}: afs_cfgAdmin.h
+
+clean:
+       rm -f *.o libcfgadmin*
diff --git a/src/libadmin/cfg/test/Makefile b/src/libadmin/cfg/test/Makefile
deleted file mode 100644 (file)
index c236ec2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-
-include ../../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}include ${MT_CFLAGS}
-
-
-########################################################################
-# build tests
-
-CFGTESTLIBS =\
-       $(DESTDIR)/lib/afs/libafsadminutil.a \
-       $(DESTDIR)/lib/afs/libclientadmin.a \
-       $(DESTDIR)/lib/afs/libcfgadmin.a \
-       $(DESTDIR)/lib/afs/libbosadmin.a \
-       $(DESTDIR)/lib/afs/libvosadmin.a \
-       $(DESTDIR)/lib/afs/libkasadmin.a \
-       $(DESTDIR)/lib/afs/libptsadmin.a \
-       $(DESTDIR)/lib/libafsauthent.a \
-       $(DESTDIR)/lib/libafsrpc.a \
-       $(DESTDIR)/lib/afs/libcmd.a  # static library
-
-cfgtest: cfgtest.o $(CFGTESTLIBS)
-       $(CC) $(CFLAGS) -o cfgtest cfgtest.o -LDEST/lib/afs $(CFGTESTLIBS) $(XLIBS)
-
-#######################################################################
-test tests: cfgtest
-
-clean:
-       $(RM) -f *.o cfgtest core
diff --git a/src/libadmin/cfg/test/Makefile.in b/src/libadmin/cfg/test/Makefile.in
new file mode 100644 (file)
index 0000000..ee649ab
--- /dev/null
@@ -0,0 +1,41 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}include ${MT_CFLAGS}
+
+
+########################################################################
+# build tests
+
+CFGTESTLIBS =\
+       $(DESTDIR)/lib/afs/libafsadminutil.a \
+       $(DESTDIR)/lib/afs/libclientadmin.a \
+       $(DESTDIR)/lib/afs/libcfgadmin.a \
+       $(DESTDIR)/lib/afs/libbosadmin.a \
+       $(DESTDIR)/lib/afs/libvosadmin.a \
+       $(DESTDIR)/lib/afs/libkasadmin.a \
+       $(DESTDIR)/lib/afs/libptsadmin.a \
+       $(DESTDIR)/lib/libafsauthent.a \
+       $(DESTDIR)/lib/libafsrpc.a \
+       $(DESTDIR)/lib/afs/libcmd.a  # static library
+
+cfgtest: cfgtest.o $(CFGTESTLIBS)
+       $(CC) $(CFLAGS) -o cfgtest cfgtest.o -LDEST/lib/afs $(CFGTESTLIBS) $(XLIBS)
+
+#######################################################################
+test tests: cfgtest
+
+clean:
+       $(RM) -f *.o cfgtest core
diff --git a/src/libadmin/client/Makefile b/src/libadmin/client/Makefile
deleted file mode 100644 (file)
index c512c7c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-
-ADMINOBJS = afs_clientAdmin.o
-
-LIBOBJS = ${ADMINOBJS}
-
-LIBCLIENTADMIN = ${DESTDIR}/lib/afs/libclientadmin.a
-
-system install: ${LIBCLIENTADMIN}
-
-${LIBCLIENTADMIN}: libclientadmin.a
-       ${INSTALL} afs_clientAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libclientadmin.a ${LIBCLIENTADMIN}
-
-libclientadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_clientAdmin.o: afs_clientAdmin.h
-
-clean:
-       rm -f *.o libclientadmin*
diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in
new file mode 100644 (file)
index 0000000..a92c2fe
--- /dev/null
@@ -0,0 +1,39 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+
+ADMINOBJS = afs_clientAdmin.o
+
+LIBOBJS = ${ADMINOBJS}
+
+LIBCLIENTADMIN = ${DESTDIR}/lib/afs/libclientadmin.a
+
+system install: ${LIBCLIENTADMIN}
+
+${LIBCLIENTADMIN}: libclientadmin.a
+       ${INSTALL} afs_clientAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libclientadmin.a ${LIBCLIENTADMIN}
+
+libclientadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_clientAdmin.o: afs_clientAdmin.h
+
+clean:
+       rm -f *.o libclientadmin*
diff --git a/src/libadmin/kas/Makefile b/src/libadmin/kas/Makefile
deleted file mode 100644 (file)
index c954d29..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-KAUTH= ../../kauth/
-
-ADMINOBJS = afs_kasAdmin.o
-
-KAUTHOBJS = \
-       kauth.cs.o \
-       kauth.xdr.o \
-       kaaux.o
-
-LIBOBJS = ${ADMINOBJS} ${KAUTHOBJS}
-
-LIBKASADMIN = ${DESTDIR}/lib/afs/libkasadmin.a
-
-system install: ${LIBKASADMIN}
-
-${LIBKASADMIN}: libkasadmin.a
-       ${INSTALL} afs_kasAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libkasadmin.a ${LIBKASADMIN}
-
-libkasadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_kasAdmin.o: afs_kasAdmin.h
-
-kauth.cs.o: ${KAUTH}/kauth.cs.c
-       ${CCRULE};
-
-kauth.xdr.o: ${KAUTH}/kauth.xdr.c
-       ${CCRULE};
-
-kaaux.o: ${KAUTH}/kaaux.c
-       ${CCRULE};
-
-clean:
-       rm -f *.o libkasadmin*
diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in
new file mode 100644 (file)
index 0000000..db18a16
--- /dev/null
@@ -0,0 +1,56 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+KAUTH= ../../kauth/
+
+ADMINOBJS = afs_kasAdmin.o
+
+KAUTHOBJS = \
+       kauth.cs.o \
+       kauth.xdr.o \
+       kaaux.o
+
+LIBOBJS = ${ADMINOBJS} ${KAUTHOBJS}
+
+LIBKASADMIN = ${DESTDIR}/lib/afs/libkasadmin.a
+
+system install: ${LIBKASADMIN}
+
+${LIBKASADMIN}: libkasadmin.a
+       ${INSTALL} afs_kasAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libkasadmin.a ${LIBKASADMIN}
+
+libkasadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_kasAdmin.o: afs_kasAdmin.h
+
+kauth.cs.o: ${KAUTH}/kauth.cs.c
+       ${CCRULE};
+
+kauth.xdr.o: ${KAUTH}/kauth.xdr.c
+       ${CCRULE};
+
+kaaux.o: ${KAUTH}/kaaux.c
+       ${CCRULE};
+
+clean:
+       rm -f *.o libkasadmin*
diff --git a/src/libadmin/pts/Makefile b/src/libadmin/pts/Makefile
deleted file mode 100644 (file)
index 07b1376..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-PTSERVER = ../../ptserver/
-
-ADMINOBJS = \
-       afs_ptsAdmin.o
-
-PTSERVEROBJS = \
-       ptint.xdr.o \
-       ptint.cs.o
-
-LIBOBJS = ${ADMINOBJS} ${PTSERVEROBJS}
-
-LIBPTSADMIN = ${DESTDIR}/lib/afs/libptsadmin.a
-
-system install: ${LIBPTSADMIN}
-
-${LIBPTSADMIN}: libptsadmin.a
-       ${INSTALL} afs_ptsAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libptsadmin.a ${LIBPTSADMIN}
-
-libptsadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_ptsAdmin.o: afs_ptsAdmin.h
-
-ptint.xdr.o: ${PTSERVER}/ptint.xdr.c
-       ${CCRULE};
-
-ptint.cs.o: ${PTSERVER}/ptint.cs.c
-       ${CCRULE};
-
-clean:
-       rm -f *.o libptsadmin*
diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in
new file mode 100644 (file)
index 0000000..875060f
--- /dev/null
@@ -0,0 +1,53 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+PTSERVER = ../../ptserver/
+
+ADMINOBJS = \
+       afs_ptsAdmin.o
+
+PTSERVEROBJS = \
+       ptint.xdr.o \
+       ptint.cs.o
+
+LIBOBJS = ${ADMINOBJS} ${PTSERVEROBJS}
+
+LIBPTSADMIN = ${DESTDIR}/lib/afs/libptsadmin.a
+
+system install: ${LIBPTSADMIN}
+
+${LIBPTSADMIN}: libptsadmin.a
+       ${INSTALL} afs_ptsAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libptsadmin.a ${LIBPTSADMIN}
+
+libptsadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_ptsAdmin.o: afs_ptsAdmin.h
+
+ptint.xdr.o: ${PTSERVER}/ptint.xdr.c
+       ${CCRULE};
+
+ptint.cs.o: ${PTSERVER}/ptint.cs.c
+       ${CCRULE};
+
+clean:
+       rm -f *.o libptsadmin*
diff --git a/src/libadmin/samples/Makefile b/src/libadmin/samples/Makefile
deleted file mode 100644 (file)
index b323eda..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-
-
-########################################################################
-# build tests
-
-SAMPLEPROGS=\
-       cm_client_config \
-       cm_list_cells \
-       cm_local_cell \
-       cm_server_prefs \
-       rxdebug_basic_stats \
-       rxdebug_conns \
-       rxdebug_peers \
-       rxdebug_rx_stats \
-       rxdebug_supported_stats \
-       rxdebug_version \
-       rxstat_clear_peer \
-       rxstat_clear_process \
-       rxstat_disable_peer \
-       rxstat_disable_process \
-       rxstat_enable_peer \
-       rxstat_enable_process \
-       rxstat_get_peer \
-       rxstat_get_process \
-       rxstat_get_version \
-       rxstat_query_peer \
-       rxstat_query_process
-
-SAMPLELIBS =\
-       ${DESTDIR}/lib/afs/libafsadminutil.a \
-       ${DESTDIR}/lib/afs/libclientadmin.a \
-       ${DESTDIR}/lib/afs/libvosadmin.a \
-       ${DESTDIR}/lib/afs/libbosadmin.a \
-       ${DESTDIR}/lib/libafsauthent.a \
-       ${DESTDIR}/lib/libafsrpc.a
-
-cm_client_config: cm_client_config.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-cm_list_cells: cm_list_cells.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-cm_local_cell: cm_local_cell.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxdebug_version: rxdebug_version.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS)
-       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
-
-#######################################################################
-install test tests: $(SAMPLEPROGS)
-
-clean:
-       $(RM) -f *.o $(SAMPLEPROGS) core
diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in
new file mode 100644 (file)
index 0000000..5be8f3e
--- /dev/null
@@ -0,0 +1,120 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+
+
+########################################################################
+# build tests
+
+SAMPLEPROGS=\
+       cm_client_config \
+       cm_list_cells \
+       cm_local_cell \
+       cm_server_prefs \
+       rxdebug_basic_stats \
+       rxdebug_conns \
+       rxdebug_peers \
+       rxdebug_rx_stats \
+       rxdebug_supported_stats \
+       rxdebug_version \
+       rxstat_clear_peer \
+       rxstat_clear_process \
+       rxstat_disable_peer \
+       rxstat_disable_process \
+       rxstat_enable_peer \
+       rxstat_enable_process \
+       rxstat_get_peer \
+       rxstat_get_process \
+       rxstat_get_version \
+       rxstat_query_peer \
+       rxstat_query_process
+
+SAMPLELIBS =\
+       ${DESTDIR}/lib/afs/libafsadminutil.a \
+       ${DESTDIR}/lib/afs/libclientadmin.a \
+       ${DESTDIR}/lib/afs/libvosadmin.a \
+       ${DESTDIR}/lib/afs/libbosadmin.a \
+       ${DESTDIR}/lib/libafsauthent.a \
+       ${DESTDIR}/lib/libafsrpc.a
+
+cm_client_config: cm_client_config.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+cm_list_cells: cm_list_cells.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+cm_local_cell: cm_local_cell.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxdebug_version: rxdebug_version.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS)
+       $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS)
+
+#######################################################################
+install test tests: $(SAMPLEPROGS)
+
+clean:
+       $(RM) -f *.o $(SAMPLEPROGS) core
diff --git a/src/libadmin/test/Makefile b/src/libadmin/test/Makefile
deleted file mode 100644 (file)
index cab8766..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-
-
-########################################################################
-# build tests
-
-AFSCPLIBS =\
-       $(DESTDIR)/lib/afs/libafsadminutil.a \
-       $(DESTDIR)/lib/afs/libclientadmin.a \
-       $(DESTDIR)/lib/afs/libbosadmin.a \
-       $(DESTDIR)/lib/afs/libvosadmin.a \
-       $(DESTDIR)/lib/afs/libkasadmin.a \
-       $(DESTDIR)/lib/afs/libptsadmin.a \
-       $(DESTDIR)/lib/libafsauthent.a \
-       $(DESTDIR)/lib/libafsrpc.a \
-       $(DESTDIR)/lib/afs/libcmd.a  # static library
-
-AFSCPOBJS =\
-       bos.o \
-       client.o \
-       kas.o \
-       pts.o \
-       util.o \
-       vos.o
-
-afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS)
-       $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \
-       -LDEST/lib/afs $(AFSCPLIBS) ${MTLIBS} $(XLIBS)
-
-#######################################################################
-install test tests: afscp
-
-clean:
-       $(RM) -f *.o afscp core
diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in
new file mode 100644 (file)
index 0000000..2ad9c9e
--- /dev/null
@@ -0,0 +1,49 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+
+
+########################################################################
+# build tests
+
+AFSCPLIBS =\
+       $(DESTDIR)/lib/afs/libafsadminutil.a \
+       $(DESTDIR)/lib/afs/libclientadmin.a \
+       $(DESTDIR)/lib/afs/libbosadmin.a \
+       $(DESTDIR)/lib/afs/libvosadmin.a \
+       $(DESTDIR)/lib/afs/libkasadmin.a \
+       $(DESTDIR)/lib/afs/libptsadmin.a \
+       $(DESTDIR)/lib/libafsauthent.a \
+       $(DESTDIR)/lib/libafsrpc.a \
+       $(DESTDIR)/lib/afs/libcmd.a  # static library
+
+AFSCPOBJS =\
+       bos.o \
+       client.o \
+       kas.o \
+       pts.o \
+       util.o \
+       vos.o
+
+afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS)
+       $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \
+       -LDEST/lib/afs $(AFSCPLIBS) ${MTLIBS} $(XLIBS)
+
+#######################################################################
+install test tests: afscp
+
+clean:
+       $(RM) -f *.o afscp core
diff --git a/src/libadmin/vos/Makefile b/src/libadmin/vos/Makefile
deleted file mode 100644 (file)
index 797ec28..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-
-CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-VLSERVER = ../../vlserver/
-VOLSER = ../../volser/
-FSINT = ../../fsint/
-
-ADMINOBJS =\
-       afs_vosAdmin.o \
-       vosutils.o \
-       vsprocs.o \
-       lockprocs.o
-
-VLSERVEROBJS =\
-       vldbint.cs.o \
-       vldbint.xdr.o
-
-VOLSEROBJS =\
-       volint.cs.o \
-       volint.xdr.o
-
-FSINTOBJS =\
-       afsint.xdr.o \
-       afscbint.xdr.o
-
-LIBOBJS = ${ADMINOBJS} ${VLSERVEROBJS} ${VOLSEROBJS} ${FSINTOBJS}
-
-LIBVOSADMIN = ${DESTDIR}/lib/afs/libvosadmin.a
-
-system install: ${LIBVOSADMIN}
-
-${LIBVOSADMIN}: libvosadmin.a
-       ${INSTALL} afs_vosAdmin.h ${DESTDIR}include/afs
-       ${INSTALL} libvosadmin.a ${LIBVOSADMIN}
-
-libvosadmin.a: ${LIBOBJS}
-       -rm -f $@
-       ar rv $@ ${LIBOBJS}
-       ${RANLIB} $@
-
-afs_vosAdmin.o: afs_vosAdmin.h
-
-vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
-       ${CCRULE};
-
-vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
-       ${CCRULE};
-
-volint.xdr.o: ${VOLSER}/volint.xdr.c
-       ${CCRULE};
-
-volint.cs.o: ${VOLSER}/volint.cs.c
-       ${CCRULE};
-
-afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
-       ${CCRULE};
-
-afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CCRULE};
-
-clean:
-       rm -f *.o libvosadmin*
diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in
new file mode 100644 (file)
index 0000000..05876f9
--- /dev/null
@@ -0,0 +1,78 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+
+CC = ${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS}
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+VLSERVER = ../../vlserver/
+VOLSER = ../../volser/
+FSINT = ../../fsint/
+
+ADMINOBJS =\
+       afs_vosAdmin.o \
+       vosutils.o \
+       vsprocs.o \
+       lockprocs.o
+
+VLSERVEROBJS =\
+       vldbint.cs.o \
+       vldbint.xdr.o
+
+VOLSEROBJS =\
+       volint.cs.o \
+       volint.xdr.o
+
+FSINTOBJS =\
+       afsint.xdr.o \
+       afscbint.xdr.o
+
+LIBOBJS = ${ADMINOBJS} ${VLSERVEROBJS} ${VOLSEROBJS} ${FSINTOBJS}
+
+LIBVOSADMIN = ${DESTDIR}/lib/afs/libvosadmin.a
+
+system install: ${LIBVOSADMIN}
+
+${LIBVOSADMIN}: libvosadmin.a
+       ${INSTALL} afs_vosAdmin.h ${DESTDIR}include/afs
+       ${INSTALL} libvosadmin.a ${LIBVOSADMIN}
+
+libvosadmin.a: ${LIBOBJS}
+       -rm -f $@
+       ar rv $@ ${LIBOBJS}
+       ${RANLIB} $@
+
+afs_vosAdmin.o: afs_vosAdmin.h
+
+vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
+       ${CCRULE};
+
+vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
+       ${CCRULE};
+
+volint.xdr.o: ${VOLSER}/volint.xdr.c
+       ${CCRULE};
+
+volint.cs.o: ${VOLSER}/volint.cs.c
+       ${CCRULE};
+
+afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
+       ${CCRULE};
+
+afsint.xdr.o: ${FSINT}/afsint.xdr.c
+       ${CCRULE};
+
+clean:
+       rm -f *.o libvosadmin*
index 2b908c01e3820d073149e62ab93eade85ab2c5ed..7147a04ae75a2ca500af1fc255b6689ff3164d6c 100644 (file)
@@ -8,8 +8,6 @@
 # Common elements for Makefiles for all system types.
 #
 SHELL=/bin/sh
-DESTDIR = DEST/
-SRCDIR = DEST/
 INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
 Aobj=COMMON
 Dobj=DYNEL
index 48d3fff4385c54cd6a832850e811eb97ebf9ec5c..be15f5e6791d7e0462943effdb286fcad41493bf 100644 (file)
@@ -7,8 +7,11 @@
 
 # MakefileProto for AIX systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
index 23c8f54bf2895661418b65fb0efd2e9bb2cfb12a..b3894b9c0cdd02ffdde9168062b1935587a69871 100644 (file)
@@ -3,8 +3,11 @@
 # 
 # MakefileProto for Digital Unix systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 
index c1abece414ac440496c8da3411f41a0c28e34a81..b13b232f6f19b74802fb58773322e9a5ec4ad5cc 100644 (file)
@@ -7,8 +7,11 @@
 
 # MakefileProto for Digital Unix systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 
index 13fcbf7697b1e65fffb95dc542fac459a526077c..ab9033df3f8414a5dc39ea56a42919ee5e1b8b0c 100644 (file)
@@ -1,9 +1,12 @@
 #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
 #
-# MakefileProto for Digital Unix systems
+# MakefileProto for FreeBSD systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 # include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
index 89656fec768a3462c751044f9d21df8d5f2a15ad..57e3ab5dedaed204788e22fffe341f345c5ce8b3 100644 (file)
@@ -7,8 +7,11 @@
 
 # MakefileProto for HP systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
@@ -110,7 +113,7 @@ ${COMPDIRS}:
                64)     bopts="$(KDEFS_64)"; bsuff="64";; \
                esac; \
                cd $$dir; \
-               $(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" DESTDIR=${DESTDIR} libafs || exit $$?; \
+               $(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" libafs || exit $$?; \
                cd ..; \
            done; \
        done; \
index 286f69fd8d4771e975771896c18ce41facc47e41..7602e88f7c900b9bbf502f3878f7f71de97c3ec4 100644 (file)
@@ -7,8 +7,11 @@
 
 # MakefileProto for IRIX systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
@@ -303,7 +306,7 @@ ${COMPDIRS}:
                        export CPU_KDEFS ;\
                        export LDFLAGS; \
                cd $$dir ; \
-               $(MAKE) CPUARCH=$$p MPSP=$$n DESTDIR=../${DESTDIR} $$t.libafs || exit $$?;\
+               $(MAKE) CPUARCH=$$p MPSP=$$n $$t.libafs || exit $$?;\
                cd ../ ; \
            done; \
          done; \
@@ -340,7 +343,7 @@ ${COMPDIRS}:
                export CPU_KDEFS ;\
                export LDFLAGS ;\
                cd $$dir ; \
-               $(MAKE) IPNO=$$p DESTDIR=${DESTDIR} $$t.libafs || exit $$?; \
+               $(MAKE) IPNO=$$p $$t.libafs || exit $$?; \
                cd ../ ; \
          done; \
        done
index 94850a6ac2a79ec3e66d3292814deb5fbdc3b2f1..eaf052cbccf9928275f8210206d4ae75b2a208d1 100644 (file)
@@ -7,8 +7,11 @@
 
 # MakefileProto for Linux i386 systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
@@ -133,7 +136,7 @@ ${COMPDIRS}:
                        TARG=libafs ; \
                fi ; \
                cd $${KDIR} ; \
-               $(MAKE) DESTDIR=${DESTDIR} SMP_DEF="$${SMP_DEF}" $${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \
+               $(MAKE) SMP_DEF="$${SMP_DEF}" $${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \
                cd ../ ; \
        done
 
index 505692d09a785c8e829378e3023c7ef0e1dd3119..2fed3f384e7226e9e6c27212465820cf38bc6cb0 100644 (file)
@@ -7,6 +7,11 @@
 
 # MakefileProto for Solaris systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}
 
 # OS specific object files:
@@ -95,7 +100,7 @@ ${COMPDIRS}:
                export ARCH_DEFS ; \
                export BITS ; \
                cd $$t  ; \
-               $(MAKE) DESTDIR=${DESTDIR}  libafs ; \
+               $(MAKE) libafs ; \
                cd ../ ;\
        done
 
diff --git a/src/libafsauthent/Makefile b/src/libafsauthent/Makefile
deleted file mode 100644 (file)
index 2fe9f04..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-# 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
-
-# This is a pthread safe library containing ubikclient, auth, kauth.
-
-SHELL = /bin/sh
-COMPONENT=libafsauthent
-include ../config/Makefile.${SYS_NAME}
-
-CC=${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} 
-CCRULE = ${CC} ${CFLAGS} -c $?
-
-AUDIT= ../audit
-AUTH = ../auth
-KAUTH = ../kauth
-UBIK = ../ubik
-UTIL = ../util
-RXKAD = ../rxkad
-PTSERVER = ../ptserver
-SYS = ../sys
-
-AUDITOBJS = audit.o
-
-AUTHOBJS = \
-       cellconfig.o \
-       ktc.o \
-       userok.o \
-       writeconfig.o \
-       authcon.o \
-       ktc_errors.o \
-       acfg_errors.o
-
-KAUTHOBJS = \
-       kauth.xdr.o \
-       kauth.cs.o \
-       kaaux.o \
-       client.o \
-       authclient.o \
-       token.o \
-       kautils.o \
-       kalocalcell.o \
-       kaerrors.o \
-       user.o \
-       read_passwd.o
-
-UBIKOBJS = \
-       ubikclient.o \
-       uerrors.o \
-       ubik_int.cs.o \
-       ubik_int.xdr.o
-
-UTILOBJS = \
-       pthread_glock.o \
-       get_krbrlm.o \
-       dirpath.o \
-       fileutil.o \
-       casestrcpy.o
-
-RXKADOBJS = \
-       rxkad_errs.o
-
-SYSOBJS = \
-       rmtsysc.o \
-       rmtsys.xdr.o \
-       rmtsys.cs.o \
-       afssyscalls.o \
-       rmtsysnet.o
-
-PTSERVEROBJS = \
-       ptclient.o \
-       ptint.cs.o \
-       ptint.xdr.o \
-       ptuser.o \
-       display.o \
-       pterror.o
-
-LIBOBJS = \
-       ${AUDITOBJS} \
-       ${AUTHOBJS} \
-       ${KAUTHOBJS} \
-       ${UBIKOBJS} \
-       ${UTILOBJS} \
-       ${RXKADOBJS} \
-       ${PTSERVEROBJS} \
-       ${SYSOBJS}
-
-system install: ${DESTDIR}lib/libafsauthent.a
-
-${DESTDIR}lib/libafsauthent.a: libafsauthent.a
-       ${INSTALL} libafsauthent.a ${DESTDIR}lib/libafsauthent.a
-
-libafsauthent.a: ${LIBOBJS}
-       rm -f libafsauthent.a
-       ${AR} -r libafsauthent.a ${LIBOBJS}
-       ${RANLIB} libafsauthent.a
-
-audit.o: ${AUDIT}/audit.c
-       ${CCRULE};
-
-cellconfig.o: ${AUTH}/cellconfig.c
-       ${CCRULE};
-
-ktc.o: ${AUTH}/ktc.c
-       ${CCRULE};
-
-userok.o: ${AUTH}/userok.c
-       ${CCRULE};
-
-writeconfig.o: ${AUTH}/writeconfig.c
-       ${CCRULE};
-
-authcon.o: ${AUTH}/authcon.c
-       ${CCRULE};
-
-ktc_errors.o: ${AUTH}/ktc_errors.c
-       ${CCRULE};
-
-acfg_errors.o: ${AUTH}/acfg_errors.c
-       ${CCRULE};
-
-kauth.xdr.o: ${KAUTH}/kauth.xdr.c
-       ${CCRULE};
-
-kauth.cs.o: ${KAUTH}/kauth.cs.c
-       ${CCRULE};
-
-kaaux.o: ${KAUTH}/kaaux.c
-       ${CCRULE};
-
-client.o: ${KAUTH}/client.c
-       ${CCRULE};
-
-authclient.o: ${KAUTH}/authclient.c
-       ${CCRULE};
-
-token.o: ${KAUTH}/token.c
-       ${CCRULE};
-
-kautils.o: ${KAUTH}/kautils.c
-       ${CCRULE};
-
-kalocalcell.o: ${KAUTH}/kalocalcell.c
-       ${CCRULE};
-
-kaerrors.o: ${KAUTH}/kaerrors.c
-       ${CCRULE};
-
-user.o: ${KAUTH}/user.c
-       ${CCRULE};
-
-read_passwd.o: ${KAUTH}/read_passwd.c
-       ${CCRULE};
-
-ubikclient.o: ${UBIK}/ubikclient.c
-       ${CCRULE};
-
-uerrors.o: ${UBIK}/uerrors.c
-       ${CCRULE};
-
-ubik_int.cs.o: ${UBIK}/ubik_int.cs.c
-       ${CCRULE};
-
-ubik_int.xdr.o: ${UBIK}/ubik_int.xdr.c
-       ${CCRULE};
-
-get_krbrlm.o: ${UTIL}/get_krbrlm.c
-       ${CCRULE};
-
-dirpath.o: ${UTIL}/dirpath.c
-       ${CCRULE};
-
-fileutil.o: ${UTIL}/fileutil.c
-       ${CCRULE};
-
-casestrcpy.o: ${UTIL}/casestrcpy.c
-       ${CCRULE}
-
-pthread_glock.o: ${UTIL}/pthread_glock.c
-       ${CCRULE};
-
-rxkad_errs.o: ${RXKAD}/rxkad_errs.c
-       ${CCRULE};
-
-ptclient.o: ${PTSERVER}/ptclient.c
-       ${CCRULE};
-
-# The special treatment of this file for hp_ux110 is because of a bug
-# in version A.11.01.00 of the HP C compiler.  This bug appears to be
-# fixed in version A.11.01.02 of the HP C compiler, however this version
-# of the compiler is not installed on all of our build machines.
-# The symptom of the problem is an error when linking the pthread fileserver:
-# /usr/ccs/bin/ld: TP override with DATA_ONE_SYM fixup for non thread local
-# storage symbol pr_Initialize in file DEST/lib/libafsauthent.a(ptuser.o)
-ptuser.o: ${PTSERVER}/ptuser.c
-       set -x; \
-       case ${SYS_NAME} in \
-       hp_ux11*) \
-               set X `echo ${CCRULE} | sed s/-g//`; shift; \
-               "$$@" \
-               ;; \
-       *) \
-               ${CCRULE} \
-               ;; \
-       esac
-
-display.o: ${PTSERVER}/display.c
-       ${CCRULE};
-
-ptint.cs.o: ${PTSERVER}/ptint.cs.c
-       ${CCRULE};
-
-ptint.xdr.o: ${PTSERVER}/ptint.xdr.c
-       ${CCRULE};
-
-pterror.o: ${PTSERVER}/pterror.c
-       ${CCRULE};
-
-rmtsysc.o: ${SYS}/rmtsysc.c
-       ${CCRULE};
-
-rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c
-       ${CCRULE};
-
-rmtsys.cs.o: ${SYS}/rmtsys.cs.c
-       ${CCRULE};
-
-afssyscalls.o: ${SYS}/afssyscalls.c
-       ${CCRULE};
-
-rmtsysnet.o: ${SYS}/rmtsysnet.c
-       ${CCRULE};
-
-clean:
-       rm -f *.o libafsauthent*
diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
new file mode 100644 (file)
index 0000000..32e6a8b
--- /dev/null
@@ -0,0 +1,244 @@
+# 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
+
+# This is a pthread safe library containing ubikclient, auth, kauth.
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CC=${MT_CC}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} 
+CCRULE = ${CC} ${CFLAGS} -c $?
+
+AUDIT= ../audit
+AUTH = ../auth
+KAUTH = ../kauth
+UBIK = ../ubik
+UTIL = ../util
+RXKAD = ../rxkad
+PTSERVER = ../ptserver
+SYS = ../sys
+
+AUDITOBJS = audit.o
+
+AUTHOBJS = \
+       cellconfig.o \
+       ktc.o \
+       userok.o \
+       writeconfig.o \
+       authcon.o \
+       ktc_errors.o \
+       acfg_errors.o
+
+KAUTHOBJS = \
+       kauth.xdr.o \
+       kauth.cs.o \
+       kaaux.o \
+       client.o \
+       authclient.o \
+       token.o \
+       kautils.o \
+       kalocalcell.o \
+       kaerrors.o \
+       user.o \
+       read_passwd.o
+
+UBIKOBJS = \
+       ubikclient.o \
+       uerrors.o \
+       ubik_int.cs.o \
+       ubik_int.xdr.o
+
+UTILOBJS = \
+       pthread_glock.o \
+       get_krbrlm.o \
+       dirpath.o \
+       fileutil.o \
+       casestrcpy.o
+
+RXKADOBJS = \
+       rxkad_errs.o
+
+SYSOBJS = \
+       rmtsysc.o \
+       rmtsys.xdr.o \
+       rmtsys.cs.o \
+       afssyscalls.o \
+       rmtsysnet.o
+
+PTSERVEROBJS = \
+       ptclient.o \
+       ptint.cs.o \
+       ptint.xdr.o \
+       ptuser.o \
+       display.o \
+       pterror.o
+
+LIBOBJS = \
+       ${AUDITOBJS} \
+       ${AUTHOBJS} \
+       ${KAUTHOBJS} \
+       ${UBIKOBJS} \
+       ${UTILOBJS} \
+       ${RXKADOBJS} \
+       ${PTSERVEROBJS} \
+       ${SYSOBJS}
+
+system install: ${DESTDIR}lib/libafsauthent.a
+
+${DESTDIR}lib/libafsauthent.a: libafsauthent.a
+       ${INSTALL} libafsauthent.a ${DESTDIR}lib/libafsauthent.a
+
+libafsauthent.a: ${LIBOBJS}
+       rm -f libafsauthent.a
+       ${AR} -r libafsauthent.a ${LIBOBJS}
+       ${RANLIB} libafsauthent.a
+
+audit.o: ${AUDIT}/audit.c
+       ${CCRULE};
+
+cellconfig.o: ${AUTH}/cellconfig.c
+       ${CCRULE};
+
+ktc.o: ${AUTH}/ktc.c
+       ${CCRULE};
+
+userok.o: ${AUTH}/userok.c
+       ${CCRULE};
+
+writeconfig.o: ${AUTH}/writeconfig.c
+       ${CCRULE};
+
+authcon.o: ${AUTH}/authcon.c
+       ${CCRULE};
+
+ktc_errors.o: ${AUTH}/ktc_errors.c
+       ${CCRULE};
+
+acfg_errors.o: ${AUTH}/acfg_errors.c
+       ${CCRULE};
+
+kauth.xdr.o: ${KAUTH}/kauth.xdr.c
+       ${CCRULE};
+
+kauth.cs.o: ${KAUTH}/kauth.cs.c
+       ${CCRULE};
+
+kaaux.o: ${KAUTH}/kaaux.c
+       ${CCRULE};
+
+client.o: ${KAUTH}/client.c
+       ${CCRULE};
+
+authclient.o: ${KAUTH}/authclient.c
+       ${CCRULE};
+
+token.o: ${KAUTH}/token.c
+       ${CCRULE};
+
+kautils.o: ${KAUTH}/kautils.c
+       ${CCRULE};
+
+kalocalcell.o: ${KAUTH}/kalocalcell.c
+       ${CCRULE};
+
+kaerrors.o: ${KAUTH}/kaerrors.c
+       ${CCRULE};
+
+user.o: ${KAUTH}/user.c
+       ${CCRULE};
+
+read_passwd.o: ${KAUTH}/read_passwd.c
+       ${CCRULE};
+
+ubikclient.o: ${UBIK}/ubikclient.c
+       ${CCRULE};
+
+uerrors.o: ${UBIK}/uerrors.c
+       ${CCRULE};
+
+ubik_int.cs.o: ${UBIK}/ubik_int.cs.c
+       ${CCRULE};
+
+ubik_int.xdr.o: ${UBIK}/ubik_int.xdr.c
+       ${CCRULE};
+
+get_krbrlm.o: ${UTIL}/get_krbrlm.c
+       ${CCRULE};
+
+dirpath.o: ${UTIL}/dirpath.c
+       ${CCRULE};
+
+fileutil.o: ${UTIL}/fileutil.c
+       ${CCRULE};
+
+casestrcpy.o: ${UTIL}/casestrcpy.c
+       ${CCRULE}
+
+pthread_glock.o: ${UTIL}/pthread_glock.c
+       ${CCRULE};
+
+rxkad_errs.o: ${RXKAD}/rxkad_errs.c
+       ${CCRULE};
+
+ptclient.o: ${PTSERVER}/ptclient.c
+       ${CCRULE};
+
+# The special treatment of this file for hp_ux110 is because of a bug
+# in version A.11.01.00 of the HP C compiler.  This bug appears to be
+# fixed in version A.11.01.02 of the HP C compiler, however this version
+# of the compiler is not installed on all of our build machines.
+# The symptom of the problem is an error when linking the pthread fileserver:
+# /usr/ccs/bin/ld: TP override with DATA_ONE_SYM fixup for non thread local
+# storage symbol pr_Initialize in file DEST/lib/libafsauthent.a(ptuser.o)
+ptuser.o: ${PTSERVER}/ptuser.c
+       set -x; \
+       case ${SYS_NAME} in \
+       hp_ux11*) \
+               set X `echo ${CCRULE} | sed s/-g//`; shift; \
+               "$$@" \
+               ;; \
+       *) \
+               ${CCRULE} \
+               ;; \
+       esac
+
+display.o: ${PTSERVER}/display.c
+       ${CCRULE};
+
+ptint.cs.o: ${PTSERVER}/ptint.cs.c
+       ${CCRULE};
+
+ptint.xdr.o: ${PTSERVER}/ptint.xdr.c
+       ${CCRULE};
+
+pterror.o: ${PTSERVER}/pterror.c
+       ${CCRULE};
+
+rmtsysc.o: ${SYS}/rmtsysc.c
+       ${CCRULE};
+
+rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c
+       ${CCRULE};
+
+rmtsys.cs.o: ${SYS}/rmtsys.cs.c
+       ${CCRULE};
+
+afssyscalls.o: ${SYS}/afssyscalls.c
+       ${CCRULE};
+
+rmtsysnet.o: ${SYS}/rmtsysnet.c
+       ${CCRULE};
+
+clean:
+       rm -f *.o libafsauthent*
diff --git a/src/libafsrpc/Makefile b/src/libafsrpc/Makefile
deleted file mode 100644 (file)
index 5140265..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-# 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
-
-# This is a pthread safe library containing rx, rxkad and des.
-
-SHELL = /bin/sh
-COMPONENT=libafsrpc
-include ../config/Makefile.${SYS_NAME}
-
-CC=${MT_CC}
-INCLUDES = -I${SRCDIR}include -I.. -I../rx
-CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
-SFLAGS=-P -I${SRCDIR}include
-RX = ../rx
-CCRULE = ${CC} ${CFLAGS} -c $?
-RXKAD = ../rxkad
-RXSTAT = ../rxstat
-FSINT = ../fsint
-DES = ../des
-COMERR = ../comerr
-UTIL = ../util
-SYS = ../sys
-
-SYSOBJS =\
-       syscall.o
-
-UTILOBJS =\
-       casestrcpy.o \
-       base64.o
-
-COMERROBJS =\
-       error_msg.o \
-       et_name.o \
-       com_err.o
-
-XDROBJS =\
-       xdr_arrayn.o \
-       xdr_rx.o \
-       xdr_int64.o \
-       xdr_afsuuid.o \
-       AFS_component_version_number.o
-
-RXOBJS =\
-       rx_event.o \
-       rx_user.o \
-       rx_pthread.o \
-       rx.o \
-       rx_null.o \
-       rx_conncache.o \
-       rx_globals.o \
-       rx_getaddr.o \
-       rx_misc.o \
-       rx_packet.o \
-       rx_rdwr.o \
-       rx_trace.o \
-       rx_multi.o
-
-RXSTATOBJS =\
-       rxstat.o \
-       rxstat.ss.o \
-       rxstat.xdr.o \
-       rxstat.cs.o
-
-FSINTOBJS =\
-       afsint.cs.o \
-       afsint.xdr.o \
-       afscbint.cs.o \
-       afscbint.xdr.o \
-       afsaux.o
-
-RXKADOBJS =\
-       rxkad_client.o \
-       rxkad_server.o \
-       rxkad_common.o \
-       ticket.o \
-       fcrypt.o \
-       crypt_conn.o
-
-DESOBJS =\
-       des.o \
-       cbc_encrypt.o \
-       pcbc_encrypt.o \
-       cksum.o \
-       new_rnd_key.o \
-       key_sched.o \
-       debug_decl.o \
-       quad_cksum.o \
-       key_parity.o \
-       weak_key.o \
-       strng_to_key.o \
-       misco.o \
-       util.o
-
-LIBOBJS = \
-       ${RXOBJS} \
-       ${DESOBJS} \
-       ${XDROBJS} \
-       ${RXKADOBJS} \
-       ${COMERROBJS} \
-       ${UTILOBJS} \
-       ${SYSOBJS} \
-       ${CRYPT_OBJ} \
-       ${RXSTATOBJS} \
-       ${FSINTOBJS}
-
-system install:
-       if [ -f "../des/Makefile" ] ; then \
-               $(MAKE) install.lib ; \
-       else \
-               $(MAKE) libstub ; \
-       fi
-
-install.lib: ${DESTDIR}lib/libafsrpc.a
-
-
-${DESTDIR}lib/libafsrpc.a: libafsrpc.a
-       ${INSTALL} libafsrpc.a ${DESTDIR}lib/libafsrpc.a
-
-libafsrpc.a: ${LIBOBJS}
-       rm -f libafsrpc.a
-       ${AR} -r libafsrpc.a ${LIBOBJS}
-       ${RANLIB} libafsrpc.a
-       case "${SYS_NAME}" in                                   \
-           rs_aix*)                                            \
-               ${AR} r libafsrpc.a ../sys/afsl.exp;;           \
-        esac
-
-rx_event.o: ${RX}/rx_event.c
-       ${CCRULE};
-
-rx_user.o: ${RX}/rx_user.c
-       ${CCRULE};
-
-rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE};
-
-rx.o: ${RX}/rx.c
-       ${CCRULE};
-
-rx_conncache.o: ${RX}/rx_conncache.c
-       ${CCRULE};
-
-rx_null.o: ${RX}/rx_null.c
-       ${CCRULE};
-
-rx_globals.o: ${RX}/rx_globals.c
-       ${CCRULE};
-
-rx_getaddr.o: ${RX}/rx_getaddr.c
-       ${CCRULE};
-
-rx_misc.o: ${RX}/rx_misc.c
-       ${CCRULE};
-
-rx_packet.o: ${RX}/rx_packet.c
-       ${CCRULE};
-
-rx_rdwr.o: ${RX}/rx_rdwr.c
-       ${CCRULE};
-
-rx_trace.o: ${RX}/rx_trace.c
-       ${CCRULE};
-
-rx_multi.o: ${RX}/rx_multi.c
-       ${CCRULE};
-
-rxkad_client.o: ${RXKAD}/rxkad_client.c
-       ${CCRULE};
-
-rxkad_server.o: ${RXKAD}/rxkad_server.c
-       ${CCRULE};
-
-rxkad_common.o: ${RXKAD}/rxkad_common.c
-       ${CCRULE};
-
-ticket.o: ${RXKAD}/ticket.c
-       ${CCRULE};
-
-fcrypt.o: ${RXKAD}/fcrypt.c
-       ${CCRULE};
-
-crypt_conn.o: ${RXKAD}/crypt_conn.c
-       ${CCRULE};
-
-AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
-       ${CCRULE};
-
-xdr.o: ${RX}/xdr.c
-       ${CCRULE};
-
-xdr_int64.o: ${RX}/xdr_int64.c
-       ${CCRULE};
-
-xdr_array.o: ${RX}/xdr_array.c
-       ${CCRULE};
-
-xdr_arrayn.o: ${RX}/xdr_arrayn.c
-       ${CCRULE};
-
-xdr_float.o: ${RX}/xdr_float.c
-       ${CCRULE};
-
-xdr_mem.o: ${RX}/xdr_mem.c
-       ${CCRULE};
-
-xdr_rec.o: ${RX}/xdr_rec.c
-       ${CCRULE};
-
-xdr_refernce.o: ${RX}/xdr_refernce.c
-       ${CCRULE};
-
-xdr_rx.o: ${RX}/xdr_rx.c
-       ${CCRULE};
-
-xdr_update.o: ${RX}/xdr_update.c
-       ${CCRULE};
-
-xdr_afsuuid.o: ${RX}/xdr_afsuuid.c
-       ${CCRULE};
-
-# Note that the special case statement for compiling des.c is present
-# simply to work around a compiler bug on HP-UX 11.0.  The symptom of
-# the problem is that linking the pthread fileserver fails with messages
-# such as
-#
-#   pxdb internal warning: cu[84]: SLT_SRCFILE[411] out of synch
-#   Please contact your HP Support representative
-#   pxdb internal warning: cu[84]: SLT_SRCFILE[442] out of synch
-#   pxdb internal warning: cu[84]: SLT_SRCFILE[450] out of synch
-#   pxdb internal warning: cu[84]: SLT_SRCFILE[529] out of synch
-#   pxdb internal warning: cu[84]: SLT_SRCFILE[544] out of synch
-#   ...
-#   pxdb32: internal error. File won't be debuggable (still a valid executable)
-#   *** Error exit code 10
-#
-# The problematic version of pxdb is:
-#
-#   $ what /opt/langtools/bin/pxdb32
-#   /opt/langtools/bin/pxdb32:
-#           HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision$
-#
-# The problem occurs when -g and -O are both used when compiling des.c.
-# The simplest way to work around the problem is to leave out either -g or -O.
-# Since des.c is relatively stable I've chosen to eliminate -g rather
-# than take any hit in performance.
-
-des.o: ${DES}/des.c
-       set -x; \
-       case ${SYS_NAME} in \
-       hp_ux11*) \
-               set X `echo ${CCRULE} | sed s/-g//`; shift; \
-               "$$@" \
-               ;; \
-       *) \
-               ${CCRULE} \
-               ;; \
-       esac
-
-crypt.o: ${DES}/crypt.c
-       ${CCRULE};
-
-cbc_encrypt.o: ${DES}/cbc_encrypt.c
-       ${CCRULE};
-
-pcbc_encrypt.o: ${DES}/pcbc_encrypt.c
-       ${CCRULE};
-
-cksum.o: ${DES}/cksum.c
-       ${CCRULE};
-
-new_rnd_key.o: ${DES}/new_rnd_key.c
-       ${CCRULE};
-
-key_sched.o: ${DES}/key_sched.c
-       ${CCRULE};
-
-debug_decl.o: ${DES}/debug_decl.c
-       ${CCRULE};
-
-quad_cksum.o: ${DES}/quad_cksum.c
-       ${CCRULE};
-
-key_parity.o: ${DES}/key_parity.c
-       ${CCRULE};
-
-weak_key.o: ${DES}/weak_key.c
-       ${CCRULE};
-
-strng_to_key.o: ${DES}/strng_to_key.c
-       ${CCRULE};
-
-misco.o: ${DES}/misco.c
-       ${CCRULE} -DDONT_INCL_MAIN;
-
-util.o: ${DES}/util.c
-       ${CCRULE};
-
-error_msg.o: ${COMERR}/error_msg.c
-       ${CCRULE};
-
-et_name.o: ${COMERR}/et_name.c
-       ${CCRULE};
-
-com_err.o: ${COMERR}/com_err.c
-       ${CCRULE};
-
-casestrcpy.o: ${UTIL}/casestrcpy.c
-       ${CCRULE};
-
-base64.o: ${UTIL}/base64.c
-       ${CCRULE};
-
-syscall.o: ${SYS}/syscall.s
-       case "$(SYS_NAME)" in \
-            sun4x_5*) \
-               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
-               as -o syscall.o syscall.ss;             \
-               rm syscall.ss;;                         \
-        sgi_* | ppc_darwin* ) \
-                ${CC} ${CFLAGS} -c ${SYS}/syscall.s;;          \
-        alpha_dux?? ) \
-               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
-               ${AS} -o syscall.o syscall.i; \
-               rm -f syscall.ss syscall.i;; \
-        *fbsd* ) \
-               touch syscall.o ;; \
-        *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
-               as -o syscall.o syscall.ss;             \
-               rm syscall.ss;;                         \
-       esac
-
-rxstat.o: ${RXSTAT}/rxstat.c
-       ${CCRULE};
-
-rxstat.cs.o: ${RXSTAT}/rxstat.cs.c
-       ${CCRULE};
-
-rxstat.ss.o: ${RXSTAT}/rxstat.ss.c
-       ${CCRULE};
-
-rxstat.xdr.o: ${RXSTAT}/rxstat.xdr.c
-       ${CCRULE};
-
-afsint.cs.o: ${FSINT}/afsint.cs.c
-       ${CCRULE};
-
-afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CCRULE};
-
-afscbint.cs.o: ${FSINT}/afscbint.cs.c
-       ${CCRULE};
-
-afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
-       ${CCRULE};
-
-afsaux.o: ${FSINT}/afsaux.c
-       ${CCRULE};
-
-clean:
-       rm -f *.o libafsrpc*
-
-
-
-RM     = /bin/rm
-DESPAR =../../../DESLIB/dest/
-libstub:
-       echo "Installing libafsrpc stubs from ${DESPAR}:" `(csh -c 'cd ${DESPAR};pwd')`
-       ${RM} -f ${DESTDIR}lib/libafsrpc.a
-       ${INSTALL} ${DESPAR}lib/libafsrpc.a ${DESTDIR}lib/libafsrpc.a
diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
new file mode 100644 (file)
index 0000000..44cfdf2
--- /dev/null
@@ -0,0 +1,362 @@
+# 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
+
+# This is a pthread safe library containing rx, rxkad and des.
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CC=${MT_CC}
+INCLUDES = -I${SRCDIR}include -I.. -I../rx
+CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
+SFLAGS=-P -I${SRCDIR}include
+RX = ../rx
+CCRULE = ${CC} ${CFLAGS} -c $?
+RXKAD = ../rxkad
+RXSTAT = ../rxstat
+FSINT = ../fsint
+DES = ../des
+COMERR = ../comerr
+UTIL = ../util
+SYS = ../sys
+
+SYSOBJS =\
+       syscall.o
+
+UTILOBJS =\
+       casestrcpy.o \
+       base64.o
+
+COMERROBJS =\
+       error_msg.o \
+       et_name.o \
+       com_err.o
+
+XDROBJS =\
+       xdr_arrayn.o \
+       xdr_rx.o \
+       xdr_int64.o \
+       xdr_afsuuid.o \
+       AFS_component_version_number.o
+
+RXOBJS =\
+       rx_event.o \
+       rx_user.o \
+       rx_pthread.o \
+       rx.o \
+       rx_null.o \
+       rx_conncache.o \
+       rx_globals.o \
+       rx_getaddr.o \
+       rx_misc.o \
+       rx_packet.o \
+       rx_rdwr.o \
+       rx_trace.o \
+       rx_multi.o
+
+RXSTATOBJS =\
+       rxstat.o \
+       rxstat.ss.o \
+       rxstat.xdr.o \
+       rxstat.cs.o
+
+FSINTOBJS =\
+       afsint.cs.o \
+       afsint.xdr.o \
+       afscbint.cs.o \
+       afscbint.xdr.o \
+       afsaux.o
+
+RXKADOBJS =\
+       rxkad_client.o \
+       rxkad_server.o \
+       rxkad_common.o \
+       ticket.o \
+       fcrypt.o \
+       crypt_conn.o
+
+DESOBJS =\
+       des.o \
+       cbc_encrypt.o \
+       pcbc_encrypt.o \
+       cksum.o \
+       new_rnd_key.o \
+       key_sched.o \
+       debug_decl.o \
+       quad_cksum.o \
+       key_parity.o \
+       weak_key.o \
+       strng_to_key.o \
+       misco.o \
+       util.o
+
+LIBOBJS = \
+       ${RXOBJS} \
+       ${DESOBJS} \
+       ${XDROBJS} \
+       ${RXKADOBJS} \
+       ${COMERROBJS} \
+       ${UTILOBJS} \
+       ${SYSOBJS} \
+       ${CRYPT_OBJ} \
+       ${RXSTATOBJS} \
+       ${FSINTOBJS}
+
+system install: ${DESTDIR}lib/libafsrpc.a
+
+${DESTDIR}lib/libafsrpc.a: libafsrpc.a
+       ${INSTALL} libafsrpc.a ${DESTDIR}lib/libafsrpc.a
+
+libafsrpc.a: ${LIBOBJS}
+       rm -f libafsrpc.a
+       ${AR} -r libafsrpc.a ${LIBOBJS}
+       ${RANLIB} libafsrpc.a
+       case "${SYS_NAME}" in                                   \
+           rs_aix*)                                            \
+               ${AR} r libafsrpc.a ../sys/afsl.exp;;           \
+        esac
+
+rx_event.o: ${RX}/rx_event.c
+       ${CCRULE};
+
+rx_user.o: ${RX}/rx_user.c
+       ${CCRULE};
+
+rx_pthread.o: ${RX}/rx_pthread.c
+       ${CCRULE};
+
+rx.o: ${RX}/rx.c
+       ${CCRULE};
+
+rx_conncache.o: ${RX}/rx_conncache.c
+       ${CCRULE};
+
+rx_null.o: ${RX}/rx_null.c
+       ${CCRULE};
+
+rx_globals.o: ${RX}/rx_globals.c
+       ${CCRULE};
+
+rx_getaddr.o: ${RX}/rx_getaddr.c
+       ${CCRULE};
+
+rx_misc.o: ${RX}/rx_misc.c
+       ${CCRULE};
+
+rx_packet.o: ${RX}/rx_packet.c
+       ${CCRULE};
+
+rx_rdwr.o: ${RX}/rx_rdwr.c
+       ${CCRULE};
+
+rx_trace.o: ${RX}/rx_trace.c
+       ${CCRULE};
+
+rx_multi.o: ${RX}/rx_multi.c
+       ${CCRULE};
+
+rxkad_client.o: ${RXKAD}/rxkad_client.c
+       ${CCRULE};
+
+rxkad_server.o: ${RXKAD}/rxkad_server.c
+       ${CCRULE};
+
+rxkad_common.o: ${RXKAD}/rxkad_common.c
+       ${CCRULE};
+
+ticket.o: ${RXKAD}/ticket.c
+       ${CCRULE};
+
+fcrypt.o: ${RXKAD}/fcrypt.c
+       ${CCRULE};
+
+crypt_conn.o: ${RXKAD}/crypt_conn.c
+       ${CCRULE};
+
+AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
+       ${CCRULE};
+
+xdr.o: ${RX}/xdr.c
+       ${CCRULE};
+
+xdr_int64.o: ${RX}/xdr_int64.c
+       ${CCRULE};
+
+xdr_array.o: ${RX}/xdr_array.c
+       ${CCRULE};
+
+xdr_arrayn.o: ${RX}/xdr_arrayn.c
+       ${CCRULE};
+
+xdr_float.o: ${RX}/xdr_float.c
+       ${CCRULE};
+
+xdr_mem.o: ${RX}/xdr_mem.c
+       ${CCRULE};
+
+xdr_rec.o: ${RX}/xdr_rec.c
+       ${CCRULE};
+
+xdr_refernce.o: ${RX}/xdr_refernce.c
+       ${CCRULE};
+
+xdr_rx.o: ${RX}/xdr_rx.c
+       ${CCRULE};
+
+xdr_update.o: ${RX}/xdr_update.c
+       ${CCRULE};
+
+xdr_afsuuid.o: ${RX}/xdr_afsuuid.c
+       ${CCRULE};
+
+# Note that the special case statement for compiling des.c is present
+# simply to work around a compiler bug on HP-UX 11.0.  The symptom of
+# the problem is that linking the pthread fileserver fails with messages
+# such as
+#
+#   pxdb internal warning: cu[84]: SLT_SRCFILE[411] out of synch
+#   Please contact your HP Support representative
+#   pxdb internal warning: cu[84]: SLT_SRCFILE[442] out of synch
+#   pxdb internal warning: cu[84]: SLT_SRCFILE[450] out of synch
+#   pxdb internal warning: cu[84]: SLT_SRCFILE[529] out of synch
+#   pxdb internal warning: cu[84]: SLT_SRCFILE[544] out of synch
+#   ...
+#   pxdb32: internal error. File won't be debuggable (still a valid executable)
+#   *** Error exit code 10
+#
+# The problematic version of pxdb is:
+#
+#   $ what /opt/langtools/bin/pxdb32
+#   /opt/langtools/bin/pxdb32:
+#           HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision$
+#
+# The problem occurs when -g and -O are both used when compiling des.c.
+# The simplest way to work around the problem is to leave out either -g or -O.
+# Since des.c is relatively stable I've chosen to eliminate -g rather
+# than take any hit in performance.
+
+des.o: ${DES}/des.c
+       set -x; \
+       case ${SYS_NAME} in \
+       hp_ux11*) \
+               set X `echo ${CCRULE} | sed s/-g//`; shift; \
+               "$$@" \
+               ;; \
+       *) \
+               ${CCRULE} \
+               ;; \
+       esac
+
+crypt.o: ${DES}/crypt.c
+       ${CCRULE};
+
+cbc_encrypt.o: ${DES}/cbc_encrypt.c
+       ${CCRULE};
+
+pcbc_encrypt.o: ${DES}/pcbc_encrypt.c
+       ${CCRULE};
+
+cksum.o: ${DES}/cksum.c
+       ${CCRULE};
+
+new_rnd_key.o: ${DES}/new_rnd_key.c
+       ${CCRULE};
+
+key_sched.o: ${DES}/key_sched.c
+       ${CCRULE};
+
+debug_decl.o: ${DES}/debug_decl.c
+       ${CCRULE};
+
+quad_cksum.o: ${DES}/quad_cksum.c
+       ${CCRULE};
+
+key_parity.o: ${DES}/key_parity.c
+       ${CCRULE};
+
+weak_key.o: ${DES}/weak_key.c
+       ${CCRULE};
+
+strng_to_key.o: ${DES}/strng_to_key.c
+       ${CCRULE};
+
+misco.o: ${DES}/misco.c
+       ${CCRULE} -DDONT_INCL_MAIN;
+
+util.o: ${DES}/util.c
+       ${CCRULE};
+
+error_msg.o: ${COMERR}/error_msg.c
+       ${CCRULE};
+
+et_name.o: ${COMERR}/et_name.c
+       ${CCRULE};
+
+com_err.o: ${COMERR}/com_err.c
+       ${CCRULE};
+
+casestrcpy.o: ${UTIL}/casestrcpy.c
+       ${CCRULE};
+
+base64.o: ${UTIL}/base64.c
+       ${CCRULE};
+
+syscall.o: ${SYS}/syscall.s
+       case "$(SYS_NAME)" in \
+            sun4x_5*) \
+               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               as -o syscall.o syscall.ss;             \
+               rm syscall.ss;;                         \
+        sgi_* | ppc_darwin* ) \
+                ${CC} ${CFLAGS} -c ${SYS}/syscall.s;;          \
+        alpha_dux?? ) \
+               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
+               ${AS} -o syscall.o syscall.i; \
+               rm -f syscall.ss syscall.i;; \
+        *fbsd* ) \
+               touch syscall.o ;; \
+        *) \
+               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               as -o syscall.o syscall.ss;             \
+               rm syscall.ss;;                         \
+       esac
+
+rxstat.o: ${RXSTAT}/rxstat.c
+       ${CCRULE};
+
+rxstat.cs.o: ${RXSTAT}/rxstat.cs.c
+       ${CCRULE};
+
+rxstat.ss.o: ${RXSTAT}/rxstat.ss.c
+       ${CCRULE};
+
+rxstat.xdr.o: ${RXSTAT}/rxstat.xdr.c
+       ${CCRULE};
+
+afsint.cs.o: ${FSINT}/afsint.cs.c
+       ${CCRULE};
+
+afsint.xdr.o: ${FSINT}/afsint.xdr.c
+       ${CCRULE};
+
+afscbint.cs.o: ${FSINT}/afscbint.cs.c
+       ${CCRULE};
+
+afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
+       ${CCRULE};
+
+afsaux.o: ${FSINT}/afsaux.c
+       ${CCRULE};
+
+clean:
+       rm -f *.o libafsrpc*
diff --git a/src/libuafs/MakefileProto.AIX b/src/libuafs/MakefileProto.AIX
deleted file mode 100644 (file)
index 0ee2219..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-
-# MakefileProto for AIX systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-DEFINES= -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-AR = /usr/bin/ar
-ARFLAGS = -r
-RANLIB = /bin/ranlib
-CC = xlc_r
-DEF_LIBPATH=/usr/lib/threads:/usr/lib:/lib
-EXPFILE=../nsafslib.exp 
-LD_FLAGS=-bM:SRE -bE:$(EXPFILE) -berok -bnoentry -blibpath:$(DEF_LIBPATH)
-
-TEST_CFLAGS=-DAFS_PTHREAD_ENV -Daix -DAFS_AIX_ENV
-TEST_LDFLAGS=
-TEST_LIBS=-lm -lpthreads
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.a
-LIBAFSWEBKRB = nsafs.krb.a
-
-OPTF=-O
-WEBOPTS = -I../nsapi -qarch=com -DNETSCAPE_NSAPI -DAIX -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(AFS)/afsl.exp
-       $(RANLIB) libuafs.a
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a
-       -rm -f $(LIBAFSWEB)
-       ld -o $(LIBAFSWEB) $(LD_FLAGS) $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
-
-##
-## Use Kerberos authentication instead of kaservers
-##
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a 
-       -rm -f $(LIBAFSWEBKRB)
-       ld -o $(LIBAFSWEBKRB) $(LD_FLAGS) $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in
new file mode 100644 (file)
index 0000000..ad19125
--- /dev/null
@@ -0,0 +1,96 @@
+# 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
+
+# MakefileProto for AIX systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+DEFINES= -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+AR = /usr/bin/ar
+ARFLAGS = -r
+RANLIB = /bin/ranlib
+CC = xlc_r
+DEF_LIBPATH=/usr/lib/threads:/usr/lib:/lib
+EXPFILE=../nsafslib.exp 
+LD_FLAGS=-bM:SRE -bE:$(EXPFILE) -berok -bnoentry -blibpath:$(DEF_LIBPATH)
+
+TEST_CFLAGS=-DAFS_PTHREAD_ENV -Daix -DAFS_AIX_ENV
+TEST_LDFLAGS=
+TEST_LIBS=-lm -lpthreads
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.a
+LIBAFSWEBKRB = nsafs.krb.a
+
+OPTF=-O
+WEBOPTS = -I../nsapi -qarch=com -DNETSCAPE_NSAPI -DAIX -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB)
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(AFS)/afsl.exp
+       $(RANLIB) libuafs.a
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a
+       -rm -f $(LIBAFSWEB)
+       ld -o $(LIBAFSWEB) $(LD_FLAGS) $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
+
+##
+## Use Kerberos authentication instead of kaservers
+##
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a 
+       -rm -f $(LIBAFSWEBKRB)
+       ld -o $(LIBAFSWEBKRB) $(LD_FLAGS) $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
diff --git a/src/libuafs/MakefileProto.DARWIN b/src/libuafs/MakefileProto.DARWIN
deleted file mode 100644 (file)
index f507241..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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
-
-# MakefileProto for Solaris systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-CC = cc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
-OPTF=-O
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV
-TEST_LDFLAGS=
-TEST_LIBS=
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}; \
-       ranlib $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in
new file mode 100644 (file)
index 0000000..636a0a8
--- /dev/null
@@ -0,0 +1,87 @@
+# 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
+
+# MakefileProto for Solaris systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+CC = cc
+DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+KOPTS=
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
+OPTF=-O
+# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV
+TEST_LDFLAGS=
+TEST_LIBS=
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}; \
+       ranlib $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.DUX b/src/libuafs/MakefileProto.DUX
deleted file mode 100644 (file)
index 525700c..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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
-
-# MakefileProto for Solaris systems
-#
-DBUG=-O
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-DEFINES=-DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE -D_NO_PROTO -DOSF
-KOPTS=
-DBUG=
-OPTF=-O
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF
-TEST_LDFLAGS=-pthread
-TEST_LIBS=-lm
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-       ranlib $(LIBUAFS)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -all -shared -expect_unresolved "*" $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -all -shared -expect_unresolved "*" $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in
new file mode 100644 (file)
index 0000000..fd0510c
--- /dev/null
@@ -0,0 +1,89 @@
+# 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
+
+# MakefileProto for Solaris systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+DBUG=-O
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+DEFINES=-DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE -D_NO_PROTO -DOSF
+KOPTS=
+DBUG=
+OPTF=-O
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
+WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF
+TEST_LDFLAGS=-pthread
+TEST_LIBS=-lm
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB)
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+       ranlib $(LIBUAFS)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -all -shared -expect_unresolved "*" $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -all -shared -expect_unresolved "*" $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.FBSD b/src/libuafs/MakefileProto.FBSD
deleted file mode 100644 (file)
index 5086f2d..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
-# 
-# MakefileProto for Solaris systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-CC = gcc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-OPTF=-O
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD40_ENV
-TEST_LDFLAGS=
-TEST_LIBS=
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
new file mode 100644 (file)
index 0000000..924f142
--- /dev/null
@@ -0,0 +1,80 @@
+#/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
+# 
+# MakefileProto for Solaris systems
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+CC = gcc
+DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+KOPTS=
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+OPTF=-O
+# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD40_ENV
+TEST_LDFLAGS=
+TEST_LIBS=
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.HPUX b/src/libuafs/MakefileProto.HPUX
deleted file mode 100644 (file)
index 61aea37..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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
-
-# MakefileProto for HP-UX systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-CC = /opt/ansic/bin/cc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-OPTF=-O
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV
-TEST_LDFLAGS=
-TEST_LIBS=-lnsl -lm -lpthread -ldld -lc
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in
new file mode 100644 (file)
index 0000000..0915f81
--- /dev/null
@@ -0,0 +1,86 @@
+# 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
+
+# MakefileProto for HP-UX systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+CC = /opt/ansic/bin/cc
+DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+OPTF=-O
+WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV
+TEST_LDFLAGS=
+TEST_LIBS=-lnsl -lm -lpthread -ldld -lc
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB)
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.IRIX b/src/libuafs/MakefileProto.IRIX
deleted file mode 100644 (file)
index 039fee9..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
-
-# MakefileProto for Solaris systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-CC = cc
-DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-OPTF=-O
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV -Dirix -DAFS_SGI_ENV
-TEST_LDFLAGS=-ignore_minor
-TEST_LIBS=-lpthread -lm
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -shared $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in
new file mode 100644 (file)
index 0000000..993e67a
--- /dev/null
@@ -0,0 +1,85 @@
+# 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
+
+# MakefileProto for Solaris systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+CC = cc
+DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+OPTF=-O
+WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV -Dirix -DAFS_SGI_ENV
+TEST_LDFLAGS=-ignore_minor
+TEST_LIBS=-lpthread -lm
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB)
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -shared $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.LINUX b/src/libuafs/MakefileProto.LINUX
deleted file mode 100644 (file)
index 02ac4d7..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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
-
-# MakefileProto for Solaris systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-CC = gcc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-OPTF=-O
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV
-TEST_LDFLAGS=
-TEST_LIBS=-lpthread
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in
new file mode 100644 (file)
index 0000000..c76ba65
--- /dev/null
@@ -0,0 +1,86 @@
+# 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
+
+# MakefileProto for Solaris systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+CC = gcc
+DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+KOPTS=
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+OPTF=-O
+# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV
+TEST_LDFLAGS=
+TEST_LIBS=-lpthread
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.SOLARIS b/src/libuafs/MakefileProto.SOLARIS
deleted file mode 100644 (file)
index 0b59c2b..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
-
-# MakefileProto for Solaris systems
-#
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-# System specific build commands and flags
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
-OPTF=-O
-WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-
-TEST_CFLAGS=-mt -DAFS_PTHREAD_ENV -Dsolaris -DAFS_SUN5_ENV
-TEST_LDFLAGS=
-TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl
-
-LIBUAFS = libuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
-
-include Makefile.common
-
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
-$(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
-       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
-       ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
-       ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in
new file mode 100644 (file)
index 0000000..f413019
--- /dev/null
@@ -0,0 +1,85 @@
+# 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
+
+# MakefileProto for Solaris systems
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+# System specific build commands and flags
+DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+OPTF=-O
+WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
+
+TEST_CFLAGS=-mt -DAFS_PTHREAD_ENV -Dsolaris -DAFS_SUN5_ENV
+TEST_LDFLAGS=
+TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl
+
+LIBUAFS = libuafs.a
+LIBAFSWEB = nsafs.so
+LIBAFSWEBKRB = nsafs.krb.so
+
+include Makefile.common
+
+setup_common:
+       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
+       -ln -s /usr/include/sys h
+       -ln -s /usr/include/net net
+       -ln -s /usr/include/netinet netinet
+       -ln -s /usr/include/rpc rpc
+       -ln -s /usr/include/sys sys
+       -ln -s /usr/include/nfs nfs
+       -ln -s /usr/include/inet inet
+       -ln -s /usr/include/ufs ufs
+       -ln -s $(NS_INCL) nsapi
+
+setup_uafs: setup_common
+       set UAFS; $(MKDIR_IF_NEEDED)
+       -rm -f UAFS/Makefile UAFS/Makefile.common
+       ln -s ../Makefile UAFS/Makefile
+       ln -s ../Makefile.common UAFS/Makefile.common
+
+setup_nsafs: setup_common
+       set AFSWEB; $(MKDIR_IF_NEEDED)
+       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
+       ln -s ../Makefile AFSWEB/Makefile
+       ln -s ../Makefile.common AFSWEB/Makefile.common
+
+UAFS/$(LIBUAFS): setup_uafs
+       cd UAFS; \
+       $(MAKE) $(LIBUAFS)
+
+AFSWEB/$(LIBAFSWEB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEB)
+
+AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
+       cd AFSWEB; \
+       $(MAKE) $(LIBAFSWEBKRB)
+
+# Below this line are targets when in the COMMON directory:
+
+$(LIBUAFS): $(UAFSOBJ)
+       -rm -f $(LIBUAFS)
+       $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
+
+$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
+       -rm -f $(LIBAFSWEB)
+       ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+
+
+$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
+       -rm -f $(LIBAFSWEBKRB)
+       ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/log/Makefile b/src/log/Makefile
deleted file mode 100644 (file)
index 270c142..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-
-COMPONENT=log
-include ../config/Makefile.${SYS_NAME}
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${DESTDIR}include/afs 
-utilib=${DESTDIR}lib/afs/util.a
-
-CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}
-
-PROGRAMS=      unlog tokens tokens.krb kseal
-
-INCLS=${SRCDIR}include/afs/auth.h ${SRCDIR}include/rx/rx.h \
-${SRCDIR}include/rx/xdr.h ${SRCDIR}include/des.h ${SRCDIR}include/rx/rxkad.h \
-${SRCDIR}include/afs/cellconfig.h
-
-LIBRARIES=     ${SRCDIR}lib/afs/libauth.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/util.a
-KLIBRARIES=    ${SRCDIR}lib/afs/libauth.krb.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/util.a
-
-include ../config/Makefile.version
-
-# top-level options
-
-all:   ${PROGRAMS}
-
-install:       all
-       ${INSTALL} -s unlog tokens tokens.krb ${DESTDIR}bin
-       ${INSTALL} -s tokens tokens.krb ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} -s kseal ${DESTDIR}etc
-
-lint:  log.c passwd.c unlog.c testlog.c
-       lint  ${INCDIRS} log.c 
-       lint  ${INCDIRS} unlog.c 
-       lint  ${INCDIRS} passwd.c
-
-clean: 
-       rm -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb
-
-beancount:
-       wc -l log.c passwd.c unlog.c 
-
-# programs
-
-kseal: kseal.o ${LIBRARIES}
-       ${CC} -o kseal kseal.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
-
-log: log.o ${LIBRARIES}
-       ${CC} -o log log.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
-
-unlog: unlog.o ${LIBRARIES}
-       ${CC} -o unlog unlog.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
-
-passwd:        passwd.o ${LIBRARIES}
-       ${CC} -o passwd passwd.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
-
-tokens: tokens.o ${LIBRARIES}
-       ${CC} -o tokens tokens.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
-
-tokens.krb: tokens.o ${KLIBRARIES}
-       ${CC} -o tokens.krb tokens.o ${KLIBRARIES} ${XLIBS} ${CFLAGS}
-
-# objects
-
-kseal.o:               kseal.c ${INCLS} AFS_component_version_number.c
-unlog.o:               unlog.c AFS_component_version_number.c
-tokens.o:              tokens.c ${SRCDIR}include/rx/xdr.h AFS_component_version_number.c
-#log.o:                log.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h
-#passwd.o:     passwd.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h ${SRCDIR}include/r/r.h
-
-test:
-       cd test; $(MAKE)
diff --git a/src/log/Makefile.in b/src/log/Makefile.in
new file mode 100644 (file)
index 0000000..09204ec
--- /dev/null
@@ -0,0 +1,92 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.${SYS_NAME}
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${DESTDIR}include/afs 
+
+CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}
+
+PROGRAMS=      unlog tokens tokens.krb kseal
+
+INCLS=${SRCDIR}include/afs/auth.h ${SRCDIR}include/rx/rx.h \
+${SRCDIR}include/rx/xdr.h ${SRCDIR}include/des.h ${SRCDIR}include/rx/rxkad.h \
+${SRCDIR}include/afs/cellconfig.h
+
+LIBRARIES=     ${SRCDIR}lib/afs/libauth.a \
+               ${SRCDIR}lib/librxkad.a \
+               ${SRCDIR}lib/libdes.a \
+               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
+               ${SRCDIR}lib/afs/libsys.a \
+               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
+               ${SRCDIR}lib/afs/util.a
+KLIBRARIES=    ${SRCDIR}lib/afs/libauth.krb.a \
+               ${SRCDIR}lib/librxkad.a \
+               ${SRCDIR}lib/libdes.a \
+               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
+               ${SRCDIR}lib/afs/libsys.a \
+               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
+               ${SRCDIR}lib/afs/util.a
+
+include ../config/Makefile.version
+
+# top-level options
+
+all:   ${PROGRAMS}
+
+install:       all
+       ${INSTALL} -s unlog tokens tokens.krb ${DESTDIR}bin
+       ${INSTALL} -s tokens tokens.krb ${DESTDIR}root.server/usr/afs/bin
+       ${INSTALL} -s kseal ${DESTDIR}etc
+
+lint:  log.c passwd.c unlog.c testlog.c
+       lint  ${INCDIRS} log.c 
+       lint  ${INCDIRS} unlog.c 
+       lint  ${INCDIRS} passwd.c
+
+clean: 
+       rm -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb
+
+beancount:
+       wc -l log.c passwd.c unlog.c 
+
+# programs
+
+kseal: kseal.o ${LIBRARIES}
+       ${CC} -o kseal kseal.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
+
+log: log.o ${LIBRARIES}
+       ${CC} -o log log.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
+
+unlog: unlog.o ${LIBRARIES}
+       ${CC} -o unlog unlog.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
+
+passwd:        passwd.o ${LIBRARIES}
+       ${CC} -o passwd passwd.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
+
+tokens: tokens.o ${LIBRARIES}
+       ${CC} -o tokens tokens.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
+
+tokens.krb: tokens.o ${KLIBRARIES}
+       ${CC} -o tokens.krb tokens.o ${KLIBRARIES} ${XLIBS} ${CFLAGS}
+
+# objects
+
+kseal.o:               kseal.c ${INCLS} AFS_component_version_number.c
+unlog.o:               unlog.c AFS_component_version_number.c
+tokens.o:              tokens.c ${SRCDIR}include/rx/xdr.h AFS_component_version_number.c
+#log.o:                log.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h
+#passwd.o:     passwd.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h ${SRCDIR}include/r/r.h
+
+test:
+       cd test; $(MAKE)
diff --git a/src/log/test/Makefile b/src/log/test/Makefile
deleted file mode 100644 (file)
index 16ec358..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include -I${DESTDIR}include/afs -I${BACKDIR}include/afs
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd ${utilib} ${XLIBS}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-# top-level options
-system all test: testlog gettoktest
-
-lint:  
-       lint  ${INCDIRS} testlog.c
-       lint  ${INCDIRS} gettoktest.c
-
-clean: 
-       rm -f *.o testlog gettoktest core
-
-testlog: testlog.o 
-       ${CC} -o testlog testlog.o ${CFLAGS}
-
-gettoktest: gettoktest.o 
-       ${CC} -o gettoktest gettoktest.o ${CFLAGS}
-
diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in
new file mode 100644 (file)
index 0000000..aa99af0
--- /dev/null
@@ -0,0 +1,39 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include -I${DESTDIR}include/afs -I${BACKDIR}include/afs
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS}
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+# top-level options
+system all test: testlog gettoktest
+
+lint:  
+       lint  ${INCDIRS} testlog.c
+       lint  ${INCDIRS} gettoktest.c
+
+clean: 
+       rm -f *.o testlog gettoktest core
+
+testlog: testlog.o 
+       ${CC} -o testlog testlog.o ${CFLAGS}
+
+gettoktest: gettoktest.o 
+       ${CC} -o gettoktest gettoktest.o ${CFLAGS}
+
diff --git a/src/login/Makefile b/src/login/Makefile
deleted file mode 100644 (file)
index c094a51..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile 5.1 (Berkeley) 10/18/88
-#
-
-COMPONENT=login
-include ../config/Makefile.${SYS_NAME}
-
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include -I/usr/include -I/usr/include/sys
-CFLAGS=        -g ${XCFLAGS} ${INCLUDES}
-LIBC=  /lib/libc.a
-SRCS=  login.c 
-OBJS=   login.o setenv.o getenv.o libutil.a
-KOBJS=  login.krb.o setenv.o getenv.o libutil.a
-LIBS=   ${AFSLIBS} 
-KLIBS=   ${KAFSLIBS}
-SLIBS=   ${AFSLIBS} ${LIBC}
-SKLIBS=   ${KAFSLIBS} ${LIBC}
-MAN=
-UTILOBJS = util_login.o util_logout.o util_logwtmp.o
-
-include ../config/Makefile.version
-
-all: login login.krb
-
-login: ${OBJS} ${LIBS}
-       case ${SYS_NAME} in \
-       sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\
-       *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
-       esac ;
-
-login.krb: ${KOBJS} ${KLIBS}
-       case ${SYS_NAME} in \
-       sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\
-       *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\
-       esac ;
-
-libutil.a : ${UTILOBJS}
-       @rm -f $@
-       ar cru $@ ${UTILOBJS}
-       ${RANLIB} $@
-
-login.o: login.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c login.c
-
-login.krb.o: login.c
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c login.c
-       mv login.o login.krb.o
-
-clean:
-       rm -f ${OBJS} core login AFS_component_version_number.c
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN} all
-       ${INSTALL} -s login ${DESTDIR}bin/login
-       ${INSTALL} -s login.krb ${DESTDIR}bin/login.krb
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
-
-system: install
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
new file mode 100644 (file)
index 0000000..86c39b8
--- /dev/null
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation, advertising
+# materials, and other materials related to such redistribution and
+# use acknowledge that the software was developed by the University
+# of California, Berkeley.  The name of the University may not be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
+# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE.
+#
+# @(#)Makefile 5.1 (Berkeley) 10/18/88
+#
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.${SYS_NAME}
+
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include -I/usr/include -I/usr/include/sys
+CFLAGS=        -g ${XCFLAGS} ${INCLUDES}
+LIBC=  /lib/libc.a
+SRCS=  login.c 
+OBJS=   login.o setenv.o getenv.o libutil.a
+KOBJS=  login.krb.o setenv.o getenv.o libutil.a
+LIBS=   ${AFSLIBS} 
+KLIBS=   ${KAFSLIBS}
+SLIBS=   ${AFSLIBS} ${LIBC}
+SKLIBS=   ${KAFSLIBS} ${LIBC}
+MAN=
+UTILOBJS = util_login.o util_logout.o util_logwtmp.o
+
+include ../config/Makefile.version
+
+all: login login.krb
+
+login: ${OBJS} ${LIBS}
+       case ${SYS_NAME} in \
+       sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\
+       *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
+       esac ;
+
+login.krb: ${KOBJS} ${KLIBS}
+       case ${SYS_NAME} in \
+       sun4x_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\
+       *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\
+       esac ;
+
+libutil.a : ${UTILOBJS}
+       @rm -f $@
+       ar cru $@ ${UTILOBJS}
+       ${RANLIB} $@
+
+login.o: login.c AFS_component_version_number.c
+       ${CC} ${CFLAGS} -c login.c
+
+login.krb.o: login.c
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c login.c
+       mv login.o login.krb.o
+
+clean:
+       rm -f ${OBJS} core login AFS_component_version_number.c
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep -p ${CFLAGS} ${SRCS}
+
+install: ${MAN} all
+       ${INSTALL} -s login ${DESTDIR}bin/login
+       ${INSTALL} -s login.krb ${DESTDIR}bin/login.krb
+
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
+
+system: install
diff --git a/src/lwp/Makefile b/src/lwp/Makefile
deleted file mode 100644 (file)
index 4e01dd1..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=lwp
-include ../config/Makefile.${SYS_NAME}
-
-# this is important code, so let's optimize it.  The optimizer aggravates any
-# subtle bugs that may have been introduced in process.s, be warned!
-OPTIMIZE=${LWP_OPTMZ}
-
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-include ../config/Makefile.version
-
-LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
-       waitkey.o threadname.o AFS_component_version_number.o
-LIBTOBJS=tlwp.o process.o lock.o tiomgr.o timer.o fasttime.o preempt.o AFS_component_version_number.o pthread.o threadname.o
-
-noversion: install
-
-#
-#      The lwp library
-#
-liblwp.a       : ${LIBOBJS}
-               -rm -f liblwp.a
-               $(AR) rv liblwp.a ${LIBOBJS}
-               $(RANLIB) liblwp.a
-
-libtlwp.a      : ${LIBTOBJS}
-               -rm -f libtlwp.a
-               $(AR) rv libtlwp.a ${LIBTOBJS}
-               $(RANLIB) libtlwp.a
-
-tlwp.o: lwp.c lwp.h
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c lwp.c
-       mv lwp.o tlwp.o
-
-tiomgr.o: iomgr.c lwp.h
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c iomgr.c
-       mv iomgr.o tiomgr.o
-
-pthread.o      : pthread.c
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c pthread.c
-
-process.s:
-       # This is required so sgi_64+ does not try to build this file.
-       echo Nothing to be done for process.s
-
-process.o      : process.s process.c
-                       case "$(SYS_NAME)" in \
-                               pmax_he1) \
-                                       $(CC) -c -I${SRCDIR}include process.s;; \
-                               sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} process.ss -o process.o; \
-                                       rm process.ss ;; \
-                               sgi_5* ) \
-                                       $(CC) -c -I${SRCDIR}include -KPIC -G0  process.s;; \
-                               sgi_61 | sgi_62 | sgi_63 ) \
-                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include -KPIC -G0  process.s;; \
-                               s390*) \
-                                       /lib/cpp -P -I${SRCDIR}include process.s >process.ss; \
-                                       ${AS} -ahlns process.ss -o process.o >process.lst; \
-                                       rm process.ss ;; \
-                               ppc_darwin* ) \
-                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include process.s;; \
-                               i386_fbsd* ) \
-                                       /usr/bin/cpp -P process.fbsd.s > process.ss; \
-                                       ${AS} -o process.o process.ss; \
-                                       rm process.ss ;; \
-                               hp* | *_linux* | sgi_64 | sgi_65 ) \
-                                       ${CC} ${CFLAGS} -c process.c;; \
-                               ncrx86_*) \
-                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} -o process.o process.ss; \
-                                       rm process.ss ;; \
-                               alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-                                       ${AS} -v  -P -DOSF -I${SRCDIR}include -DASSEMBLER process.s; \
-                                       ${AS} -v process.i -o process.o;; \
-                               hp_ux110 ) \
-                                       ${CC} ${CFLAGS} -c process.c;; \
-                               *) \
-                                       /lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} process.ss -o process.o; \
-                                       rm process.ss ;; \
-                       esac
-
-iomgr.o                : iomgr.c lwp.h timer.h
-               ${CC} -c ${CFLAGS}  iomgr.c
-
-preempt.o      : preempt.c lwp.h preempt.h
-lwp.o          : lwp.c lwp.h
-                       case "$(SYS_NAME)" in \
-                               rs_aix*) \
-                                       $(CC) -I${TOP_SRCDIR}/config -I${SRCDIR}include -c lwp.c;; \
-                               *)  \
-                                       $(CC) ${CFLAGS} -c lwp.c;; \
-                       esac
-lock.o         : lock.c lock.h lwp.h
-timer.o                : timer.c
-fasttime.o     : fasttime.c
-threadname.o    : threadname.c
-
-exc_handling.o : exc_handling.c
-
-#
-# tests
-#
-rw: rw.o liblwp.a DEST/lib/afs/util.a
-       ${CC} ${CFLAGS} -o rw rw.o liblwp.a DEST/lib/afs/util.a
-
-rw.o: rw.c
-       ${CC} ${CFLAGS} -c rw.c
-
-
-#
-#      Installation
-#
-all: system
-system:        install
-
-kinstall ukinstall webinstall:
-       @echo No kernel source here.
-
-install: liblwp.a #libtlwp.a
-               ${INSTALL} liblwp.a ${DESTDIR}lib
-               ${INSTALL} *.h ${DESTDIR}include
-               case ${SYS_NAME} in \
-                   sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5?) \
-                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
-                    * ) \
-                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
-               esac
-clean:
-       rm -f *.o *.a core AFS_component_version_number.c
-
-beancount:
-       wc -l *.[ch]
-
-includes:
-       ${INSTALL} *.h ${DESTDIR}include
diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
new file mode 100644 (file)
index 0000000..604cdc4
--- /dev/null
@@ -0,0 +1,151 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+# this is important code, so let's optimize it.  The optimizer aggravates any
+# subtle bugs that may have been introduced in process.s, be warned!
+OPTIMIZE=${LWP_OPTMZ}
+
+CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+include ../config/Makefile.version
+
+LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
+       waitkey.o threadname.o AFS_component_version_number.o
+LIBTOBJS=tlwp.o process.o lock.o tiomgr.o timer.o fasttime.o preempt.o AFS_component_version_number.o pthread.o threadname.o
+
+noversion: install
+
+#
+#      The lwp library
+#
+liblwp.a       : ${LIBOBJS}
+               -rm -f liblwp.a
+               $(AR) rv liblwp.a ${LIBOBJS}
+               $(RANLIB) liblwp.a
+
+libtlwp.a      : ${LIBTOBJS}
+               -rm -f libtlwp.a
+               $(AR) rv libtlwp.a ${LIBTOBJS}
+               $(RANLIB) libtlwp.a
+
+tlwp.o: lwp.c lwp.h
+       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c lwp.c
+       mv lwp.o tlwp.o
+
+tiomgr.o: iomgr.c lwp.h
+       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c iomgr.c
+       mv iomgr.o tiomgr.o
+
+pthread.o      : pthread.c
+       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c pthread.c
+
+process.s:
+       # This is required so sgi_64+ does not try to build this file.
+       echo Nothing to be done for process.s
+
+process.o      : process.s process.c
+                       case "$(SYS_NAME)" in \
+                               pmax_he1) \
+                                       $(CC) -c -I${SRCDIR}include process.s;; \
+                               sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
+                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
+                                       ${AS} process.ss -o process.o; \
+                                       rm process.ss ;; \
+                               sgi_5* ) \
+                                       $(CC) -c -I${SRCDIR}include -KPIC -G0  process.s;; \
+                               sgi_61 | sgi_62 | sgi_63 ) \
+                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include -KPIC -G0  process.s;; \
+                               s390*) \
+                                       /lib/cpp -P -I${SRCDIR}include process.s >process.ss; \
+                                       ${AS} -ahlns process.ss -o process.o >process.lst; \
+                                       rm process.ss ;; \
+                               ppc_darwin* ) \
+                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include process.s;; \
+                               i386_fbsd* ) \
+                                       /usr/bin/cpp -P process.fbsd.s > process.ss; \
+                                       ${AS} -o process.o process.ss; \
+                                       rm process.ss ;; \
+                               hp* | *_linux* | sgi_64 | sgi_65 ) \
+                                       ${CC} ${CFLAGS} -c process.c;; \
+                               ncrx86_*) \
+                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
+                                       ${AS} -o process.o process.ss; \
+                                       rm process.ss ;; \
+                               alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
+                                       ${AS} -v  -P -DOSF -I${SRCDIR}include -DASSEMBLER process.s; \
+                                       ${AS} -v process.i -o process.o;; \
+                               hp_ux110 ) \
+                                       ${CC} ${CFLAGS} -c process.c;; \
+                               *) \
+                                       /lib/cpp -P -I${SRCDIR}include process.s process.ss; \
+                                       ${AS} process.ss -o process.o; \
+                                       rm process.ss ;; \
+                       esac
+
+iomgr.o                : iomgr.c lwp.h timer.h
+               ${CC} -c ${CFLAGS}  iomgr.c
+
+preempt.o      : preempt.c lwp.h preempt.h
+lwp.o          : lwp.c lwp.h
+                       case "$(SYS_NAME)" in \
+                               rs_aix*) \
+                                       $(CC) -I${TOP_SRCDIR}/config -I${SRCDIR}include -c lwp.c;; \
+                               *)  \
+                                       $(CC) ${CFLAGS} -c lwp.c;; \
+                       esac
+lock.o         : lock.c lock.h lwp.h
+timer.o                : timer.c
+fasttime.o     : fasttime.c
+threadname.o    : threadname.c
+
+exc_handling.o : exc_handling.c
+
+#
+# tests
+#
+rw: rw.o liblwp.a $(DESTDIR)/lib/afs/util.a
+       ${CC} ${CFLAGS} -o rw rw.o liblwp.a $(DESTDIR)/lib/afs/util.a
+
+rw.o: rw.c
+       ${CC} ${CFLAGS} -c rw.c
+
+
+#
+#      Installation
+#
+all: system
+system:        install
+
+kinstall ukinstall webinstall:
+       @echo No kernel source here.
+
+install: liblwp.a #libtlwp.a
+               ${INSTALL} liblwp.a ${DESTDIR}lib
+               ${INSTALL} *.h ${DESTDIR}include
+               case ${SYS_NAME} in \
+                   sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5?) \
+                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
+                    * ) \
+                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
+               esac
+clean:
+       rm -f *.o *.a core AFS_component_version_number.c
+
+beancount:
+       wc -l *.[ch]
+
+includes:
+       ${INSTALL} *.h ${DESTDIR}include
diff --git a/src/lwp/test/Makefile b/src/lwp/test/Makefile
deleted file mode 100644 (file)
index b37982a..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-OPTIMIZE= -g
-
-INCDIRS= -I.. -I${DESTDIR}include 
-LIBS= ../liblwp.a
-
-include ../../config/Makefile.${SYS_NAME}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
-
-system noversion: test
-
-test:          test.c liblwp.a
-               ${CC} -p ${CFLAGS} test.c -o test ${LIBS}
-
-testlwp.o      : testlwp.c
-               ${CC} -c -p ${CFLAGS} testlwp.c ${LIBS}
-
-
-selclient.o: selclient.c seltest.h
-       ${CC} ${CFLAGS} -c -g selclient.c
-
-selclient: selclient.o selsubs.o ${LIBS}
-       ${CC} ${CFLAGS} -g -o selclient selclient.o selsubs.o ${LIBS}
-
-selserver.o: selserver.c seltest.h
-       ${CC} ${CFLAGS} -c -g selserver.c
-
-selserver: selserver.o selsubs.o ${LIBS}
-       ${CC} ${CFLAGS} -g -o selserver selserver.o selsubs.o ${LIBS}
-
-selsubs.o: selsubs.c seltest.h
-       ${CC} ${CFLAGS} -g -c selsubs.c
-
-
-test_key: test_key.o
-       ${CC} ${CFLAGS} -g -o test_key test_key.o \
-               ../liblwp.a DEST/lib/afs/util.a
-
-
-
-clean:
-       -rm -f *.o *.a test testlwp selclient selserver core
diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in
new file mode 100644 (file)
index 0000000..fa5d5d2
--- /dev/null
@@ -0,0 +1,56 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+OPTIMIZE= -g
+
+INCDIRS= -I.. -I${DESTDIR}include 
+LIBS= ../liblwp.a
+
+include ../../config/Makefile.${SYS_NAME}
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
+
+system noversion: test
+
+test:          test.c liblwp.a
+               ${CC} -p ${CFLAGS} test.c -o test ${LIBS}
+
+testlwp.o      : testlwp.c
+               ${CC} -c -p ${CFLAGS} testlwp.c ${LIBS}
+
+
+selclient.o: selclient.c seltest.h
+       ${CC} ${CFLAGS} -c -g selclient.c
+
+selclient: selclient.o selsubs.o ${LIBS}
+       ${CC} ${CFLAGS} -g -o selclient selclient.o selsubs.o ${LIBS}
+
+selserver.o: selserver.c seltest.h
+       ${CC} ${CFLAGS} -c -g selserver.c
+
+selserver: selserver.o selsubs.o ${LIBS}
+       ${CC} ${CFLAGS} -g -o selserver selserver.o selsubs.o ${LIBS}
+
+selsubs.o: selsubs.c seltest.h
+       ${CC} ${CFLAGS} -g -c selsubs.c
+
+
+test_key: test_key.o
+       ${CC} ${CFLAGS} -g -o test_key test_key.o \
+               ../liblwp.a $(DESTDIR)/lib/afs/util.a
+
+
+
+clean:
+       -rm -f *.o *.a test testlwp selclient selserver core
diff --git a/src/mpp/Makefile b/src/mpp/Makefile
deleted file mode 100644 (file)
index 403dbdd..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#      (C) Copyright 10/17/86 by Carnegie Mellon University
-#
-SHELL = /bin/sh
-DESTDIR=DEST/
-SRCDIR=DEST/
-CFLAGS= ${OPTMZ} ${XCFLAGS}
-LIBS = ${XLIBS}
-
-PROGRAM=mpp
-MANUAL=mpp.1
-
-COMPONENT=mpp
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-system: install
-
-all: ${PROGRAM}
-
-install: ${PROGRAM} 
-       ${INSTALL} -c -s -m 755 ${PROGRAM} ${DESTDIR}etc
-
-installdoc: ${MANUAL}
-       ${INSTALL} -c ${MANUAL} ${DESTDIR}man/man1
-
-clean:
-       -rm -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c
-
-${PROGRAM}: AFS_component_version_number.c
-       ${CC} ${CFLAGS} $@.c -o $@ ${LIBS}
-
-mpp: mpp.c
diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in
new file mode 100644 (file)
index 0000000..20a8dd5
--- /dev/null
@@ -0,0 +1,38 @@
+#
+#      (C) Copyright 10/17/86 by Carnegie Mellon University
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+
+CFLAGS= ${OPTMZ} ${XCFLAGS}
+LIBS = ${XLIBS}
+
+PROGRAM=mpp
+MANUAL=mpp.1
+
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+system: install
+
+all: ${PROGRAM}
+
+install: ${PROGRAM} 
+       ${INSTALL} -c -s -m 755 ${PROGRAM} ${DESTDIR}etc
+
+installdoc: ${MANUAL}
+       ${INSTALL} -c ${MANUAL} ${DESTDIR}man/man1
+
+clean:
+       -rm -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c
+
+${PROGRAM}: AFS_component_version_number.c
+       ${CC} ${CFLAGS} $@.c -o $@ ${LIBS}
+
+mpp: mpp.c
diff --git a/src/ntp/Makefile b/src/ntp/Makefile
deleted file mode 100644 (file)
index b50463d..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=ntp
-include ../config/Makefile.${SYS_NAME}
-
-INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}include
-BINDIR=/usr/local/etc
-LINKDIR=/etc
-LIBS= ${DESTDIR}lib/afs/util.a  
-
-VERS=3.4
-
-#CC=gcc -g -W -Wall
-#afs#CC=cc -g -W
-
-#afs#INSTALL= install -c
-
-#
-# FEATURES include:
-#      DEBUG     - include DEBUG code
-#      BROADCAST_NTP - experimental support for broadcast NTP
-#      XADJTIME2 - experimental support for second-order clock adjustment
-#                  system call.
-#      SETTICKADJ - attempt to modify kernel's `tickadj' variable at run time.
-#      REFCLOCK  - define if you have a reference clock attached to your
-#                  machine.  (untested by UMD)
-#      PSTI - define along with REFCLOCK if you have a PSTI clock attached
-#              that you'd like to use a a reference clock.
-#      XTAL=0 - for line freq clock, or
-#      XTAL=1   for crystal controlled clock (default)
-#      LOG_NTP=foo - to change the syslog facility.  You could specify
-#                  something like -DLOG_NTP=LOG_LOCAL3 to log into the
-#                  LOG_LOCAL3 syslog facility
-#      NOSWAP - allow use of plock() to prevent swapping
-#
-
-#FEATURES= -DBROADCAST_NTP -DSETTICKADJ -DDEBUG
-#FEATURES= -DSETTICKADJ -DDEBUG -DREFCLOCK -DPSTI
-#afs#FEATURES= -DSETTICKADJ -DDEBUG -DREFCLOCK
-#afs# # SETTICKADJ is set in ntpd.c on SUNs.
-FEATURES= -DDEBUG -DREFCLOCK
-
-# for afs
-DEFINES= -DGENERIC_UNS_BUG -DSUN_FLT_BUG
-
-# for 4.3 BSD
-#afs#DEFINES=
-
-# for Sun
-#DEFINES= -DSUN_FLT_BUG
-
-# for Ultrix 2.0/2.2
-# don't forget to fix the broken definition of inet_addr in netdb.h
-# it should be declared as a u_long not a in_addr  (the doc is wrong also)
-# VAX_COMPILER_FLT_BUG is defined for pcc which doesn't know how to 
-# convert an unsigned long into a float/double
-#DEFINES= -DVAX_COMPILER_FLT_BUG -DNOSWAP
-
-#
-# for a NeXT system, define these pre-processor symbols.
-#DEFINES=-DSUN_FLT_BUG -DGENERIC_UNS_BUG 
-
-CFLAGS= -O ${DEFINES} ${FEATURES} ${INCPATH} ${XCFLAGS}
-LDFLAGS= ${XLDFLAGS}
-#
-# Header files
-#
-HDRS=  ntp.h patchlevel.h
-
-# Source files
-#
-NTPDSRC= ntpd.c ntpsubs.c ntp_proto.c ntp_sock.c ntp_adjust.c read_local.c \
-       read_psti.c
-SRCS=  ntp.c ntpdc.c test.c ${NTPDSRC}
-
-# Object files
-#
-NTPDOBJ= ntpd.o ntpsubs.o ntp_proto.o ntp_sock.o ntp_adjust.o read_local.o \
-       read_psti.o
-OBJS=  ntp.o ntpdc.o test.o ${NTPDOBJ}
-
-
-DIST= README Makefile man ${SRCS} ${HDRS} ntp.conf test.c extract.pl stat.pl
-PROGS= ntp ntpd ntpdc ntest
-
-include ../config/Makefile.version
-
-ntp.o: AFS_component_version_number.c
-ntpd.o: AFS_component_version_number.c
-ntpdc.o: AFS_component_version_number.c
-read_psti.o: AFS_component_version_number.c
-
-all:   ${PROGS} runntp
-       -@./ntest
-
-ntp:   ntp.o ntpsubs.o
-       ${CC} ${LDFLAGS} -o ntp ntp.o ntpsubs.o ${LIBS} ${XLIBS} ${XLIBELFA}
-
-ntpd:  ${NTPDOBJ}
-       case ${SYS_NAME} in \
-               sgi_*) \
-                       ${CC} ${LDFLAGS} -o ntpd ${NTPDOBJ} ${LIBS} -lelf ;; \
-               *) \
-                       ${CC} ${LDFLAGS} -o ntpd ${NTPDOBJ} ${LIBS} ${XLIBS} ${XLIBELFA} ;; \
-       esac
-
-
-ntpdc: ntpdc.o
-       ${CC} ${LDFLAGS} -o ntpdc ntpdc.o ${LIBS} ${XLIBS} ${XLIBELFA}
-
-ntest: test.o ntpsubs.o
-       ${CC} ${LDFLAGS} -o ntest test.o ntpsubs.o ${LIBS} ${XLIBS} ${XLIBELFA}
-       ./ntest
-
-sock_test: ntp_sock.c AFS_component_version_number.o
-       ${CC} ${LDFLAGS} -DTEST -o sock_test ntp_sock.c ${LIBS} ${XLIBS} ${XLIBELFA}
-
-${OBJS}: ntp.h # Makefile
-ntpd.o:        patchlevel.h
-
-# for afs
-
-system: install
-
-AFSLIBS= ${DESTDIR}lib/afs/libauth.a ${DESTDIR}lib/afs/libcom_err.a ${DESTDIR}lib/afs/util.a 
-
-runntp.o: runntp.c ${DESTDIR}/include/afs/cellconfig.h AFS_component_version_number.c
-       ${CC} ${CFLAGS} -I${DESTDIR}include -c runntp.c ${AFSLIBS} ${XLIBS}
-
-runntp: runntp.o ${AFSLIBS}
-       ${CC} ${LDFLAGS} -o runntp runntp.o ${AFSLIBS} ${XLIBS}
-
-install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp
-       ${INSTALL} ntpd ${DESTDIR}root.server/usr/afs/bin/ntpd
-       ${INSTALL} ntpdc ${DESTDIR}root.server/usr/afs/bin/ntpdc
-       ${INSTALL} ntp ${DESTDIR}etc/ntp
-       ${INSTALL} ntpdc ${DESTDIR}etc/ntpdc
-       ${INSTALL} runntp ${DESTDIR}root.server/usr/afs/bin/runntp
-
-#
-# If you don't want a symlink to the daemon, comment out the next line
-#      make ${MFLAGS} DESTDIR=${DESTDIR} install-link
-
-install-man:
-       cd man; $(MAKE) ${MFLAGS} DESTDIR=${DESTDIR} install
-
-install-link:
-       rm -f ${BINDIR}/${LINKDIR}/ntpd
-       ln -s ${BINDIR}/ntpd ${DESTDIR}/${LINKDIR}/ntpd
-
-print:
-       enscript -2r -p - Makefile ${HDRS} ${SRCS} | qpr -q lps40
-
-clean:
-       @rm -f *.o *~ core ${PROGS} ntp.tar ntest sock_test AFS_component_version_number.c
-
-lint:
-       lint -bac ${DEFINES} ${NTPDSRC}
-
-dist:  ntp.tar.Z
-       mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp.tar.Z
-
-test-dist:     ntp.tar.Z
-       mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp-test.tar.Z
-
-ntp.tar.Z:     ${DIST}
-       rm -f ntp.tar ntp.tar.Z
-       tar cf ntp.tar ${DIST}
-       compress  ntp.tar
-
-
-depend:
-       mkdep $(CFLAGS) $(SRCS)
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/src/ntp/Makefile.in b/src/ntp/Makefile.in
new file mode 100644 (file)
index 0000000..282bfbf
--- /dev/null
@@ -0,0 +1,188 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}include
+BINDIR=/usr/local/etc
+LINKDIR=/etc
+LIBS= ${DESTDIR}lib/afs/util.a  
+
+VERS=3.4
+
+#CC=gcc -g -W -Wall
+#afs#CC=cc -g -W
+
+#afs#INSTALL= install -c
+
+#
+# FEATURES include:
+#      DEBUG     - include DEBUG code
+#      BROADCAST_NTP - experimental support for broadcast NTP
+#      XADJTIME2 - experimental support for second-order clock adjustment
+#                  system call.
+#      SETTICKADJ - attempt to modify kernel's `tickadj' variable at run time.
+#      REFCLOCK  - define if you have a reference clock attached to your
+#                  machine.  (untested by UMD)
+#      PSTI - define along with REFCLOCK if you have a PSTI clock attached
+#              that you'd like to use a a reference clock.
+#      XTAL=0 - for line freq clock, or
+#      XTAL=1   for crystal controlled clock (default)
+#      LOG_NTP=foo - to change the syslog facility.  You could specify
+#                  something like -DLOG_NTP=LOG_LOCAL3 to log into the
+#                  LOG_LOCAL3 syslog facility
+#      NOSWAP - allow use of plock() to prevent swapping
+#
+
+#FEATURES= -DBROADCAST_NTP -DSETTICKADJ -DDEBUG
+#FEATURES= -DSETTICKADJ -DDEBUG -DREFCLOCK -DPSTI
+#afs#FEATURES= -DSETTICKADJ -DDEBUG -DREFCLOCK
+#afs# # SETTICKADJ is set in ntpd.c on SUNs.
+FEATURES= -DDEBUG -DREFCLOCK
+
+# for afs
+DEFINES= -DGENERIC_UNS_BUG -DSUN_FLT_BUG
+
+# for 4.3 BSD
+#afs#DEFINES=
+
+# for Sun
+#DEFINES= -DSUN_FLT_BUG
+
+# for Ultrix 2.0/2.2
+# don't forget to fix the broken definition of inet_addr in netdb.h
+# it should be declared as a u_long not a in_addr  (the doc is wrong also)
+# VAX_COMPILER_FLT_BUG is defined for pcc which doesn't know how to 
+# convert an unsigned long into a float/double
+#DEFINES= -DVAX_COMPILER_FLT_BUG -DNOSWAP
+
+#
+# for a NeXT system, define these pre-processor symbols.
+#DEFINES=-DSUN_FLT_BUG -DGENERIC_UNS_BUG 
+
+CFLAGS= -O ${DEFINES} ${FEATURES} ${INCPATH} ${XCFLAGS}
+LDFLAGS= ${XLDFLAGS}
+#
+# Header files
+#
+HDRS=  ntp.h patchlevel.h
+
+# Source files
+#
+NTPDSRC= ntpd.c ntpsubs.c ntp_proto.c ntp_sock.c ntp_adjust.c read_local.c \
+       read_psti.c
+SRCS=  ntp.c ntpdc.c test.c ${NTPDSRC}
+
+# Object files
+#
+NTPDOBJ= ntpd.o ntpsubs.o ntp_proto.o ntp_sock.o ntp_adjust.o read_local.o \
+       read_psti.o
+OBJS=  ntp.o ntpdc.o test.o ${NTPDOBJ}
+
+
+DIST= README Makefile man ${SRCS} ${HDRS} ntp.conf test.c extract.pl stat.pl
+PROGS= ntp ntpd ntpdc ntest
+
+include ../config/Makefile.version
+
+ntp.o: AFS_component_version_number.c
+ntpd.o: AFS_component_version_number.c
+ntpdc.o: AFS_component_version_number.c
+read_psti.o: AFS_component_version_number.c
+
+all:   ${PROGS} runntp
+       -@./ntest
+
+ntp:   ntp.o ntpsubs.o
+       ${CC} ${LDFLAGS} -o ntp ntp.o ntpsubs.o ${LIBS} ${XLIBS} ${XLIBELFA}
+
+ntpd:  ${NTPDOBJ}
+       case ${SYS_NAME} in \
+               sgi_*) \
+                       ${CC} ${LDFLAGS} -o ntpd ${NTPDOBJ} ${LIBS} -lelf ;; \
+               *) \
+                       ${CC} ${LDFLAGS} -o ntpd ${NTPDOBJ} ${LIBS} ${XLIBS} ${XLIBELFA} ;; \
+       esac
+
+
+ntpdc: ntpdc.o
+       ${CC} ${LDFLAGS} -o ntpdc ntpdc.o ${LIBS} ${XLIBS} ${XLIBELFA}
+
+ntest: test.o ntpsubs.o
+       ${CC} ${LDFLAGS} -o ntest test.o ntpsubs.o ${LIBS} ${XLIBS} ${XLIBELFA}
+       ./ntest
+
+sock_test: ntp_sock.c AFS_component_version_number.o
+       ${CC} ${LDFLAGS} -DTEST -o sock_test ntp_sock.c ${LIBS} ${XLIBS} ${XLIBELFA}
+
+${OBJS}: ntp.h # Makefile
+ntpd.o:        patchlevel.h
+
+# for afs
+
+system: install
+
+AFSLIBS= ${DESTDIR}lib/afs/libauth.a ${DESTDIR}lib/afs/libcom_err.a ${DESTDIR}lib/afs/util.a 
+
+runntp.o: runntp.c ${DESTDIR}/include/afs/cellconfig.h AFS_component_version_number.c
+       ${CC} ${CFLAGS} -I${DESTDIR}include -c runntp.c ${AFSLIBS} ${XLIBS}
+
+runntp: runntp.o ${AFSLIBS}
+       ${CC} ${LDFLAGS} -o runntp runntp.o ${AFSLIBS} ${XLIBS}
+
+install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp
+       ${INSTALL} ntpd ${DESTDIR}root.server/usr/afs/bin/ntpd
+       ${INSTALL} ntpdc ${DESTDIR}root.server/usr/afs/bin/ntpdc
+       ${INSTALL} ntp ${DESTDIR}etc/ntp
+       ${INSTALL} ntpdc ${DESTDIR}etc/ntpdc
+       ${INSTALL} runntp ${DESTDIR}root.server/usr/afs/bin/runntp
+
+#
+# If you don't want a symlink to the daemon, comment out the next line
+#      make ${MFLAGS} DESTDIR=${DESTDIR} install-link
+
+install-man:
+       cd man; $(MAKE) ${MFLAGS} DESTDIR=${DESTDIR} install
+
+install-link:
+       rm -f ${BINDIR}/${LINKDIR}/ntpd
+       ln -s ${BINDIR}/ntpd ${DESTDIR}/${LINKDIR}/ntpd
+
+print:
+       enscript -2r -p - Makefile ${HDRS} ${SRCS} | qpr -q lps40
+
+clean:
+       @rm -f *.o *~ core ${PROGS} ntp.tar ntest sock_test AFS_component_version_number.c
+
+lint:
+       lint -bac ${DEFINES} ${NTPDSRC}
+
+dist:  ntp.tar.Z
+       mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp.tar.Z
+
+test-dist:     ntp.tar.Z
+       mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp-test.tar.Z
+
+ntp.tar.Z:     ${DIST}
+       rm -f ntp.tar ntp.tar.Z
+       tar cf ntp.tar ${DIST}
+       compress  ntp.tar
+
+
+depend:
+       mkdep $(CFLAGS) $(SRCS)
+
+# DO NOT DELETE THIS LINE -- mkdep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/src/null/Makefile b/src/null/Makefile
deleted file mode 100644 (file)
index 7ab2cda..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-# Makefile for the null library.
-DESTDIR=DEST/
-SRCDIR=DEST/
-SHELL=/bin/sh
-
-COMPONENT=null
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-CFLAGS = ${XCFLAGS}
-
-all: libnull.a
-
-null.o: null.c AFS_component_version_number.o
-
-libnull.a: null.o
-       -rm -f $@
-       ar rv $@ null.o
-       $(RANLIB) $@
-
-system install noversion install.noversion version: all
-       ${INSTALL} libnull.a ${DESTDIR}lib/afs
-
-clean:
-       rm -f *.o *.a AFS_component_version_number.c
diff --git a/src/null/Makefile.in b/src/null/Makefile.in
new file mode 100644 (file)
index 0000000..79024d8
--- /dev/null
@@ -0,0 +1,36 @@
+# 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
+
+# Makefile for the null library.
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+SHELL=/bin/sh
+
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+CFLAGS = ${XCFLAGS}
+
+all: libnull.a
+
+null.o: null.c AFS_component_version_number.o
+
+libnull.a: null.o
+       -rm -f $@
+       ar rv $@ null.o
+       $(RANLIB) $@
+
+system install noversion install.noversion version: all
+       ${INSTALL} libnull.a ${DESTDIR}lib/afs
+
+clean:
+       rm -f *.o *.a AFS_component_version_number.c
diff --git a/src/package/Makefile b/src/package/Makefile
deleted file mode 100644 (file)
index 7087c03..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# (C) Copyright Transarc Corporation 1989
-# Licensed Materials - Property of Transarc
-# All Rights Reserved
-#
-# Makefile for package, the AFS workstation configuration tool.
-#
-
-SHELL    = /bin/sh
-COMPONENT=package
-include ../config/Makefile.${SYS_NAME}
-
-INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}include
-DBGFLAG  = -UDEBUG
-CFLAGS   = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS)
-YFLAGS   = -vd
-#LFLAGS  = -ll
-LINT     = lint -hp
-
-HFILES = package.h \
-        validupdates.h \
-        systype.h \
-        globals.h
-
-SRCS = package.c \
-       conftree.c \
-       check.c \
-       update.c \
-       fileops.c \
-       messages.c \
-       misc.c \
-       globfuncs.c
-
-TEST_SRCS = test.c \
-       conftree.c \
-       messages.c \
-       misc.c \
-       globfuncs.c
-
-OTHERSRCS = gram.y
-
-OBJS =  package.o \
-       gram.o \
-       lex.o \
-       conftree.o \
-       check.o \
-       update.o \
-       fileops.o \
-       messages.o \
-       misc.o \
-       globfuncs.o
-
-TEST_OBJS = test.o \
-       test_gram.o \
-       lex.o \
-       conftree.o \
-       messages.o \
-       misc.o \
-       globfuncs.o
-
-LIBS =  ${DESTDIR}lib/afs/libsys.a \
-        ${DESTDIR}lib/afs/libcmd.a \
-       ${DESTDIR}lib/afs/libcom_err.a \
-        ${DESTDIR}lib/librx.a \
-       ${DESTDIR}lib/afs/libsys.a \
-       ${DESTDIR}lib/afs/util.a \
-       ${DESTDIR}lib/liblwp.a \
-       ${XLIBS}
-
-include ../config/Makefile.version
-
-all    : package package_test
-
-package        : $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $(OBJS) $(NON_SHARED) ${LIBS}
-
-package_test : $(TEST_OBJS)
-       $(CC) $(CFLAGS) -o package_test $(TEST_OBJS) ${LIBS}
-
-package.o: package.c AFS_component_version_number.o
-test.o: test.c AFS_component_version_number.o
-
-lint   : $(SRCS) gram.c lex.c test_gram.c
-       $(LINT) $(SRCS) gram.c lex.c test_gram.c
-       /bin/rm gram.c lex.c test_gram.c
-
-lex.c:
-       -$(RM) -f lex.c
-       $(LEX)  -t lex.l > lex.c
-
-system : install
-
-clean  :
-       rm -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\
-       AFS_component_version_number.c lex.c y.tab.h
-
-install: package package_test
-       $(INSTALL) -s  -c -m 755 package      ${DESTDIR}etc
-       $(INSTALL) -s  -c -m 755 package_test ${DESTDIR}etc
-       ${INSTALL} -ns -c -m 755 makepkgfiles ${DESTDIR}etc
diff --git a/src/package/Makefile.in b/src/package/Makefile.in
new file mode 100644 (file)
index 0000000..7b68dee
--- /dev/null
@@ -0,0 +1,103 @@
+# (C) Copyright Transarc Corporation 1989
+# Licensed Materials - Property of Transarc
+# All Rights Reserved
+#
+# Makefile for package, the AFS workstation configuration tool.
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL    = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}include
+DBGFLAG  = -UDEBUG
+CFLAGS   = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS)
+YFLAGS   = -vd
+#LFLAGS  = -ll
+LINT     = lint -hp
+
+HFILES = package.h \
+        validupdates.h \
+        systype.h \
+        globals.h
+
+SRCS = package.c \
+       conftree.c \
+       check.c \
+       update.c \
+       fileops.c \
+       messages.c \
+       misc.c \
+       globfuncs.c
+
+TEST_SRCS = test.c \
+       conftree.c \
+       messages.c \
+       misc.c \
+       globfuncs.c
+
+OTHERSRCS = gram.y
+
+OBJS =  package.o \
+       gram.o \
+       lex.o \
+       conftree.o \
+       check.o \
+       update.o \
+       fileops.o \
+       messages.o \
+       misc.o \
+       globfuncs.o
+
+TEST_OBJS = test.o \
+       test_gram.o \
+       lex.o \
+       conftree.o \
+       messages.o \
+       misc.o \
+       globfuncs.o
+
+LIBS =  ${DESTDIR}lib/afs/libsys.a \
+        ${DESTDIR}lib/afs/libcmd.a \
+       ${DESTDIR}lib/afs/libcom_err.a \
+        ${DESTDIR}lib/librx.a \
+       ${DESTDIR}lib/afs/libsys.a \
+       ${DESTDIR}lib/afs/util.a \
+       ${DESTDIR}lib/liblwp.a \
+       ${XLIBS}
+
+include ../config/Makefile.version
+
+all    : package package_test
+
+package        : $(OBJS)
+       $(CC) $(CFLAGS) -o $@ $(OBJS) $(NON_SHARED) ${LIBS}
+
+package_test : $(TEST_OBJS)
+       $(CC) $(CFLAGS) -o package_test $(TEST_OBJS) ${LIBS}
+
+package.o: package.c AFS_component_version_number.o
+test.o: test.c AFS_component_version_number.o
+
+lint   : $(SRCS) gram.c lex.c test_gram.c
+       $(LINT) $(SRCS) gram.c lex.c test_gram.c
+       /bin/rm gram.c lex.c test_gram.c
+
+lex.c:
+       -$(RM) -f lex.c
+       $(LEX)  -t lex.l > lex.c
+
+system : install
+
+clean  :
+       rm -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\
+       AFS_component_version_number.c lex.c y.tab.h
+
+install: package package_test
+       $(INSTALL) -s  -c -m 755 package      ${DESTDIR}etc
+       $(INSTALL) -s  -c -m 755 package_test ${DESTDIR}etc
+       ${INSTALL} -ns -c -m 755 makepkgfiles ${DESTDIR}etc
index ee906d21b1283825a2d84b6d70f63c332cf10420..5f63cd5b06adae17f3edc54a73cc2041b845775b 100644 (file)
@@ -5,10 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 SHELL=/bin/sh
 KERNELDIR = ../libafs/
 
-COMPONENT=afs
 include ../config/Makefile.${SYS_NAME}
 
 LIBDIR = ${DESTDIR}lib/
diff --git a/src/pinstall/Makefile b/src/pinstall/Makefile
deleted file mode 100644 (file)
index bd0f457..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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 Rights Reserved
-# 
-# Permission to use, copy, modify, and distribute this software and its 
-# documentation for any purpose and without fee is hereby granted, 
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in 
-# supporting documentation, and that the name of IBM not be
-# used in advertising or publicity pertaining to distribution of the
-# software without specific, written prior permission.  
-# 
-# IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-# IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-######################################################################
-
-# Make modified install
-SHELL = /bin/sh
-COMPONENT=pinstall
-include ../config/Makefile.${SYS_NAME}
-
-LIBS= ${XLIBS}
-CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config ${XCFLAGS}
-
-include ../config/Makefile.version
-
-pinstall: install.c  AFS_component_version_number.c 
-       case ${SYS_NAME} in \
-                sgi_64 | sgi_65) \
-                        ${CC} -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
-                sgi_* ) \
-                        $(CC) -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} -lmld ;; \
-                *) \
-                        $(CC) -g -I. -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
-        esac
-       - [ -d test ] && ( cd test; $(MAKE) )
-       - [ -d test ] && ./test/test_install
-
-${DESTDIR}bin/install: pinstall
-       case ${SYS_NAME} in \
-               ppc_darwin*) \
-                       ./pinstall -f pinstall ${DESTDIR}bin/pinstall ;;\
-               *) \
-                       ./pinstall -f pinstall ${DESTDIR}bin/install ;;\
-       esac
-
-# Note: Some rule needs to appear here so that OSF's make does not try to
-# compile install from install.c. A ";" will not work since other platforms
-# complain. That's why we use 'echo'.
-install: ${DESTDIR}bin/install
-       @echo -n
-
-noversion: install
-
-kinstall ukinstall webinstall:
-       @echo No kernel source here.
-
-system: install
-
-clean:
-       rm -f pinstall AFS_component_version_number.c
-
-
-
diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in
new file mode 100644 (file)
index 0000000..6aaee98
--- /dev/null
@@ -0,0 +1,79 @@
+# 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 Rights Reserved
+# 
+# Permission to use, copy, modify, and distribute this software and its 
+# documentation for any purpose and without fee is hereby granted, 
+# provided that the above copyright notice appear in all copies and that
+# both that copyright notice and this permission notice appear in 
+# supporting documentation, and that the name of IBM not be
+# used in advertising or publicity pertaining to distribution of the
+# software without specific, written prior permission.  
+# 
+# IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+# IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+# SOFTWARE.
+######################################################################
+
+# Make modified install
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+LIBS= ${XLIBS}
+CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config ${XCFLAGS}
+
+include ../config/Makefile.version
+
+pinstall: install.c  AFS_component_version_number.c 
+       case ${SYS_NAME} in \
+                sgi_64 | sgi_65) \
+                        ${CC} -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+                sgi_* ) \
+                        $(CC) -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} -lmld ;; \
+                *) \
+                        $(CC) -g -I. -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+        esac
+       - [ -d test ] && ( cd test; $(MAKE) )
+       - [ -d test ] && ./test/test_install
+
+${DESTDIR}bin/install: pinstall
+       case ${SYS_NAME} in \
+               ppc_darwin*) \
+                       ./pinstall -f pinstall ${DESTDIR}bin/pinstall ;;\
+               *) \
+                       ./pinstall -f pinstall ${DESTDIR}bin/install ;;\
+       esac
+
+# Note: Some rule needs to appear here so that OSF's make does not try to
+# compile install from install.c. A ";" will not work since other platforms
+# complain. That's why we use 'echo'.
+install: ${DESTDIR}bin/install
+       @echo -n
+
+noversion: install
+
+kinstall ukinstall webinstall:
+       @echo No kernel source here.
+
+system: install
+
+clean:
+       rm -f pinstall AFS_component_version_number.c
+
+
+
diff --git a/src/pinstall/test/Makefile b/src/pinstall/test/Makefile
deleted file mode 100644 (file)
index b5b2b93..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-
-# There's really not much in here to build...
-#
-
-SRCDIR=DEST/
-DESTDIR=DEST/
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
-
-all test system:       
-       @echo "nothing to do, done"
-
-kinstall:
-       @echo No kernel source here.
-
diff --git a/src/pinstall/test/Makefile.in b/src/pinstall/test/Makefile.in
new file mode 100644 (file)
index 0000000..e4a5bc5
--- /dev/null
@@ -0,0 +1,29 @@
+# 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
+
+# There's really not much in here to build...
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
+BACKDIR=../../../../PARENT/dest/
+OPTIMIZE=-O
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+
+all test system:       
+       @echo "nothing to do, done"
+
+kinstall:
+       @echo No kernel source here.
+
diff --git a/src/procmgmt/Makefile b/src/procmgmt/Makefile
deleted file mode 100644 (file)
index 4e2d202..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-CFLAGS = $(DBUG) -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
-
-########################################################################
-# build libprocmgmt.a
-LIBOBJS=procmgmt_unix.o
-
-libprocmgmt.a: ${LIBOBJS} AFS_component_version_number.o
-       $(RM) -f libprocmgmt.a
-       $(AR) r libprocmgmt.a ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) libprocmgmt.a
-
-procmgmt_unix.o: procmgmt_unix.c procmgmt.h
-
-#######################################################################
-system: install
-
-kinstall ukinstall webinstall: install
-       @echo No relevant source here.
-
-${DESTDIR}lib/afs/libprocmgmt.a: libprocmgmt.a
-       ${INSTALL}   $? $@
-
-
-install: ${DESTDIR}lib/afs/libprocmgmt.a 
-       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
-
-includes:
-       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
-
-clean:
-       $(RM) -f *.o libprocmgmt.a   \
-        core  AFS_component_version_number.c
diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in
new file mode 100644 (file)
index 0000000..def0c21
--- /dev/null
@@ -0,0 +1,47 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+CFLAGS = $(DBUG) -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+
+########################################################################
+# build libprocmgmt.a
+LIBOBJS=procmgmt_unix.o
+
+libprocmgmt.a: ${LIBOBJS} AFS_component_version_number.o
+       $(RM) -f libprocmgmt.a
+       $(AR) r libprocmgmt.a ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) libprocmgmt.a
+
+procmgmt_unix.o: procmgmt_unix.c procmgmt.h
+
+#######################################################################
+system: install
+
+kinstall ukinstall webinstall: install
+       @echo No relevant source here.
+
+${DESTDIR}lib/afs/libprocmgmt.a: libprocmgmt.a
+       ${INSTALL}   $? $@
+
+
+install: ${DESTDIR}lib/afs/libprocmgmt.a 
+       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
+
+includes:
+       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
+
+clean:
+       $(RM) -f *.o libprocmgmt.a   \
+        core  AFS_component_version_number.c
diff --git a/src/procmgmt/test/Makefile b/src/procmgmt/test/Makefile
deleted file mode 100644 (file)
index bafe395..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-CFLAGS = $(DBUG) -I${SRCDIR}include ${XCFLAGS}
-
-########################################################################
-# build tests
-
-LIBPMGT=DEST/lib/afs/libprocmgmt.a
-
-pmgttest: pmgttest.o $(LIBPMGT)
-       $(CC) $(CFLAGS) -o pmgttest pmgttest.o $(LIBPMGT) -lm $(XLIBS)
-
-#######################################################################
-test tests: pmgttest
-
-clean:
-       $(RM) -f *.o pmgttest core
diff --git a/src/procmgmt/test/Makefile.in b/src/procmgmt/test/Makefile.in
new file mode 100644 (file)
index 0000000..2db9394
--- /dev/null
@@ -0,0 +1,29 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+CFLAGS = $(DBUG) -I${SRCDIR}include ${XCFLAGS}
+
+########################################################################
+# build tests
+
+LIBPMGT=DEST/lib/afs/libprocmgmt.a
+
+pmgttest: pmgttest.o $(LIBPMGT)
+       $(CC) $(CFLAGS) -o pmgttest pmgttest.o $(LIBPMGT) -lm $(XLIBS)
+
+#######################################################################
+test tests: pmgttest
+
+clean:
+       $(RM) -f *.o pmgttest core
diff --git a/src/ptserver/Makefile b/src/ptserver/Makefile
deleted file mode 100644 (file)
index ed79932..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=ptserver
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR=../libuafs/
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lock.h  \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ptserver.h ptclient.h ptint.h ptopcodes.h pterror.h
-
-LINCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h  \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ptclient.h ptint.h pterror.h
-
-LIBS =         ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a 
-
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-LIBOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
-UKSRCS=ptuser.c ptclient.h pterror.c pterror.h ptserver.h
-
-include ../config/Makefile.version
-
-
-clean:
-       $(RM) -f *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
-       libprot.a  pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
-        core  AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
-
-ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${auditlib}
-       $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o  ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${auditlib}
-
-ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c
-
-ptutils.o: ptutils.c ${INCLS}
-
-ptprocs.o: ptprocs.c ${INCLS}
-
-utils.o: utils.c ${INCLS} 
-
-ptint.ss.o: ptint.ss.c ptint.xdr.c ptint.xg
-ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg
-ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg
-
-ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg
-       ${RXGEN} -x ptint.xg
-
-Kptint.cs.c: ptint.xg Kptint.h
-       ${RXGEN} -x -k -C -o Kptint.cs.c ptint.xg
-Kptint.xdr.c: ptint.xg
-       ${RXGEN} -x -k -c -o Kptint.xdr.c ptint.xg
-Kptint.h: ptint.xg
-       ${RXGEN}  -x -k -h -o Kptint.h ptint.xg
-
-display.o: display.c ${INCLS}
-
-db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c
-
-db_verify: db_verify.o pterror.o display.o $(LIBS)
-       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
-
-ptclient: ptclient.o display.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS}
-
-ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
-
-ptuser.o: ptuser.c ${LINCLS}
-
-pterror.h pterror.c: pterror.et
-       $(RM) -f pterror.h pterror.c; ${COMPILE_ET} pterror
-
-libprot.a: ${LIBOBJS} AFS_component_version_number.o
-       $(RM) -f libprot.a
-       $(AR) r libprot.a ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) libprot.a
-
-pts: pts.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
-       $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS}
-
-pts.o: pts.c ${LINCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
-
-readgroup: readgroup.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS}
-
-readgroup.o: readgroup.c ${LINCLS} AFS_component_version_number.c
-
-readpwd: readpwd.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS}
-
-readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c
-
-testpt: testpt.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
-       case "$(SYS_NAME)" in \
-       ppc_darwin_12 ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ;; \
-       * ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \
-       esac
-
-testpt.o: testpt.c ${INCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
-
-pt_util: pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) ${XLIBS}
-
-ubik.o: ubik.c ${INCLS}
-
-system: install
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall: ${UKSRCS} Kptint.h Kptint.cs.c Kptint.xdr.c
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kptint.h ${UKERNELDIR}afsint/ptint.h
-       ${INSTALL} Kptint.cs.c ${UKERNELDIR}afsint/ptint.cs.c
-       ${INSTALL} Kptint.xdr.c ${UKERNELDIR}afsint/ptint.xdr.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-all: ptclient libprot.a pts db_verify readgroup readpwd testpt pt_util
-
-${DESTDIR}root.server/usr/afs/bin/ptserver: ptserver
-       ${INSTALL} $? $@
-
-${DESTDIR}bin/pts ${DESTDIR}root.server/usr/afs/bin/pts: pts
-       ${INSTALL} $? $@
-
-${DESTDIR}root.server/usr/afs/bin/pt_util: pt_util
-       ${INSTALL} $? $@
-
-${DESTDIR}lib/afs/libprot.a: libprot.a
-       ${INSTALL}   $? $@
-
-
-install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/ptserver ${DESTDIR}root.server/usr/afs/bin/pts ${DESTDIR}bin/pts ${DESTDIR}lib/afs/libprot.a ${DESTDIR}root.server/usr/afs/bin/pt_util
-       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
-       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
-       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
-       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
-       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
-       ${INSTALL} -f db_verify ${DESTDIR}etc/prdb_check
-       echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> ${DESTDIR}include/afs/prerror.h
-
-libinstall: ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
-       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
-       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
-       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
-       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
-
diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
new file mode 100644 (file)
index 0000000..124e59d
--- /dev/null
@@ -0,0 +1,188 @@
+# 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
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+UKERNELDIR=../libuafs/
+RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}bin/compile_et
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+INCLS=${SRCDIR}include/ubik.h \
+       ${SRCDIR}include/lock.h  \
+       ${SRCDIR}include/lwp.h \
+       ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h \
+       ${SRCDIR}include/afs/keys.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ptserver.h ptclient.h ptint.h ptopcodes.h pterror.h
+
+LINCLS=${SRCDIR}include/ubik.h \
+       ${SRCDIR}include/lock.h \
+       ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h  \
+       ${SRCDIR}include/rx/rxkad.h \
+       ${SRCDIR}include/afs/auth.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ptclient.h ptint.h pterror.h
+
+LIBS =         ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/librxstat.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a \
+       ${SRCDIR}lib/afs/libsys.a 
+
+auditlib=${SRCDIR}lib/afs/libaudit.a
+
+LIBOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
+UKSRCS=ptuser.c ptclient.h pterror.c pterror.h ptserver.h
+
+include ../config/Makefile.version
+
+
+clean:
+       $(RM) -f *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
+       libprot.a  pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
+        core  AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
+
+ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${auditlib}
+       $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o  ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${auditlib}
+
+ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c
+
+ptutils.o: ptutils.c ${INCLS}
+
+ptprocs.o: ptprocs.c ${INCLS}
+
+utils.o: utils.c ${INCLS} 
+
+ptint.ss.o: ptint.ss.c ptint.xdr.c ptint.xg
+ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg
+ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg
+
+ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg
+       ${RXGEN} -x ptint.xg
+
+Kptint.cs.c: ptint.xg Kptint.h
+       ${RXGEN} -x -k -C -o Kptint.cs.c ptint.xg
+Kptint.xdr.c: ptint.xg
+       ${RXGEN} -x -k -c -o Kptint.xdr.c ptint.xg
+Kptint.h: ptint.xg
+       ${RXGEN}  -x -k -h -o Kptint.h ptint.xg
+
+display.o: display.c ${INCLS}
+
+db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c
+
+db_verify: db_verify.o pterror.o display.o $(LIBS)
+       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
+
+ptclient: ptclient.o display.o libprot.a $(LIBS)
+       $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS}
+
+ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
+
+ptuser.o: ptuser.c ${LINCLS}
+
+pterror.h pterror.c: pterror.et
+       $(RM) -f pterror.h pterror.c; ${COMPILE_ET} pterror
+
+libprot.a: ${LIBOBJS} AFS_component_version_number.o
+       $(RM) -f libprot.a
+       $(AR) r libprot.a ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) libprot.a
+
+pts: pts.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
+       $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS}
+
+pts.o: pts.c ${LINCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
+
+readgroup: readgroup.o libprot.a $(LIBS)
+       $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS}
+
+readgroup.o: readgroup.c ${LINCLS} AFS_component_version_number.c
+
+readpwd: readpwd.o libprot.a $(LIBS)
+       $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS}
+
+readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c
+
+testpt: testpt.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
+       case "$(SYS_NAME)" in \
+       ppc_darwin_12 ) \
+               $(CC) ${CFLAGS} -o testpt testpt.o ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ;; \
+       * ) \
+               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \
+       esac
+
+testpt.o: testpt.c ${INCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
+
+pt_util: pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS)
+       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) ${XLIBS}
+
+ubik.o: ubik.c ${INCLS}
+
+system: install
+
+kinstall:
+       @echo No $@ source here.
+
+ukinstall webinstall: ${UKSRCS} Kptint.h Kptint.cs.c Kptint.xdr.c
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kptint.h ${UKERNELDIR}afsint/ptint.h
+       ${INSTALL} Kptint.cs.c ${UKERNELDIR}afsint/ptint.cs.c
+       ${INSTALL} Kptint.xdr.c ${UKERNELDIR}afsint/ptint.xdr.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+all: ptclient libprot.a pts db_verify readgroup readpwd testpt pt_util
+
+${DESTDIR}root.server/usr/afs/bin/ptserver: ptserver
+       ${INSTALL} $? $@
+
+${DESTDIR}bin/pts ${DESTDIR}root.server/usr/afs/bin/pts: pts
+       ${INSTALL} $? $@
+
+${DESTDIR}root.server/usr/afs/bin/pt_util: pt_util
+       ${INSTALL} $? $@
+
+${DESTDIR}lib/afs/libprot.a: libprot.a
+       ${INSTALL}   $? $@
+
+
+install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/ptserver ${DESTDIR}root.server/usr/afs/bin/pts ${DESTDIR}bin/pts ${DESTDIR}lib/afs/libprot.a ${DESTDIR}root.server/usr/afs/bin/pt_util
+       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
+       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
+       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
+       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
+       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
+       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
+       ${INSTALL} -f db_verify ${DESTDIR}etc/prdb_check
+       echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> ${DESTDIR}include/afs/prerror.h
+
+libinstall: ${DESTDIR}lib/afs/libprot.a
+       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
+       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
+       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
+       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
+       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
+       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
+
diff --git a/src/rcp/Makefile b/src/rcp/Makefile
deleted file mode 100644 (file)
index 5c7a69a..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile 5.1 (Berkeley) 9/20/88
-#
-SHELL=/bin/sh
-include ../config/Makefile.${SYS_NAME}
-
-LIBC=  /lib/libc.a
-SRCS=  rcp.c
-OBJS=   rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
-COMPONENT=rcp
-
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
-LIBRES = 
-LIBS = ${AFSLIBS} ${LIBRES} 
-MAN=
-
-include ../config/Makefile.version
-
-all: rcp
-
-rcp.o: AFS_component_version_number.c
-
-system: install
-
-rcp: ${OBJS} ${LIBS}
-       set -x; \
-       case "${SYS_NAME}" in \
-        alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-          ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -non_shared ;; \
-        * ) \
-          ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;; \
-        esac
-
-../rsh/rcmd.o: ../rsh/rcmd.c
-       (cd ../rsh ; $(MAKE) rcmd.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
-
-../rsh/herror.o: ../rsh/herror.c
-       (cd ../rsh ; $(MAKE) herror.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
-
-../inetd/ta-rauth.o: ../inetd/ta-rauth.c
-       (cd ../inetd ; $(MAKE) ta-rauth.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
-
-clean:
-clean:
-       rm -f ${OBJS} core rcp AFS_component_version_number.c
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN} all
-       ${INSTALL} rcp ${DESTDIR}bin/rcp
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in
new file mode 100644 (file)
index 0000000..b48063f
--- /dev/null
@@ -0,0 +1,86 @@
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation, advertising
+# materials, and other materials related to such redistribution and
+# use acknowledge that the software was developed by the University
+# of California, Berkeley.  The name of the University may not be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
+# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE.
+#
+# @(#)Makefile 5.1 (Berkeley) 9/20/88
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+include ../config/Makefile.${SYS_NAME}
+
+LIBC=  /lib/libc.a
+SRCS=  rcp.c
+OBJS=   rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
+
+
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
+                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
+                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
+                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
+                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
+LIBRES = 
+LIBS = ${AFSLIBS} ${LIBRES} 
+MAN=
+
+include ../config/Makefile.version
+
+all: rcp
+
+rcp.o: AFS_component_version_number.c
+
+system: install
+
+rcp: ${OBJS} ${LIBS}
+       set -x; \
+       case "${SYS_NAME}" in \
+        alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
+          ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -non_shared ;; \
+        * ) \
+          ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;; \
+        esac
+
+../rsh/rcmd.o: ../rsh/rcmd.c
+       (cd ../rsh ; $(MAKE) rcmd.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+
+../rsh/herror.o: ../rsh/herror.c
+       (cd ../rsh ; $(MAKE) herror.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+
+../inetd/ta-rauth.o: ../inetd/ta-rauth.c
+       (cd ../inetd ; $(MAKE) ta-rauth.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+
+clean:
+clean:
+       rm -f ${OBJS} core rcp AFS_component_version_number.c
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep -p ${CFLAGS} ${SRCS}
+
+install: ${MAN} all
+       ${INSTALL} rcp ${DESTDIR}bin/rcp
+
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
diff --git a/src/rlogind/Makefile b/src/rlogind/Makefile
deleted file mode 100644 (file)
index 241442f..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile 5.3 (Berkeley) 9/20/88
-#
-
-SHELL=/bin/sh
-COMPONENT=rlogind
-include ../config/Makefile.${SYS_NAME}
-
-LIBC=  /lib/libc.a
-SRCS=  rlogind.c ../rsh/rcmd.c ../rsh/herror.c ../inetd/ta-rauth.c
-OBJS=  rlogind.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
-MAN=
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-                  ${LIBDIR}afs/libsys.a \
-                  ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
-                  ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
-RES = 
-LIBS = ../login/libutil.a ${RES} ${AFSLIBS}
-ALIBS= ${AFSLIBS} 
-CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
-
-include ../config/Makefile.version
-
-all: rlogind rexecd
-
-system: install
-
-rlogind: ${OBJS} ${LIBS} ../login/libutil.a
-       case ${SYS_NAME} in \
-       rs_aix*) \
-               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -ls ;; \
-       hp_ux110) \
-               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -lsec ;; \
-       *) ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
-       esac ;
-
-rlogind.o: rlogind.c AFS_component_version_number.c
-
-rexecd.o: rexecd.c AFS_component_version_number.c
-
-rexecd: rexecd.o ${ALIBS}
-       case ${SYS_NAME} in \
-       rs_aix*) \
-               ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} -ls ;; \
-       *) ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} ;;\
-       esac ;
-
-
-../login/libutil.a : ../login/util_login.c ../login/util_logout.c ../login/util_logwtmp.c
-       ( cd ../login ; $(MAKE) libutil.a )
-
-../rsh/rcmd.o : ../rsh/rcmd.c
-       (cp AFS_component_version_number.c ../rsh/AFS_component_version_number.c ;  cd ../rsh ; $(MAKE) rsh.o )
-
-../rsh/herror.o : ../rsh/herror.c
-       ( cd ../rsh ; $(MAKE) herror.o )
-
-clean:
-       rm -f ${OBJS} core rlogind AFS_component_version_number.c
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN} all
-       ${INSTALL} -s -m 755 rlogind ${DESTDIR}etc/rlogind
-       ${INSTALL} -s -m 755 rexecd ${DESTDIR}etc/rexecd
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in
new file mode 100644 (file)
index 0000000..385e57f
--- /dev/null
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation, advertising
+# materials, and other materials related to such redistribution and
+# use acknowledge that the software was developed by the University
+# of California, Berkeley.  The name of the University may not be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
+# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE.
+#
+# @(#)Makefile 5.3 (Berkeley) 9/20/88
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+LIBC=  /lib/libc.a
+SRCS=  rlogind.c ../rsh/rcmd.c ../rsh/herror.c ../inetd/ta-rauth.c
+OBJS=  rlogind.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
+MAN=
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a\
+                  ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+                  ${LIBDIR}afs/libsys.a \
+                  ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
+                  ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
+RES = 
+LIBS = ../login/libutil.a ${RES} ${AFSLIBS}
+ALIBS= ${AFSLIBS} 
+CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
+
+include ../config/Makefile.version
+
+all: rlogind rexecd
+
+system: install
+
+rlogind: ${OBJS} ${LIBS} ../login/libutil.a
+       case ${SYS_NAME} in \
+       rs_aix*) \
+               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -ls ;; \
+       hp_ux110) \
+               ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} -lsec ;; \
+       *) ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\
+       esac ;
+
+rlogind.o: rlogind.c AFS_component_version_number.c
+
+rexecd.o: rexecd.c AFS_component_version_number.c
+
+rexecd: rexecd.o ${ALIBS}
+       case ${SYS_NAME} in \
+       rs_aix*) \
+               ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} -ls ;; \
+       *) ${CC} -o $@ ${CFLAGS} rexecd.o ${ALIBS} ${XLIBS} ;;\
+       esac ;
+
+
+../login/libutil.a : ../login/util_login.c ../login/util_logout.c ../login/util_logwtmp.c
+       ( cd ../login ; $(MAKE) libutil.a )
+
+../rsh/rcmd.o : ../rsh/rcmd.c
+       (cp AFS_component_version_number.c ../rsh/AFS_component_version_number.c ;  cd ../rsh ; $(MAKE) rsh.o )
+
+../rsh/herror.o : ../rsh/herror.c
+       ( cd ../rsh ; $(MAKE) herror.o )
+
+clean:
+       rm -f ${OBJS} core rlogind AFS_component_version_number.c
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep -p ${CFLAGS} ${SRCS}
+
+install: ${MAN} all
+       ${INSTALL} -s -m 755 rlogind ${DESTDIR}etc/rlogind
+       ${INSTALL} -s -m 755 rexecd ${DESTDIR}etc/rexecd
+
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
diff --git a/src/rsh/Makefile b/src/rsh/Makefile
deleted file mode 100644 (file)
index 5f9dc3e..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile 5.1 (Berkeley) 9/20/88
-#
-SHELL=/bin/sh
-COMPONENT=rsh
-include ../config/Makefile.${SYS_NAME}
-
-LIBDIR = ${DESTDIR}lib/
-INCLUDES= -I${TOP_SRCDIR}/config -I${SRCDIR}include
-CFLAGS=        ${DBUG} ${INCLUDES} ${XCFLAGS}
-LIBC=  /lib/libc.a
-OBJS=   rcmd.o ../inetd/ta-rauth.o herror.o
-MAN=   
-SRCS=  rsh.c rcmd.c ../inetd/ta-rauth.c herror.c AFS_component_version_number.c
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-           ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-           ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-          ${LIBDIR}afs/libsys.a \
-           ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-           ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-LIBS = ${AFSLIBS} 
-
-include ../config/Makefile.version
-
-all: rlogin rsh
-
-system: install
-
-rsh: rsh.o ${OBJS} ${LIBS}
-       ${CC} -o $@ ${CFLAGS}  rsh.o ${OBJS} ${LIBS} ${XLIBS}
-
-rlogin: rlogin.o ${OBJS} ${LIBS}
-       ${CC} -o $@ ${CFLAGS} rlogin.o ${OBJS} ${LIBS} ${XLIBS}
-
-rlogin.o: rlogin.c AFS_component_version_number.c
-rsh.o: rsh.c AFS_component_version_number.c
-
-../rlogind/herror.o: ../rlogind/herror.c
-       (cd ../rlogind ; $(MAKE) herror.o )
-../inetd/ta-rauth.o : ../inetd/ta-rauth.c
-       (cd ../inetd ; $(MAKE) ta-rauth.o DESTDIR=${DESTDIR})
-
-clean:
-       rm -f ${OBJS} core rsh *.BAK AFS_component_version_number.c rlogin rlogin.o rsh.o
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN} all
-       set -x; \
-       case "${SYS_NAME}" in \
-       hp* ) \
-               ${INSTALL} -m 4755 -f rsh ${DESTDIR}bin/remsh ;; \
-       * ) \
-               ${INSTALL} -m 4755 rsh ${DESTDIR}bin/rsh ;; \
-       esac
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
diff --git a/src/rsh/Makefile.in b/src/rsh/Makefile.in
new file mode 100644 (file)
index 0000000..9c78f32
--- /dev/null
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation, advertising
+# materials, and other materials related to such redistribution and
+# use acknowledge that the software was developed by the University
+# of California, Berkeley.  The name of the University may not be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
+# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE.
+#
+# @(#)Makefile 5.1 (Berkeley) 9/20/88
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+LIBDIR = ${DESTDIR}lib/
+INCLUDES= -I${TOP_SRCDIR}/config -I${SRCDIR}include
+CFLAGS=        ${DBUG} ${INCLUDES} ${XCFLAGS}
+LIBC=  /lib/libc.a
+OBJS=   rcmd.o ../inetd/ta-rauth.o herror.o
+MAN=   
+SRCS=  rsh.c rcmd.c ../inetd/ta-rauth.c herror.c AFS_component_version_number.c
+AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
+           ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
+           ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
+          ${LIBDIR}afs/libsys.a \
+           ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
+           ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+LIBS = ${AFSLIBS} 
+
+include ../config/Makefile.version
+
+all: rlogin rsh
+
+system: install
+
+rsh: rsh.o ${OBJS} ${LIBS}
+       ${CC} -o $@ ${CFLAGS}  rsh.o ${OBJS} ${LIBS} ${XLIBS}
+
+rlogin: rlogin.o ${OBJS} ${LIBS}
+       ${CC} -o $@ ${CFLAGS} rlogin.o ${OBJS} ${LIBS} ${XLIBS}
+
+rlogin.o: rlogin.c AFS_component_version_number.c
+rsh.o: rsh.c AFS_component_version_number.c
+
+../rlogind/herror.o: ../rlogind/herror.c
+       (cd ../rlogind ; $(MAKE) herror.o )
+../inetd/ta-rauth.o : ../inetd/ta-rauth.c
+       (cd ../inetd ; $(MAKE) ta-rauth.o DESTDIR=${DESTDIR})
+
+clean:
+       rm -f ${OBJS} core rsh *.BAK AFS_component_version_number.c rlogin rlogin.o rsh.o
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep -p ${CFLAGS} ${SRCS}
+
+install: ${MAN} all
+       set -x; \
+       case "${SYS_NAME}" in \
+       hp* ) \
+               ${INSTALL} -m 4755 -f rsh ${DESTDIR}bin/remsh ;; \
+       * ) \
+               ${INSTALL} -m 4755 rsh ${DESTDIR}bin/rsh ;; \
+       esac
+
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
diff --git a/src/rx/Makefile b/src/rx/Makefile
deleted file mode 100644 (file)
index 1d75a84..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=rx
-include ../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-#CC=pcc
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include -DRXDEBUG ${XCFLAGS}
-
-#
-# Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx).
-# Really the xdr stuff should be in its own directory.
-#
-XDROBJS = xdr_arrayn.o xdr_rx.o xdr_afsuuid.o
-
-RXOBJS = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
-       rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-       xdr_int64.o 
-
-MULTIOBJS = rx_multi.o
-
-LIBOBJS = ${RXOBJS} ${MULTIOBJS} ${XDROBJS}
-
-LIBOBJS_djgpp = ${RXOBJS_djgpp} ${MULTIOBJS} ${XDROBJS_djgpp}
-
-XMIT = rx_xmit_nt.o
-XMIT_H = rx_xmit_nt.h
-
-XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
-       xdr_float.o  xdr_refernce.o  xdr_update.o \
-       xdr_array.o xdr_mem.o xdr_rx.o xdr_afsuuid.o
-
-RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
-               rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-               xdr_int64.o $(XMIT)
-
-BASICINCLS = ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
-            rx_clock.h rx_queue.h rx_event.h
-
-LIBS = librx.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-              ${SRCDIR}lib/afs/util.a 
-
-LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${SRCDIR}lib/afs/libsys.a ${XLIBS}
-
-KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
-       rx_globals.c rx_globals.h rx_kernel.h rx_misc.h \
-       rx_null.c rx_null.h rx_queue.h rx_getaddr.c rx_packet.c rx_packet.h \
-       rx_multi.h rx_kcommon.h rx_kcommon.c \
-       xdr.c xdr.h xdr_array.c xdr_arrayn.c xdr_rx.c rx_misc.c rx_rdwr.c \
-       xdr_afsuuid.c rx_trace.h xdr_int64.c
-UKSRCS = $(KSRCS) rx_conncache.c
-
-include ../config/Makefile.version
-
-test tests: install ${DESTDIR}etc/rxdebug rxdumptrace 
-#      DEST/bin/washtool object rx/test; cd test; $(MAKE) all DESTDIR=${DESTDIR} SRCDIR=${SRCDIR}
-
-RX_component_version_number.c: AFS_component_version_number.c
-       sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c
-
-RX_component_version_number.o: RX_component_version_number.c
-
-xdrs: ${XDROBJS}
-
-${RXOBJS}: ${BASICINCLS} rx.h rx_user.h rx_globals.h
-
-${MULTIOBJS}: rx.h rx_multi.h
-
-${XDROBJS}: xdr.h
-
-rx_user.o: rx.h rx_user.h
-
-rxdebug.o: rxdebug.c
-
-rx_packet.o: rx_packet.c rx_packet.h
-
-rx_rdwr.o: rx_rdwr.c rx.h
-#      $(CC) -c -O -I${SRCDIR}include -DRXDEBUG ${XCFLAGS} rx_rdwr.c
-
-rx.o: rx.h rx_user.h
-
-rx_conncache.o: rx.h
-
-rx_trace.o: rx_trace.h 
-
-rxdumptrace: rx_trace.c
-       rm -f rxdumptrace
-       $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o rx_trace.c
-       $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o  ${LIBS} ${XLIBS}
-
-rx_getaddr.o: rx.h rx_getaddr.c
-
-rx_globals.o: rx.h rx_user.h rx_globals.h
-
-xdr_rx.o: xdr.h rx.h
-
-xdr_refernce.o: xdr_refernce.c xdr.h
-
-#rx_vab.o: rx_vab.c rx_vab.h rx_user.h ${BASICINCLS}
-
-librx.a: ${LIBOBJS} RX_component_version_number.o
-       -rm -f $@
-       $(AR) rv $@ RX_component_version_number.o ${LIBOBJS}
-       $(RANLIB) $@
-
-librx-djgpp: ${LIBOBJS_djgpp} RX_component_version_number.o
-       -rm -f librx.a
-       $(AR) rv librx.a RX_component_version_number.o ${LIBOBJS_djgpp}
-       $(RANLIB) librx.a
-
-${DESTDIR}etc/rxdebug: rxdebug
-       ${INSTALL} rxdebug ${DESTDIR}etc/rxdebug
-
-rxdebug: rxdebug.o ${DESTDIR}lib/afs/util.a ${DESTDIR}lib/afs/libsys.a
-       ${LINK}
-
-install.noversion noversion install all system: librx.a includes kinstall ukinstall
-       ${INSTALL} librx.a ${DESTDIR}lib
-
-install-djgpp: librx-djgpp includes includes-djgpp kinstall ukinstall
-       ${INSTALL} librx.a ${DESTDIR}lib
-
-includes-djgpp: $(XMIT_H)
-       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(XMIT_H) ${DESTDIR}include/rx
-
-includes: rx.h rx_user.h rx_event.h rx_queue.h rx_clock.h xdr.h rx_null.h rx_globals.h 
-       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} rx_packet.h rx.h rx_user.h rx_event.h rx_queue.h \
-       rx_globals.h \
-       rx_clock.h rx_multi.h ${DESTDIR}include/rx
-       ${INSTALL} xdr.h rx_null.h ${DESTDIR}include/rx
-       ${INSTALL} rx_pthread.h rx_lwp.h rx_misc.h ${DESTDIR}include/rx
-
-kinstall: includes
-       set $(KERNELDIR)rx; $(MKDIR_IF_NEEDED)
-       $(INSTALL) $(KSRCS) $(KERNELDIR)rx
-       case ${SYS_NAME} in \
-       alpha_dux* ) \
-               $(INSTALL) DUX/*.[ch] $(KERNELDIR)rx;; \
-       i386_fbsd* ) \
-               $(INSTALL) FBSD/*.[ch] $(KERNELDIR)rx;; \
-       *_linux* ) \
-               $(INSTALL) LINUX/*.[ch] $(KERNELDIR)rx;; \
-       rs_aix* ) \
-               $(INSTALL) AIX/*.[ch] $(KERNELDIR)rx;; \
-       sgi_* ) \
-               $(INSTALL) IRIX/*.[ch] $(KERNELDIR)rx;; \
-       ppc_darwin* ) \
-               $(INSTALL) DARWIN/*.[ch]  $(KERNELDIR)rx;; \
-       sun4x_5* ) \
-               $(INSTALL) SOLARIS/*.[ch]  $(KERNELDIR)rx;; \
-       * ) \
-               echo WARNING: No kernel RX code for sys ${SYS_NAME};; \
-       esac
-
-ukinstall webinstall: includes
-       set $(UKERNELDIR)rx; $(MKDIR_IF_NEEDED)
-       $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx
-       -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx
-
-clean:
-       rm -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug
diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
new file mode 100644 (file)
index 0000000..a6babcc
--- /dev/null
@@ -0,0 +1,160 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+MKAFS_OSTYPE=@MKAFS_OSTYPE@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+#CC=pcc
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include -DRXDEBUG ${XCFLAGS}
+
+#
+# Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx).
+# Really the xdr stuff should be in its own directory.
+#
+XDROBJS = xdr_arrayn.o xdr_rx.o xdr_afsuuid.o
+
+RXOBJS = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
+       rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
+       xdr_int64.o 
+
+MULTIOBJS = rx_multi.o
+
+LIBOBJS = ${RXOBJS} ${MULTIOBJS} ${XDROBJS}
+
+LIBOBJS_djgpp = ${RXOBJS_djgpp} ${MULTIOBJS} ${XDROBJS_djgpp}
+
+XMIT = rx_xmit_nt.o
+XMIT_H = rx_xmit_nt.h
+
+XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
+       xdr_float.o  xdr_refernce.o  xdr_update.o \
+       xdr_array.o xdr_mem.o xdr_rx.o xdr_afsuuid.o
+
+RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
+               rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
+               xdr_int64.o $(XMIT)
+
+BASICINCLS = ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
+            rx_clock.h rx_queue.h rx_event.h
+
+LIBS = librx.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
+              ${SRCDIR}lib/afs/util.a 
+
+LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${SRCDIR}lib/afs/libsys.a ${XLIBS}
+
+KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
+       rx_globals.c rx_globals.h rx_kernel.h rx_misc.h \
+       rx_null.c rx_null.h rx_queue.h rx_getaddr.c rx_packet.c rx_packet.h \
+       rx_multi.h rx_kcommon.h rx_kcommon.c \
+       xdr.c xdr.h xdr_array.c xdr_arrayn.c xdr_rx.c rx_misc.c rx_rdwr.c \
+       xdr_afsuuid.c rx_trace.h xdr_int64.c
+UKSRCS = $(KSRCS) rx_conncache.c
+
+include ../config/Makefile.version
+
+test tests: install ${DESTDIR}etc/rxdebug rxdumptrace 
+
+RX_component_version_number.c: AFS_component_version_number.c
+       sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c
+
+RX_component_version_number.o: RX_component_version_number.c
+
+xdrs: ${XDROBJS}
+
+${RXOBJS}: ${BASICINCLS} rx.h rx_user.h rx_globals.h
+
+${MULTIOBJS}: rx.h rx_multi.h
+
+${XDROBJS}: xdr.h
+
+rx_user.o: rx.h rx_user.h
+
+rxdebug.o: rxdebug.c
+
+rx_packet.o: rx_packet.c rx_packet.h
+
+rx_rdwr.o: rx_rdwr.c rx.h
+#      $(CC) -c -O -I${SRCDIR}include -DRXDEBUG ${XCFLAGS} rx_rdwr.c
+
+rx.o: rx.h rx_user.h
+
+rx_conncache.o: rx.h
+
+rx_trace.o: rx_trace.h 
+
+rxdumptrace: rx_trace.c
+       rm -f rxdumptrace
+       $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o rx_trace.c
+       $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o  ${LIBS} ${XLIBS}
+
+rx_getaddr.o: rx.h rx_getaddr.c
+
+rx_globals.o: rx.h rx_user.h rx_globals.h
+
+xdr_rx.o: xdr.h rx.h
+
+xdr_refernce.o: xdr_refernce.c xdr.h
+
+#rx_vab.o: rx_vab.c rx_vab.h rx_user.h ${BASICINCLS}
+
+librx.a: ${LIBOBJS} RX_component_version_number.o
+       -rm -f $@
+       $(AR) rv $@ RX_component_version_number.o ${LIBOBJS}
+       $(RANLIB) $@
+
+librx-djgpp: ${LIBOBJS_djgpp} RX_component_version_number.o
+       -rm -f librx.a
+       $(AR) rv librx.a RX_component_version_number.o ${LIBOBJS_djgpp}
+       $(RANLIB) librx.a
+
+${DESTDIR}etc/rxdebug: rxdebug
+       ${INSTALL} rxdebug ${DESTDIR}etc/rxdebug
+
+rxdebug: rxdebug.o ${DESTDIR}lib/afs/util.a ${DESTDIR}lib/afs/libsys.a
+       ${LINK}
+
+install.noversion noversion install all system: librx.a includes kinstall ukinstall
+       ${INSTALL} librx.a ${DESTDIR}lib
+
+install-djgpp: librx-djgpp includes includes-djgpp kinstall ukinstall
+       ${INSTALL} librx.a ${DESTDIR}lib
+
+includes-djgpp: $(XMIT_H)
+       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(XMIT_H) ${DESTDIR}include/rx
+
+includes: rx.h rx_user.h rx_event.h rx_queue.h rx_clock.h xdr.h rx_null.h rx_globals.h 
+       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
+       ${INSTALL} rx_packet.h rx.h rx_user.h rx_event.h rx_queue.h \
+       rx_globals.h \
+       rx_clock.h rx_multi.h ${DESTDIR}include/rx
+       ${INSTALL} xdr.h rx_null.h ${DESTDIR}include/rx
+       ${INSTALL} rx_pthread.h rx_lwp.h rx_misc.h ${DESTDIR}include/rx
+
+kinstall: includes
+       set $(KERNELDIR)rx; $(MKDIR_IF_NEEDED)
+       $(INSTALL) $(KSRCS) $(KERNELDIR)rx
+       $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx
+
+ukinstall webinstall: includes
+       set $(UKERNELDIR)rx; $(MKDIR_IF_NEEDED)
+       $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx
+       -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx
+
+clean:
+       rm -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug
diff --git a/src/rx/bulk.example/Makefile b/src/rx/bulk.example/Makefile
deleted file mode 100644 (file)
index 00a59bc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
-DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
-
-all: bulk_client bulk_server
-
-bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o
-       ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS}
-
-bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
-
-bulk_client.o bulk_server.o bulk_io.o: bulk.h
-
-bulk.cs.c bulk.ss.c bulk.er.c bulk.h: bulk.xg
-       rxgen bulk.xg
diff --git a/src/rx/bulk.example/Makefile.in b/src/rx/bulk.example/Makefile.in
new file mode 100644 (file)
index 0000000..1a0f9e7
--- /dev/null
@@ -0,0 +1,31 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SRCDIR=/usr/andy/
+LIBRX=${SRCDIR}lib/librx.a
+DESTDIR=/usr/andy/
+INSTALL=${SRCDIR}bin/install
+LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+
+all: bulk_client bulk_server
+
+bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o
+       ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS}
+
+bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
+       ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
+
+bulk_client.o bulk_server.o bulk_io.o: bulk.h
+
+bulk.cs.c bulk.ss.c bulk.er.c bulk.h: bulk.xg
+       rxgen bulk.xg
diff --git a/src/rx/bulktest/Makefile b/src/rx/bulktest/Makefile
deleted file mode 100644 (file)
index 00a59bc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
-DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
-
-all: bulk_client bulk_server
-
-bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o
-       ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS}
-
-bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
-
-bulk_client.o bulk_server.o bulk_io.o: bulk.h
-
-bulk.cs.c bulk.ss.c bulk.er.c bulk.h: bulk.xg
-       rxgen bulk.xg
diff --git a/src/rx/bulktest/Makefile.in b/src/rx/bulktest/Makefile.in
new file mode 100644 (file)
index 0000000..1a0f9e7
--- /dev/null
@@ -0,0 +1,31 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SRCDIR=/usr/andy/
+LIBRX=${SRCDIR}lib/librx.a
+DESTDIR=/usr/andy/
+INSTALL=${SRCDIR}bin/install
+LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+
+all: bulk_client bulk_server
+
+bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o
+       ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS}
+
+bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
+       ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS}
+
+bulk_client.o bulk_server.o bulk_io.o: bulk.h
+
+bulk.cs.c bulk.ss.c bulk.er.c bulk.h: bulk.xg
+       rxgen bulk.xg
diff --git a/src/rx/multi.example/Makefile b/src/rx/multi.example/Makefile
deleted file mode 100644 (file)
index fa56eb7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
-DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
-
-all: sample_client sample_server
-
-sample_client: sample_client.o ${LIBS} sample.cs.o
-       ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS}
-
-sample_server: sample_server.o sample.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS}
-
-sample_client.o:       sample.h
-sample_server.o:       sample.h
-sample.cs.c sample.ss.c sample.er.c sample.h: sample.xg
-       rxgen sample.xg
diff --git a/src/rx/multi.example/Makefile.in b/src/rx/multi.example/Makefile.in
new file mode 100644 (file)
index 0000000..76f06d1
--- /dev/null
@@ -0,0 +1,31 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SRCDIR=/usr/andy/
+LIBRX=${SRCDIR}lib/librx.a
+DESTDIR=/usr/andy/
+INSTALL=${SRCDIR}bin/install
+LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+
+all: sample_client sample_server
+
+sample_client: sample_client.o ${LIBS} sample.cs.o
+       ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS}
+
+sample_server: sample_server.o sample.ss.o ${LIBS}
+       ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS}
+
+sample_client.o:       sample.h
+sample_server.o:       sample.h
+sample.cs.c sample.ss.c sample.er.c sample.h: sample.xg
+       rxgen sample.xg
diff --git a/src/rx/simple.example/Makefile b/src/rx/simple.example/Makefile
deleted file mode 100644 (file)
index 2acab6e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
-DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
-
-all: sample_client sample_server
-
-sample_client: sample_client.o ${LIBS} sample.cs.o
-       ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS}
-
-sample_server: sample_server.o sample.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS}
-
-sample_client.o:       sample.h
-sample_server.o:       sample.h
-sample.cs.c sample.ss.c sample.er.c sample.h: sample.xg
-       rxgen sample.xg
diff --git a/src/rx/simple.example/Makefile.in b/src/rx/simple.example/Makefile.in
new file mode 100644 (file)
index 0000000..688d785
--- /dev/null
@@ -0,0 +1,31 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SRCDIR=/usr/andy/
+LIBRX=${SRCDIR}lib/librx.a
+DESTDIR=/usr/andy/
+INSTALL=${SRCDIR}bin/install
+LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
+CFLAGS=-g -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+
+all: sample_client sample_server
+
+sample_client: sample_client.o ${LIBS} sample.cs.o
+       ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS}
+
+sample_server: sample_server.o sample.ss.o ${LIBS}
+       ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS}
+
+sample_client.o:       sample.h
+sample_server.o:       sample.h
+sample.cs.c sample.ss.c sample.er.c sample.h: sample.xg
+       rxgen sample.xg
diff --git a/src/rx/test/Makefile b/src/rx/test/Makefile
deleted file mode 100644 (file)
index c46ca9f..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
-
-COMPONENT=rxtest
-include ../../config/Makefile.${SYS_NAME}
-OPTIMIZE=-g
-
-INCDIRS= -I${DESTDIR}include -I.. 
-LDIRS= -L.. -L${DESTDIR}lib -L${DESTDIR}lib/afs  
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= ${DESTDIR}lib/afs/libcmd.a  ../librx.a ${DESTDIR}lib/liblwp.a \
-        ${utilib} ${DESTDIR}/lib/afs/libsys.a ${XLIBS}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${LIBS} ${XCFLAGS}
-
-RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o
-
-BASICINCLS =  ../rx_clock.h ../rx_queue.h ../rx_event.h
-
-LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
-
-TESTS = testclient testserver kstest kctest testqueue tableGen generator
-
-TH_TESTS = th_testserver th_testclient
-
-.IGNORE: 
-
-system all: test
-
-test tests: ${TESTS}
-
-th_test th_tests: ${TH_TESTS}
-
-testclient: ../librx.a testclient.o
-       -${LINK}
-
-testserver: ../librx.a testserver.o
-       -${LINK}
-
-kstest: ../librx.a kstest.o
-       -${LINK}
-
-kctest: ../librx.a kctest.o
-       -${LINK}
-
-# th_ versions only have link lines for Solaris now.
-th_testclient: th_testclient.o ../../libafsrpc/libafsrpc.so 
-       ${CC} ${CFLAGS} -mt -o th_testclient th_testclient.o \
-               ../../libafsrpc/libafsrpc.so -lpthread
-
-th_testclient.o: testclient.c
-       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testclient.o \
-               testclient.c
-
-th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so 
-       ${CC} ${CFLAGS} -mt -o th_testserver th_testserver.o \
-               ../../libafsrpc/libafsrpc.so -lpthread
-
-th_testserver.o: testserver.c
-       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testserver.o \
-               testserver.c
-
-testqueue: ../librx.a testqueue.o
-       -${LINK}
-
-${RXTESTOBJS}: ${BASICINCLS} ../rx.h
-
-clean:
-       rm -f *.o *.a ${TESTS} ${TH_TESTS} core
diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in
new file mode 100644 (file)
index 0000000..fb2da46
--- /dev/null
@@ -0,0 +1,77 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../../config/Makefile.${SYS_NAME}
+OPTIMIZE=-g
+
+INCDIRS= -I${DESTDIR}include -I.. 
+LDIRS= -L.. -L${DESTDIR}lib -L${DESTDIR}lib/afs  
+LIBS= ${DESTDIR}lib/afs/libcmd.a  ../librx.a ${DESTDIR}lib/liblwp.a \
+        ${DESTDIR}/lib/util.a ${DESTDIR}/lib/afs/libsys.a ${XLIBS}
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${LIBS} ${XCFLAGS}
+
+RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o
+
+BASICINCLS =  ../rx_clock.h ../rx_queue.h ../rx_event.h
+
+LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
+
+TESTS = testclient testserver kstest kctest testqueue tableGen generator
+
+TH_TESTS = th_testserver th_testclient
+
+.IGNORE: 
+
+system all: test
+
+test tests: ${TESTS}
+
+th_test th_tests: ${TH_TESTS}
+
+testclient: ../librx.a testclient.o
+       -${LINK}
+
+testserver: ../librx.a testserver.o
+       -${LINK}
+
+kstest: ../librx.a kstest.o
+       -${LINK}
+
+kctest: ../librx.a kctest.o
+       -${LINK}
+
+# th_ versions only have link lines for Solaris now.
+th_testclient: th_testclient.o ../../libafsrpc/libafsrpc.so 
+       ${CC} ${CFLAGS} -mt -o th_testclient th_testclient.o \
+               ../../libafsrpc/libafsrpc.so -lpthread
+
+th_testclient.o: testclient.c
+       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testclient.o \
+               testclient.c
+
+th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so 
+       ${CC} ${CFLAGS} -mt -o th_testserver th_testserver.o \
+               ../../libafsrpc/libafsrpc.so -lpthread
+
+th_testserver.o: testserver.c
+       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testserver.o \
+               testserver.c
+
+testqueue: ../librx.a testqueue.o
+       -${LINK}
+
+${RXTESTOBJS}: ${BASICINCLS} ../rx.h
+
+clean:
+       rm -f *.o *.a ${TESTS} ${TH_TESTS} core
diff --git a/src/rxgen/Makefile b/src/rxgen/Makefile
deleted file mode 100644 (file)
index bf186b8..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# @(#)Makefile 1.2 87/11/09 3.9 RPCSRC
-#
-# Makefile for rpc protocol compiler
-# Copyright (C) 1987, Sun Microsystems, Inc.
-#
-SHELL = /bin/sh
-COMPONENT=rxgen
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR=../libuafs/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \
-       rpc_svcout.c rpc_clntout.c
-HDRS= rpc_util.h rpc_parse.h rpc_scan.h
-OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
-       rpc_svcout.o rpc_clntout.o
-
-GOAL=rxgen
-CFLAGS = ${DBUG} -I. -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
-
-USNS=cellname
-SD=../../../src/CML
-VN=AFS_component_version_number
-ID=``
-
-include ../config/Makefile.version
-
-$(VN).o: $(VN).c
-
-.c.o:
-       $(SPEW) $(CC) $(CFLAGS) -c $<
-
-$(GOAL): $(OBJS) AFS_component_version_number.c
-       $(SPEW) $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
-
-all:   $(GOAL)
-
-system: install0
-
-kinstall: install0
-
-ukinstall webinstall: install0
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       $(INSTALL) rxgen_consts.h $(UKERNELDIR)afs
-
-$(DESTDIR)/bin/$(GOAL): $(GOAL)
-       @echo "Installing the Rx Protocol Compiler (rxgen)"
-       $(INSTALL) rxgen $(DESTDIR)bin
-
-install0: $(DESTDIR)/bin/$(GOAL)
-       $(INSTALL) rxgen_consts.h $(DESTDIR)include/afs
-
-install: install0 ukinstall
-
-lint: $(SRCS) $(HDRS)
-       lint $(SRCS)
-
-clean:
-       rm -f $(GOAL) $(OBJS) core AFS_component_version_number.c
-
-depend: $(SRCS) $(HDRS)
-       @${CC} ${CFLAGS} -M ${SRCS} > makedep
-       @echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       @echo '$$r makedep' >>eddep
-       @echo 'w' >>eddep
-       @cp Makefile makefile.bak
-       @ed - Makefile < eddep
-       @rm eddep makedep makefile.bak
-
-rpc_main.o: AFS_component_version_number.c
-# DO NOT DELETE THIS LINE
-rpc_main.o: rpc_main.c 
-rpc_main.o: ./rpc_util.h
-rpc_main.o: ./rpc_parse.h
-rpc_main.o: ./rpc_scan.h
-rpc_hout.o: rpc_hout.c
-rpc_hout.o: ./rpc_util.h
-rpc_hout.o: ./rpc_parse.h
-rpc_cout.o: rpc_cout.c
-rpc_cout.o: ./rpc_util.h
-rpc_cout.o: ./rpc_parse.h
-rpc_parse.o: rpc_parse.c
-rpc_parse.o: ./rpc_util.h
-rpc_parse.o: ./rpc_scan.h
-rpc_parse.o: ./rpc_parse.h
-rpc_scan.o: rpc_scan.c
-rpc_scan.o: ./rpc_scan.h
-rpc_scan.o: ./rpc_util.h
-rpc_util.o: rpc_util.c
-rpc_util.o: ./rpc_scan.h
-rpc_util.o: ./rpc_parse.h
-rpc_util.o: ./rpc_util.h
-rpc_svcout.o: rpc_svcout.c
-rpc_svcout.o: ./rpc_parse.h
-rpc_svcout.o: ./rpc_util.h
-rpc_clntout.o: rpc_clntout.c
-rpc_clntout.o: ./rpc_parse.h
-rpc_clntout.o: ./rpc_util.h
diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in
new file mode 100644 (file)
index 0000000..cb48bf1
--- /dev/null
@@ -0,0 +1,105 @@
+#
+# @(#)Makefile 1.2 87/11/09 3.9 RPCSRC
+#
+# Makefile for rpc protocol compiler
+# Copyright (C) 1987, Sun Microsystems, Inc.
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+UKERNELDIR=../libuafs/
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \
+       rpc_svcout.c rpc_clntout.c
+HDRS= rpc_util.h rpc_parse.h rpc_scan.h
+OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
+       rpc_svcout.o rpc_clntout.o
+
+GOAL=rxgen
+CFLAGS = ${DBUG} -I. -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+
+USNS=cellname
+SD=../../../src/CML
+VN=AFS_component_version_number
+ID=``
+
+include ../config/Makefile.version
+
+$(VN).o: $(VN).c
+
+.c.o:
+       $(SPEW) $(CC) $(CFLAGS) -c $<
+
+$(GOAL): $(OBJS) AFS_component_version_number.c
+       $(SPEW) $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
+
+all:   $(GOAL)
+
+system: install0
+
+kinstall: install0
+
+ukinstall webinstall: install0
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       $(INSTALL) rxgen_consts.h $(UKERNELDIR)afs
+
+$(DESTDIR)/bin/$(GOAL): $(GOAL)
+       @echo "Installing the Rx Protocol Compiler (rxgen)"
+       $(INSTALL) rxgen $(DESTDIR)bin
+
+install0: $(DESTDIR)/bin/$(GOAL)
+       $(INSTALL) rxgen_consts.h $(DESTDIR)include/afs
+
+install: install0 ukinstall
+
+lint: $(SRCS) $(HDRS)
+       lint $(SRCS)
+
+clean:
+       rm -f $(GOAL) $(OBJS) core AFS_component_version_number.c
+
+depend: $(SRCS) $(HDRS)
+       @${CC} ${CFLAGS} -M ${SRCS} > makedep
+       @echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
+       @echo '$$r makedep' >>eddep
+       @echo 'w' >>eddep
+       @cp Makefile makefile.bak
+       @ed - Makefile < eddep
+       @rm eddep makedep makefile.bak
+
+rpc_main.o: AFS_component_version_number.c
+# DO NOT DELETE THIS LINE
+rpc_main.o: rpc_main.c 
+rpc_main.o: ./rpc_util.h
+rpc_main.o: ./rpc_parse.h
+rpc_main.o: ./rpc_scan.h
+rpc_hout.o: rpc_hout.c
+rpc_hout.o: ./rpc_util.h
+rpc_hout.o: ./rpc_parse.h
+rpc_cout.o: rpc_cout.c
+rpc_cout.o: ./rpc_util.h
+rpc_cout.o: ./rpc_parse.h
+rpc_parse.o: rpc_parse.c
+rpc_parse.o: ./rpc_util.h
+rpc_parse.o: ./rpc_scan.h
+rpc_parse.o: ./rpc_parse.h
+rpc_scan.o: rpc_scan.c
+rpc_scan.o: ./rpc_scan.h
+rpc_scan.o: ./rpc_util.h
+rpc_util.o: rpc_util.c
+rpc_util.o: ./rpc_scan.h
+rpc_util.o: ./rpc_parse.h
+rpc_util.o: ./rpc_util.h
+rpc_svcout.o: rpc_svcout.c
+rpc_svcout.o: ./rpc_parse.h
+rpc_svcout.o: ./rpc_util.h
+rpc_clntout.o: rpc_clntout.c
+rpc_clntout.o: ./rpc_parse.h
+rpc_clntout.o: ./rpc_util.h
diff --git a/src/rxkad/Makefile b/src/rxkad/Makefile
deleted file mode 100644 (file)
index 622ce58..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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
-
-# */
-
-
-SHELL = /bin/sh
-COMPONENT=rxkad
-include ../config/Makefile.${SYS_NAME}
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS= ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       rxkad.h
-
-OBJS= rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o
-
-REGOBJS=fcrypt.o crypt_conn.o
-
-KSRCS=private_data.h fcrypt.h fcrypt.c crypt_conn.c rxkad_client.c rxkad_common.c rxkad.h sboxes.h
-
-UKSRCS=$(KSRCS) rxkad.h ticket.c rxkad_server.c lifetimes.h private_data.h rxkad_errs.c
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: librxkad.a
-
-system: install
-
-clean: 
-       rm -f *.o tcrypt core *.a rxkad_errs.c rxkad.h AFS_component_version_number.c crypt_conn.c fcrypt.c fcrypt.h sboxes.h
-
-librxkad.a: $(OBJS) ${REGOBJS} AFS_component_version_number.o
-       -rm -f librxkad.a
-       $(AR) rv librxkad.a $(OBJS) ${REGOBJS} AFS_component_version_number.o
-       $(RANLIB) librxkad.a
-
-crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS}
-
-rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
-
-rxkad_server.o: fcrypt.h private_data.h rxkad_server.c ${INCLS}
-
-rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS}
-
-rxkad_errs.o: rxkad_errs.c
-
-rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
-       rm -f rxkad.h rxkad_errs.c; ${COMPILE_ET} rxkad_errs -h rxkad
-
-ticket.o: ticket.c lifetimes.h ${INCLS}
-
-fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
-       ${CC} ${CFLAGS} -c fcrypt.c
-
-kinstall: ${KSRCS}
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afs
-
-ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afs
-       ${INSTALL} rxkad.h ${UKERNELDIR}rx
-
-install: all kinstall ukinstall
-       rm -f ${DESTDIR}lib/librxkad.a
-       ${INSTALL} librxkad.a ${DESTDIR}lib
-       ${INSTALL} rxkad.h ${DESTDIR}include/rx
-
-tcrypt: tcrypt.o librxkad.a 
-       ${CC} -o tcrypt tcrypt.o librxkad.a
-tcrypt.o: tcrypt.c AFS_component_version_number.o
-
-test:
-       cd test; $(MAKE)
-
-# These sources are kept in a separate directory so that we can use an
-# ACL to comply with source export restrictions.
-
-crypt_conn.c:  domestic/crypt_conn.c
-       rm -f $@
-       cp domestic/crypt_conn.c $@
-
-fcrypt.c:      domestic/fcrypt.c
-       rm -f $@
-       cp domestic/fcrypt.c $@
-
-fcrypt.h:      domestic/fcrypt.h
-       rm -f $@
-       cp domestic/fcrypt.h $@
-
-sboxes.h:      domestic/sboxes.h
-       rm -f $@
-       cp domestic/sboxes.h $@
-
-tcrypt.c:      domestic/tcrypt.c
-       rm -f $@
-       cp domestic/tcrypt.c $@
diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
new file mode 100644 (file)
index 0000000..9c32f56
--- /dev/null
@@ -0,0 +1,113 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+COMPILE_ET = ${SRCDIR}bin/compile_et
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+INCLS= ${SRCDIR}include/rx/rx.h \
+       ${SRCDIR}include/rx/xdr.h \
+       rxkad.h
+
+OBJS= rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o
+
+REGOBJS=fcrypt.o crypt_conn.o
+
+KSRCS=private_data.h fcrypt.h fcrypt.c crypt_conn.c rxkad_client.c rxkad_common.c rxkad.h sboxes.h
+
+UKSRCS=$(KSRCS) rxkad.h ticket.c rxkad_server.c lifetimes.h private_data.h rxkad_errs.c
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: librxkad.a
+
+system: install
+
+clean: 
+       rm -f *.o tcrypt core *.a rxkad_errs.c rxkad.h AFS_component_version_number.c crypt_conn.c fcrypt.c fcrypt.h sboxes.h
+
+librxkad.a: $(OBJS) ${REGOBJS} AFS_component_version_number.o
+       -rm -f librxkad.a
+       $(AR) rv librxkad.a $(OBJS) ${REGOBJS} AFS_component_version_number.o
+       $(RANLIB) librxkad.a
+
+crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS}
+
+rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
+
+rxkad_server.o: fcrypt.h private_data.h rxkad_server.c ${INCLS}
+
+rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS}
+
+rxkad_errs.o: rxkad_errs.c
+
+rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
+       rm -f rxkad.h rxkad_errs.c; ${COMPILE_ET} rxkad_errs -h rxkad
+
+ticket.o: ticket.c lifetimes.h ${INCLS}
+
+fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
+       ${CC} ${CFLAGS} -c fcrypt.c
+
+kinstall: ${KSRCS}
+       ${INSTALL} $(KSRCS) ${KERNELDIR}afs
+
+ukinstall webinstall: ${UKSRCS}
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       set ${UKERNELDIR}rx; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afs
+       ${INSTALL} rxkad.h ${UKERNELDIR}rx
+
+install: all kinstall ukinstall
+       rm -f ${DESTDIR}lib/librxkad.a
+       ${INSTALL} librxkad.a ${DESTDIR}lib
+       ${INSTALL} rxkad.h ${DESTDIR}include/rx
+
+tcrypt: tcrypt.o librxkad.a 
+       ${CC} -o tcrypt tcrypt.o librxkad.a
+tcrypt.o: tcrypt.c AFS_component_version_number.o
+
+test:
+       cd test; $(MAKE)
+
+# These sources are kept in a separate directory so that we can use an
+# ACL to comply with source export restrictions.
+
+crypt_conn.c:  domestic/crypt_conn.c
+       rm -f $@
+       cp domestic/crypt_conn.c $@
+
+fcrypt.c:      domestic/fcrypt.c
+       rm -f $@
+       cp domestic/fcrypt.c $@
+
+fcrypt.h:      domestic/fcrypt.h
+       rm -f $@
+       cp domestic/fcrypt.h $@
+
+sboxes.h:      domestic/sboxes.h
+       rm -f $@
+       cp domestic/sboxes.h $@
+
+tcrypt.c:      domestic/tcrypt.c
+       rm -f $@
+       cp domestic/tcrypt.c $@
diff --git a/src/rxkad/test/Makefile b/src/rxkad/test/Makefile
deleted file mode 100644 (file)
index ebca710..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-
-BACKDIR=../../../../PARENT/dest/
-include ../../config/Makefile.${SYS_NAME}
-
-OPTIMIZE=-g
-
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-
-HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
-
-LDIR= ${DESTDIR}lib/
-ULIBS = ${LDIR}afs/libcmd.a ${LDIR}afs/libcom_err.a ${DESTDIR}lib/afs/util.a
-
-LIBS = ../librxkad.a  ${LDIR}librx.a ${LDIR}libdes.a \
-       ${LDIR}liblwp.a  ${ULIBS} ${XLIBS}
-
-LIBRPC = ../../librpc/libafsrpc.so
-THLIBS= ${LDIR}afs/libcmd.a  ${LDIR}afs/libcom_err.a \
-       ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS}  ${XCFLAGS}
-
-
-THFLAGS = -mt -DAFS_PTHREAD_ENV
-
-THRULE = ${CC} ${CFLAGS} ${THFLAGS} -c $?
-
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-noversion all test system: stress
-
-clean:
-       rm -f *.o stress.cs.c stress.ss.c stress.xdr.c stress.h \
-               stress_errs.c stress_errs.h stress th_*
-
-stress.ss.o: stress.ss.c
-stress.cs.o: stress.cs.c
-stress.xdr.o: stress.xdr.c stress.h
-
-th_stress.ss.o: stress.ss.c
-       ${THRULE} -o th_stress.ss.o
-
-th_stress.cs.o: stress.cs.c
-       ${THRULE} -o th_stress.cs.o
-       
-th_stress.xdr.o: stress.xdr.c stress.h
-       ${THRULE} -o th_stress.xdr.o
-
-stress.ss.c stress.cs.c stress.xdr.c stress.h: stress.rg
-       ${SRCDIR}bin/rxgen stress.rg
-
-stress_errs.o: stress_errs.c
-
-th_stress_errs.o: stress_errs.c
-       ${THRULE} -o th_stress_errs.o
-
-stress_errs.c stress_errs.h: stress_errs.et
-       rm -f stress_errs.h stress_errs.c; ${COMPILE_ET} stress_errs -h stress_errs
-
-stress.o stress_c.o stress_s.o: ${HEADERS}
-
-th_stress.o: stress.c ${HEADERS}
-       ${THRULE} -o th_stress.o
-
-th_stress_c.o: stress_c.c ${HEADERS}
-       ${THRULE} -o th_stress_c.o
-
-th_stress_s.o: stress_s.c ${HEADERS}
-       ${THRULE} -o th_stress_s.o
-
-stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \
-               stress.ss.o stress_errs.o 
-       $(CC) $(CFLAGS) -o stress stress.o stress.xdr.o stress_c.o \
-               stress_s.o stress.cs.o stress.ss.o stress_errs.o ${LIBS}
-
-th_stress: th_stress.o th_stress.xdr.o th_stress_c.o th_stress_s.o \
-               th_stress.cs.o th_stress.ss.o stress_errs.o \
-               ${LIBRPC}
-       ${CC} ${CFLAGS} ${THFLAGS} -o th_stress th_stress.o th_stress.xdr.o \
-               th_stress_c.o th_stress_s.o th_stress.cs.o th_stress.ss.o \
-               stress_errs.o ${THLIBS}
-
diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
new file mode 100644 (file)
index 0000000..851df14
--- /dev/null
@@ -0,0 +1,93 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+BACKDIR=../../../../PARENT/dest/
+include ../../config/Makefile.${SYS_NAME}
+
+OPTIMIZE=-g
+
+INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+
+HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
+
+LDIR= ${DESTDIR}lib/
+ULIBS = ${LDIR}afs/libcmd.a ${LDIR}afs/libcom_err.a ${DESTDIR}lib/afs/util.a
+
+LIBS = ../librxkad.a  ${LDIR}librx.a ${LDIR}libdes.a \
+       ${LDIR}liblwp.a  ${ULIBS} ${XLIBS}
+
+LIBRPC = ../../librpc/libafsrpc.so
+THLIBS= ${LDIR}afs/libcmd.a  ${LDIR}afs/libcom_err.a \
+       ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS}  ${XCFLAGS}
+
+
+THFLAGS = -mt -DAFS_PTHREAD_ENV
+
+THRULE = ${CC} ${CFLAGS} ${THFLAGS} -c $?
+
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+noversion all test system: stress
+
+clean:
+       rm -f *.o stress.cs.c stress.ss.c stress.xdr.c stress.h \
+               stress_errs.c stress_errs.h stress th_*
+
+stress.ss.o: stress.ss.c
+stress.cs.o: stress.cs.c
+stress.xdr.o: stress.xdr.c stress.h
+
+th_stress.ss.o: stress.ss.c
+       ${THRULE} -o th_stress.ss.o
+
+th_stress.cs.o: stress.cs.c
+       ${THRULE} -o th_stress.cs.o
+       
+th_stress.xdr.o: stress.xdr.c stress.h
+       ${THRULE} -o th_stress.xdr.o
+
+stress.ss.c stress.cs.c stress.xdr.c stress.h: stress.rg
+       ${SRCDIR}bin/rxgen stress.rg
+
+stress_errs.o: stress_errs.c
+
+th_stress_errs.o: stress_errs.c
+       ${THRULE} -o th_stress_errs.o
+
+stress_errs.c stress_errs.h: stress_errs.et
+       rm -f stress_errs.h stress_errs.c; ${COMPILE_ET} stress_errs -h stress_errs
+
+stress.o stress_c.o stress_s.o: ${HEADERS}
+
+th_stress.o: stress.c ${HEADERS}
+       ${THRULE} -o th_stress.o
+
+th_stress_c.o: stress_c.c ${HEADERS}
+       ${THRULE} -o th_stress_c.o
+
+th_stress_s.o: stress_s.c ${HEADERS}
+       ${THRULE} -o th_stress_s.o
+
+stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \
+               stress.ss.o stress_errs.o 
+       $(CC) $(CFLAGS) -o stress stress.o stress.xdr.o stress_c.o \
+               stress_s.o stress.cs.o stress.ss.o stress_errs.o ${LIBS}
+
+th_stress: th_stress.o th_stress.xdr.o th_stress_c.o th_stress_s.o \
+               th_stress.cs.o th_stress.ss.o stress_errs.o \
+               ${LIBRPC}
+       ${CC} ${CFLAGS} ${THFLAGS} -o th_stress th_stress.o th_stress.xdr.o \
+               th_stress_c.o th_stress_s.o th_stress.cs.o th_stress.ss.o \
+               stress_errs.o ${THLIBS}
+
diff --git a/src/rxstat/Makefile b/src/rxstat/Makefile
deleted file mode 100644 (file)
index 272ecc3..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
-RXGEN=${SRCDIR}bin/rxgen
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c
-
-CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o
-
-all: librxstat.a includes
-
-rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg
-       ${RXGEN} -x rxstat.xg
-
-librxstat.a: ${LIBOBJS} AFS_component_version_number.o
-       -rm -f $@
-       $(AR) rv $@ AFS_component_version_number.o ${LIBOBJS}
-       $(RANLIB) $@
-
-kinstall: ${KSRCS} 
-       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${KSRCS} ${KERNELDIR}afsint
-
-ukinstall webinstall:  ${KSRCS}
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${KSRCS} ${UKERNELDIR}afsint
-
-Krxstat.cs.c: rxstat.xg
-       ${RXGEN} -x -k -C -o $@ rxstat.xg
-
-Krxstat.ss.c: rxstat.xg
-       ${RXGEN} -x -k -S -o $@ rxstat.xg
-
-Krxstat.xdr.c: rxstat.xg
-       ${RXGEN} -x -k -c -o $@ rxstat.xg
-
-install: librxstat.a includes kinstall ukinstall
-       ${INSTALL} librxstat.a ${DESTDIR}lib
-
-includes: rxstat.h
-       ${INSTALL} rxstat.h ${DESTDIR}include/rx
-
-clean:
-       rm -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core *_component_version_number.c
diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in
new file mode 100644 (file)
index 0000000..921f879
--- /dev/null
@@ -0,0 +1,62 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+KERNELDIR = ../libafs/
+UKERNELDIR = ../libuafs/
+RXGEN=${SRCDIR}bin/rxgen
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c
+
+CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o
+
+all: librxstat.a includes
+
+rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg
+       ${RXGEN} -x rxstat.xg
+
+librxstat.a: ${LIBOBJS} AFS_component_version_number.o
+       -rm -f $@
+       $(AR) rv $@ AFS_component_version_number.o ${LIBOBJS}
+       $(RANLIB) $@
+
+kinstall: ${KSRCS} 
+       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${KSRCS} ${KERNELDIR}afsint
+
+ukinstall webinstall:  ${KSRCS}
+       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${KSRCS} ${UKERNELDIR}afsint
+
+Krxstat.cs.c: rxstat.xg
+       ${RXGEN} -x -k -C -o $@ rxstat.xg
+
+Krxstat.ss.c: rxstat.xg
+       ${RXGEN} -x -k -S -o $@ rxstat.xg
+
+Krxstat.xdr.c: rxstat.xg
+       ${RXGEN} -x -k -c -o $@ rxstat.xg
+
+install: librxstat.a includes kinstall ukinstall
+       ${INSTALL} librxstat.a ${DESTDIR}lib
+
+includes: rxstat.h
+       ${INSTALL} rxstat.h ${DESTDIR}include/rx
+
+clean:
+       rm -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core *_component_version_number.c
diff --git a/src/scout/Makefile b/src/scout/Makefile
deleted file mode 100644 (file)
index 0f567a0..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
-
-# Makefile for Scout, the AFS navigation and monitoring tool.
-SHELL = /bin/sh
-COMPONENT=scout
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS= ${DBUG} -I. \
-       -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
-       -I${SRCDIR} ${XCFLAGS}
-LDFLAGS = ${XLDFLAGS}
-
-#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
-RPCINCLS=
-
-INCLS=${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxwindows.h \
-       ${SRCDIR}include/afs/gtxcurseswin.h \
-       ${SRCDIR}include/afs/gtxdumbwin.h \
-       ${SRCDIR}include/afs/gtxX11win.h \
-       ${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxlightobj.h \
-       ${SRCDIR}include/afs/gtxtextobj.h \
-       ${SRCDIR}include/afs/gtxobjdict.h \
-       ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h
-LIBS=  ${SRCDIR}lib/afs/libgtx.a \
-       ${SRCDIR}lib/afs/libfsprobe.a \
-       ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/util.a
-
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS}
-
-include ../config/Makefile.version
-
-all: scout
-
-scout.o: scout.c ${INCLS} AFS_component_version_number.c
-
-scout: scout.o $(LIBS)
-       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${EXTRA_LIBS}
-
-#
-# Misc others
-#
-system: install
-
-install: all
-       ${INSTALL} scout ${DESTDIR}bin
-
-clean:
-       rm -f  *.o scout core AFS_component_version_number.c
diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in
new file mode 100644 (file)
index 0000000..bcd14f5
--- /dev/null
@@ -0,0 +1,82 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+# Makefile for Scout, the AFS navigation and monitoring tool.
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS= ${DBUG} -I. \
+       -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include \
+       -I${SRCDIR}include/afs \
+       -I${SRCDIR} ${XCFLAGS}
+LDFLAGS = ${XLDFLAGS}
+
+#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
+RPCINCLS=
+
+INCLS=${SRCDIR}include/afs/gtxobjects.h \
+       ${SRCDIR}include/afs/gtxwindows.h \
+       ${SRCDIR}include/afs/gtxcurseswin.h \
+       ${SRCDIR}include/afs/gtxdumbwin.h \
+       ${SRCDIR}include/afs/gtxX11win.h \
+       ${SRCDIR}include/afs/gtxobjects.h \
+       ${SRCDIR}include/afs/gtxlightobj.h \
+       ${SRCDIR}include/afs/gtxtextobj.h \
+       ${SRCDIR}include/afs/gtxobjdict.h \
+       ${RPCINCLS} \
+       ${SRCDIR}include/afs/keys.h \
+       ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/afs/cmd.h
+LIBS=  ${SRCDIR}lib/afs/libgtx.a \
+       ${SRCDIR}lib/afs/libfsprobe.a \
+       ${SRCDIR}lib/afs/libvolser.a \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
+        ${SRCDIR}lib/afs/libvldb.a \
+        ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libafsint.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/libaudit.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/util.a
+
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS}
+
+include ../config/Makefile.version
+
+all: scout
+
+scout.o: scout.c ${INCLS} AFS_component_version_number.c
+
+scout: scout.o $(LIBS)
+       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${EXTRA_LIBS}
+
+#
+# Misc others
+#
+system: install
+
+install: all
+       ${INSTALL} scout ${DESTDIR}bin
+
+clean:
+       rm -f  *.o scout core AFS_component_version_number.c
diff --git a/src/sgistuff/Makefile b/src/sgistuff/Makefile
deleted file mode 100644 (file)
index 3497313..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-#
-# This must be built after inetd has built ta-rauth.o and after rsh
-# XXX want these to end up in /usr/afsws ...
-# Note that if afskauthlib.so gets installed on a client
-# machine then that will be used ..
-#
-include ../config/Makefile.${SYS_NAME}
-OPTIMIZE=-g
-CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LDFLAGS = ${OPTIMIZE} ${XLDFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-AUTHFILES=../inetd/ta-rauth.o ../rsh/rcmd.o ../rsh/herror.o
-AUTHLIBS=afsauthlib.so afskauthlib.so
-TARGETS=$(AUTHLIBS) 
-
-default:$(TARGETS)
-       ${INSTALL} afsauthlib.so ${DESTDIR}root.client/usr/vice/etc
-       ${INSTALL} afskauthlib.so ${DESTDIR}root.client/usr/vice/etc
-
-all:$(TARGETS)
-
-install install.noversion: all default
-
-clean:
-       rm -f $(AUTHLIBS) $(AUTHFILES) 
-
-afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES}
-       $(LD) ${LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES}
-
-afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES}
-       $(LD) ${LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES}
-
-../inetd/ta-rauth.o: ../inetd/ta-rauth.c
-       (cd ../inetd ; $(MAKE) ta-rauth.o )
-
-../rsh/rcmd.o: ../rsh/rcmd.c
-       (cd ../rsh ; $(MAKE) rcmd.o )
-
-../rsh/herror.o: ../rsh/herror.c
-       (cd ../rsh ; $(MAKE) herror.o )
-
-sgi_auth.o: sgi_auth.c
-       ${CC} ${CFLAGS} -c sgi_auth.c
diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in
new file mode 100644 (file)
index 0000000..0e91ebe
--- /dev/null
@@ -0,0 +1,64 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+#
+# This must be built after inetd has built ta-rauth.o and after rsh
+# XXX want these to end up in /usr/afsws ...
+# Note that if afskauthlib.so gets installed on a client
+# machine then that will be used ..
+#
+include ../config/Makefile.${SYS_NAME}
+OPTIMIZE=-g
+CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS = ${OPTIMIZE} ${XLDFLAGS}
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+AUTHFILES=../inetd/ta-rauth.o ../rsh/rcmd.o ../rsh/herror.o
+AUTHLIBS=afsauthlib.so afskauthlib.so
+TARGETS=$(AUTHLIBS) 
+
+default:$(TARGETS)
+       ${INSTALL} afsauthlib.so ${DESTDIR}root.client/usr/vice/etc
+       ${INSTALL} afskauthlib.so ${DESTDIR}root.client/usr/vice/etc
+
+all:$(TARGETS)
+
+install install.noversion: all default
+
+clean:
+       rm -f $(AUTHLIBS) $(AUTHFILES) 
+
+afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES}
+       $(LD) ${LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES}
+
+afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES}
+       $(LD) ${LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES}
+
+../inetd/ta-rauth.o: ../inetd/ta-rauth.c
+       (cd ../inetd ; $(MAKE) ta-rauth.o )
+
+../rsh/rcmd.o: ../rsh/rcmd.c
+       (cd ../rsh ; $(MAKE) rcmd.o )
+
+../rsh/herror.o: ../rsh/herror.c
+       (cd ../rsh ; $(MAKE) herror.o )
+
+sgi_auth.o: sgi_auth.c
+       ${CC} ${CFLAGS} -c sgi_auth.c
diff --git a/src/sia/Makefile b/src/sia/Makefile
deleted file mode 100644 (file)
index 826bdac..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-
-# */
-
-
-SHELL = /bin/sh
-COMPONENT=sia
-DEBUG = 
-#UNRESOLVED = -expect_unresolved \*
-UNRESOLVED =
-include ../config/Makefile.${SYS_NAME}
-
-LIBS1 = ${DESTDIR}/lib/libubik.a        ${DESTDIR}/lib/afs/libprot.a 
-LIBS2 = ${DESTDIR}/lib/librxkad.a       ${DESTDIR}/lib/afs/libaudit.a \
-       ${DESTDIR}/lib/librx.a          ${DESTDIR}/lib/liblwp.a \
-       ${DESTDIR}/lib/libdes.a         ${DESTDIR}/lib/afs/libcmd.a \
-       ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a \
-       ${DESTDIR}/lib/afs/libsys.a
-
-LIBS  = ${DESTDIR}/lib/afs/libkauth.a ${LIBS1}     ${DESTDIR}/lib/afs/libauth.a ${LIBS2}
-KLIBS = ${DESTDIR}/lib/afs/libkauth.krb.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.krb.a ${LIBS2}
-
-all: test-reauth ${DESTDIR}/lib/afs/libafssiad.so ${DESTDIR}/lib/afs/libafssiad.krb.so
-
-clean:
-       rm -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c
-
-CFLAGS = $(DEBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-${DESTDIR}/lib/afs/libafssiad.so: libafssiad.so
-       ${INSTALL} $? $@
-
-${DESTDIR}/lib/afs/libafssiad.krb.so: libafssiad.krb.so
-       ${INSTALL} $? $@
-
-siad.o: siad.c
-       $(CC) $(CFLAGS) -c -g siad.c -o siad.o
-
-siad_krb.o: siad.c
-       $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c -g siad.c -o siad_krb.o
-
-libafssiad.so: siad.o
-       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.so \
-                ${UNRESOLVED} siad.o ${LIBS} -none -lc
-
-libafssiad.krb.so: siad_krb.o
-       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.krb.so \
-                ${UNRESOLVED} siad_krb.o ${KLIBS} ${LIBS} -none -lc
-
-test-reauth: test-reauth.o
-       $(CC) $(CFLAGS) -g -o test-reauth test-reauth.o -lc
-
-install: all
-
-
-
diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in
new file mode 100644 (file)
index 0000000..4b9cc45
--- /dev/null
@@ -0,0 +1,65 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+DEBUG = 
+#UNRESOLVED = -expect_unresolved \*
+UNRESOLVED =
+include ../config/Makefile.${SYS_NAME}
+
+LIBS1 = ${DESTDIR}/lib/libubik.a        ${DESTDIR}/lib/afs/libprot.a 
+LIBS2 = ${DESTDIR}/lib/librxkad.a       ${DESTDIR}/lib/afs/libaudit.a \
+       ${DESTDIR}/lib/librx.a          ${DESTDIR}/lib/liblwp.a \
+       ${DESTDIR}/lib/libdes.a         ${DESTDIR}/lib/afs/libcmd.a \
+       ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a \
+       ${DESTDIR}/lib/afs/libsys.a
+
+LIBS  = ${DESTDIR}/lib/afs/libkauth.a ${LIBS1}     ${DESTDIR}/lib/afs/libauth.a ${LIBS2}
+KLIBS = ${DESTDIR}/lib/afs/libkauth.krb.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.krb.a ${LIBS2}
+
+all: test-reauth ${DESTDIR}/lib/afs/libafssiad.so ${DESTDIR}/lib/afs/libafssiad.krb.so
+
+clean:
+       rm -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c
+
+CFLAGS = $(DEBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+${DESTDIR}/lib/afs/libafssiad.so: libafssiad.so
+       ${INSTALL} $? $@
+
+${DESTDIR}/lib/afs/libafssiad.krb.so: libafssiad.krb.so
+       ${INSTALL} $? $@
+
+siad.o: siad.c
+       $(CC) $(CFLAGS) -c -g siad.c -o siad.o
+
+siad_krb.o: siad.c
+       $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c -g siad.c -o siad_krb.o
+
+libafssiad.so: siad.o
+       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.so \
+                ${UNRESOLVED} siad.o ${LIBS} -none -lc
+
+libafssiad.krb.so: siad_krb.o
+       $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.krb.so \
+                ${UNRESOLVED} siad_krb.o ${KLIBS} ${LIBS} -none -lc
+
+test-reauth: test-reauth.o
+       $(CC) $(CFLAGS) -g -o test-reauth test-reauth.o -lc
+
+install: all
+
+
+
diff --git a/src/sys/Makefile b/src/sys/Makefile
deleted file mode 100644 (file)
index d7b5c69..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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
-
-# System calls.
-
-SHELL = /bin/sh
-COMPONENT=sys
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-UKERNELDIR=../libuafs/
-CFLAGS= ${DBUG}  -I${TOP_SRCDIR}/config -I${SRCDIR}include  ${XCFLAGS} ${DBG_DEFS}
-SFLAGS=-P -I${SRCDIR}include  
-LIBS= libsys.a ${SRCDIR}lib/librx.a libsys.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
-UKSRCS=afsl.exp
-
-OBJECTS= afssyscalls.o syscall.o
-RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
-
-include ../config/Makefile.version
-
-all: libsys.a ${DESTDIR}etc/rmtsysd  ${DESTDIR}include/afs/afssyscalls.h \
-       ${DESTDIR}bin/pagsh  ${DESTDIR}bin/pagsh.krb
-
-${DESTDIR}etc/rmtsysd: rmtsysd
-       ${INSTALL} -s rmtsysd ${DESTDIR}etc/rmtsysd
-
-${DESTDIR}bin/pagsh: pagsh
-       ${INSTALL} -s pagsh ${DESTDIR}bin/pagsh
-
-${DESTDIR}bin/pagsh.krb: pagsh.krb
-       ${INSTALL} -s pagsh.krb ${DESTDIR}bin/pagsh.krb
-
-${DESTDIR}include/afs/afssyscalls.h: afssyscalls.h
-       ${INSTALL} afssyscalls.h ${DESTDIR}include/afs/afssyscalls.h
-
-libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
-       -rm -f libsys.a
-       ${AR} r libsys.a ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
-       $(RANLIB) libsys.a
-       case "${SYS_NAME}" in                           \
-           rs_aix*)            \
-               ${AR} r libsys.a afsl.exp;;             \
-       esac
-
-system: install
-
-kinstall:
-       case "${SYS_NAME}" in                           \
-           rs_aix*)                    \
-               ${INSTALL} afs.exp ${DESTDIR}lib/afs;;  \
-           sgi_6? ) \
-               ${INSTALL} xfsattrs.h ../libafs/afs;; \
-           *)                                          \
-               echo No $@ source here;;                \
-       esac
-
-install: all kinstall ukinstall
-       ${INSTALL} libsys.a ${DESTDIR}lib/afs
-       case "${SYS_NAME}" in \
-       sgi_6? ) \
-               ${INSTALL} xfsattrs.h ${DESTDIR}include/afs;; \
-       esac
-
-ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
-
-syscall.o: syscall.s
-       case "$(SYS_NAME)" in \
-        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-               /usr/ccs/lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
-               as -o syscall.o syscall.ss;             \
-               rm syscall.ss;;                         \
-        sgi_* |ppc_darwin* ) \
-                ${CC} ${CFLAGS} -c syscall.s;;          \
-        alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER syscall.s; \
-               ${AS} -o syscall.o syscall.i; \
-               rm -f syscall.ss syscall.i;; \
-        hp_ux11? ) \
-               touch syscall.o;; \
-       i386_fbsd* ) \
-               touch syscall.o;; \
-        *) \
-               /lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
-               as -o syscall.o syscall.ss;             \
-               rm syscall.ss;;                         \
-       esac
-
-
-afssyscalls.o: afssyscalls.c afssyscalls.h
-       ${CC} ${CFLAGS} -c afssyscalls.c
-
-rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
-rmtsysd: AFS_component_version_number.o
-
-rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg
-       ${SRCDIR}bin/rxgen rmtsys.xg
-
-rmtsysd: rmtsysd.o libsys.a
-       ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
-
-
-pagsh: libsys.a AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c pagsh.c
-       ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS}
-
-pagsh.krb: libsys.a
-       ${CC} ${CFLAGS} -c pagsh.c -DAFS_KERBEROS_ENV 
-       ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${LIBS}
-
-# Test programs.
-
-iinc:  iinc.c 
-       case "${SYS_NAME}" in                           \
-           sgi_6*) \
-               $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \
-           *)                                          \
-               $(CC) -o iinc -I${SRCDIR}include iinc.c ${LIBS} ${XLIBS};; \
-       esac
-idec:  idec.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \
-           *)                                          \
-               $(CC) -o idec -I${SRCDIR}include idec.c ${LIBS} ${XLIBS};; \
-       esac
-icreate:icreate.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \
-           *)                                          \
-               $(CC) -o icreate -I${SRCDIR}include icreate.c ${XLIBS};; \
-       esac
-iopen: iopen.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \
-           *)                                          \
-               $(CC) -o iopen -I${SRCDIR}include iopen.c ${XLIBS};; \
-       esac
-iread: iread.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \
-           *)                                          \
-               ${CC} -o iread -I${SRCDIR}include iread.c ${XLIBS};; \
-       esac
-iwrite:        iwrite.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \
-           *)                                          \
-               ${CC} -o iwrite -I${SRCDIR}include iwrite.c ${XLIBS};; \
-       esac
-istat: istat.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-               sgi_6* ) \
-               $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \
-           *)                                          \
-               $(CC) -o istat -I${SRCDIR}include istat.c ${XLIBS};; \
-       esac
-fixit: fixit.c AFS_component_version_number.c
-       $(CC) -o fixit -IDEST/include fixit.c libsys.a 
-
-
-xfsinode: xfsinode.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in \
-               sgi_62 | sgi_64 ) \
-               $(CC) -o xfsinode ${CFLAGS} xfsinode.c libsys.a;; \
-       esac
-
-
-
-clean:
-       rm -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
-       rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
-       rmtsysd AFS_component_version_number.c pagsh pagsh.krb
-
-beancount:
-       wc -l *.c *.s
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
new file mode 100644 (file)
index 0000000..b9f9da0
--- /dev/null
@@ -0,0 +1,194 @@
+# 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
+
+# System calls.
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+UKERNELDIR=../libuafs/
+CFLAGS= ${DBUG}  -I${TOP_SRCDIR}/config -I${SRCDIR}include  ${XCFLAGS}
+SFLAGS=-P -I${SRCDIR}include  
+LIBS= libsys.a ${SRCDIR}lib/librx.a libsys.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
+UKSRCS=afsl.exp
+
+OBJECTS= afssyscalls.o syscall.o
+RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
+
+include ../config/Makefile.version
+
+all: libsys.a ${DESTDIR}etc/rmtsysd  ${DESTDIR}include/afs/afssyscalls.h \
+       ${DESTDIR}bin/pagsh  ${DESTDIR}bin/pagsh.krb
+
+${DESTDIR}etc/rmtsysd: rmtsysd
+       ${INSTALL} -s rmtsysd ${DESTDIR}etc/rmtsysd
+
+${DESTDIR}bin/pagsh: pagsh
+       ${INSTALL} -s pagsh ${DESTDIR}bin/pagsh
+
+${DESTDIR}bin/pagsh.krb: pagsh.krb
+       ${INSTALL} -s pagsh.krb ${DESTDIR}bin/pagsh.krb
+
+${DESTDIR}include/afs/afssyscalls.h: afssyscalls.h
+       ${INSTALL} afssyscalls.h ${DESTDIR}include/afs/afssyscalls.h
+
+libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
+       -rm -f libsys.a
+       ${AR} r libsys.a ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
+       $(RANLIB) libsys.a
+       case "${SYS_NAME}" in                           \
+           rs_aix*)            \
+               ${AR} r libsys.a afsl.exp;;             \
+       esac
+
+system: install
+
+kinstall:
+       case "${SYS_NAME}" in                           \
+           rs_aix*)                    \
+               ${INSTALL} afs.exp ${DESTDIR}lib/afs;;  \
+           sgi_6? ) \
+               ${INSTALL} xfsattrs.h ../libafs/afs;; \
+           *)                                          \
+               echo No $@ source here;;                \
+       esac
+
+install: all kinstall ukinstall
+       ${INSTALL} libsys.a ${DESTDIR}lib/afs
+       case "${SYS_NAME}" in \
+       sgi_6? ) \
+               ${INSTALL} xfsattrs.h ${DESTDIR}include/afs;; \
+       esac
+
+ukinstall webinstall: ${UKSRCS}
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
+
+syscall.o: syscall.s
+       case "$(SYS_NAME)" in \
+        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
+               /usr/ccs/lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
+               as -o syscall.o syscall.ss;             \
+               rm syscall.ss;;                         \
+        sgi_* |ppc_darwin* ) \
+                ${CC} ${CFLAGS} -c syscall.s;;          \
+        alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
+               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER syscall.s; \
+               ${AS} -o syscall.o syscall.i; \
+               rm -f syscall.ss syscall.i;; \
+        hp_ux11? ) \
+               touch syscall.o;; \
+       i386_fbsd* ) \
+               touch syscall.o;; \
+        *) \
+               /lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
+               as -o syscall.o syscall.ss;             \
+               rm syscall.ss;;                         \
+       esac
+
+
+afssyscalls.o: afssyscalls.c afssyscalls.h
+       ${CC} ${CFLAGS} -c afssyscalls.c
+
+rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
+rmtsysd: AFS_component_version_number.o
+
+rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg
+       ${SRCDIR}bin/rxgen rmtsys.xg
+
+rmtsysd: rmtsysd.o libsys.a
+       ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
+
+
+pagsh: libsys.a AFS_component_version_number.o
+       ${CC} ${CFLAGS} -c pagsh.c
+       ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS}
+
+pagsh.krb: libsys.a
+       ${CC} ${CFLAGS} -c pagsh.c -DAFS_KERBEROS_ENV 
+       ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${LIBS}
+
+# Test programs.
+
+iinc:  iinc.c 
+       case "${SYS_NAME}" in                           \
+           sgi_6*) \
+               $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \
+           *)                                          \
+               $(CC) -o iinc -I${SRCDIR}include iinc.c ${LIBS} ${XLIBS};; \
+       esac
+idec:  idec.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+           sgi_6* ) \
+               $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \
+           *)                                          \
+               $(CC) -o idec -I${SRCDIR}include idec.c ${LIBS} ${XLIBS};; \
+       esac
+icreate:icreate.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+           sgi_6* ) \
+               $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \
+           *)                                          \
+               $(CC) -o icreate -I${SRCDIR}include icreate.c ${XLIBS};; \
+       esac
+iopen: iopen.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+           sgi_6* ) \
+               $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \
+           *)                                          \
+               $(CC) -o iopen -I${SRCDIR}include iopen.c ${XLIBS};; \
+       esac
+iread: iread.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+           sgi_6* ) \
+               ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \
+           *)                                          \
+               ${CC} -o iread -I${SRCDIR}include iread.c ${XLIBS};; \
+       esac
+iwrite:        iwrite.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+           sgi_6* ) \
+               ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \
+           *)                                          \
+               ${CC} -o iwrite -I${SRCDIR}include iwrite.c ${XLIBS};; \
+       esac
+istat: istat.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in                           \
+               sgi_6* ) \
+               $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \
+           *)                                          \
+               $(CC) -o istat -I${SRCDIR}include istat.c ${XLIBS};; \
+       esac
+fixit: fixit.c AFS_component_version_number.c
+       $(CC) -o fixit -IDEST/include fixit.c libsys.a 
+
+
+xfsinode: xfsinode.c  AFS_component_version_number.c
+       case "${SYS_NAME}" in \
+               sgi_62 | sgi_64 ) \
+               $(CC) -o xfsinode ${CFLAGS} xfsinode.c libsys.a;; \
+       esac
+
+
+
+clean:
+       rm -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
+       rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
+       rmtsysd AFS_component_version_number.c pagsh pagsh.krb
+
+beancount:
+       wc -l *.c *.s
diff --git a/src/tbutc/Makefile b/src/tbutc/Makefile
deleted file mode 100644 (file)
index e26124c..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-# 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
-
-# */
-
-SHELL    =/bin/sh
-SRCDIR   =DEST/
-DESTDIR  =DEST/
-COMPONENT=tbutc
-
-include ../config/Makefile.${SYS_NAME}
-
-CC      =${MT_CC}
-CFLAGS  = ${DBG} -w -I${TOP_SRCDIR}/config ${MT_CFLAGS}
-
-LDFLAGS = ${DBG} ${XLDFLAGS}
-
-VICED   =../viced
-VLSERVER=../vlserver
-LWP     =../lwp
-LIBACL  =../libacl
-UTIL    =../util
-DIR     =../dir
-VOL     =../vol
-FSINT   =../fsint
-BUTM    =../butm
-BUTC    =../butc
-BUCOORD = ../bucoord
-VOLSER  = ../volser
-
-# ----------------------------------------------------------------
-# The default is to build butc without using the TSM API libraries. 
-# To build with TSM support, set XBSA_NOBUILD="". Be sure you have
-#  the TSM API version 3.7.1 installed.
-# ----------------------------------------------------------------
-XBSA_NOBUILD="true"
-
-BUCOORDOBJS=ubik_db_if.o ${BUCOORD}/volstub.o ${BUCOORD}/dlq.o \
-           ${BUCOORD}/status.o ${BUCOORD}/bucoord_errs.o
-
-VOLSERLIBOBJ=${VOLSER}/volint.cs.o  vsprocs.o              ${VOLSER}/vsutils.o \
-            ${VOLSER}/lockprocs.o  ${VOLSER}/volint.xdr.o ${VOLSER}/volerr.o \
-            ${VOLSER}/volint.ss.o  AFS_component_version_number.o 
-VOLSERLIBS=libvolser.a
-
-LWPOBJS    =lock.o
-
-BUTMOBJS   =file_tm.o
-BUTMLIBS   =libbutm.a
-BUTMINCLS  =${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
-BUTMINCLUDE=-I${SRCDIR}include
-
-BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
-           tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \
-            ${LWPOBJS} ${BUCOORDOBJS}
-BUTCINCLS  =${SRCDIR}include/afs/partition.h \
-           ${SRCDIR}include/afs/volume.h \
-           ${SRCDIR}include/afs/vlserver.h \
-           ${SRCDIR}include/rx/rx.h \
-           ${SRCDIR}include/rx/xdr.h \
-           ${SRCDIR}include/afs/keys.h \
-           ${SRCDIR}include/afs/cellconfig.h \
-           ${SRCDIR}include/ubik.h \
-           ${SRCDIR}include/afs/cmd.h \
-           ${SRCDIR}include/afs/butc.h \
-           ${SRCDIR}include/afs/tcdata.h \
-           ${SRCDIR}include/afs/bubasics.h \
-           ${SRCDIR}include/afs/butm.h
-BUTCINCLUDE=-I. -I${SRCDIR}include
-BUTCLIBS   =${SRCDIR}lib/afs/libbudb.a \
-           ${SRCDIR}lib/afs/libbubasics.a \
-           ${VOLSERLIBS} \
-            ${BUTMLIBS} \
-           ${SRCDIR}lib/afs/libvldb.a \
-           ${SRCDIR}/lib/libafsauthent.a \
-           ${SRCDIR}/lib/libafsrpc.a \
-            ${SRCDIR}lib/afs/libcmd.a \
-           ${SRCDIR}lib/afs/util.a \
-           ${SRCDIR}lib/afs/libusd.a \
-           ${SRCDIR}lib/afs/libprocmgmt.a \
-           ${SRCDIR}lib/librx.a
-
-include ../config/Makefile.version
-
-#----------------------------------------------- BUTC
-
-butc: pre ${BUTCOBJS} ${BUTCLIBS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCOBJS} ${BUTCLIBS} $$hdrdir ${MTLIBS} ${XLIBS} -o butc
-
-dbentries.o: ${BUTC}/dbentries.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dbentries.c
-
-tcprocs.o: ${BUTC}/tcprocs.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcprocs.c
-
-lwps.o: ${BUTC}/lwps.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/lwps.c
-
-tcmain.o: ${BUTC}/tcmain.c ${BUTCINCLS} AFS_component_version_number.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcmain.c
-
-list.o: ${BUTC}/list.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/list.c
-
-recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/recoverDb.c
-
-tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcudbprocs.c
-
-dump.o: ${BUTC}/dump.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dump.c
-
-tcstatus.o: ${BUTC}/tcstatus.c ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcstatus.c
-
-butc_xbsa.o: ${BUTC}/butc_xbsa.c ${BUTC}/butc_xbsa.h ${BUTCINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/butc_xbsa.c
-
-#----------------------------------------------- BUCOORD
-
-ubik_db_if.o: ${BUCOORD}/ubik_db_if.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUCOORD}/ubik_db_if.c
-
-#----------------------------------------------- VOLSER
-# Build the libvolser.a library here. The file compiled
-# for is is vsprocs.c. The rest are from the VOLSER dir.
-
-libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
-       -rm -f libvolser.a
-       ar rv libvolser.a ${VOLSERLIBOBJ}
-       $(RANLIB) libvolser.a
-
-vsprocs.o: ${VOLSER}/vsprocs.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${VOLSER}/vsprocs.c
-
-#----------------------------------------------- LWP
-
-lock.o: ${LWP}/lock.c
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${LWP}/lock.c
-
-#----------------------------------------------- BUTC
-
-file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
-       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
-       ${CC} ${CFLAGS} $$xbsaflags ${BUTMINCLUDE} $$hdrdir -c ${BUTM}/file_tm.c
-
-libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
-       -rm -f libbutm.a
-       ${AR} rv libbutm.a $(BUTMOBJS) AFS_component_version_number.o
-       ${RANLIB} libbutm.a
-
-#-----------------------------------------------
-clean:
-       rm -f *.o *.a core AFS_component_version_number.c butc
-
-pre:
-       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
-       else                                xbsaflags=""; \
-       fi; \
-       if [ "$$xbsaflags" = "" ]; then \
-               echo 'Will not build with XBSA'; \
-       else \
-               if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir="${XBSADIR}" ; \
-               else                               hdrdir="${XBSA_HDRDIR}" ; \
-               fi; \
-               if test "$$hdrdir" != "" -a ! -f "$$hdrdir/xbsa.h"; then \
-                       echo '*** This build of butc cannot support XBSA because'; \
-                       echo '*** the required header file "'$$hdrdir'/xbsa.h"'; \
-                       echo '*** does not exist. If you know the pathname to the'; \
-                       echo '*** header file, then use XBSA_HDRDIR="<path>" as a make'; \
-                       echo '*** argument.'; \
-                       echo '*** If you do not want to build an XBSA version of butc,'; \
-                       echo '*** then use XBSA_NOBUILD="true" as a make argument.'; \
-                       exit 2; \
-               else \
-                       echo 'Will use XBSA header files from "'$$hdrdir'" (XBSA_HDRDIR)'; \
-               fi; \
-       fi;
-
-all: butc ${BUTMLIBS}
-install install.noversion: all
-       ${INSTALL} butc ${DESTDIR}etc/butc
-
-noversion: install
-system: install
diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
new file mode 100644 (file)
index 0000000..995f791
--- /dev/null
@@ -0,0 +1,296 @@
+# 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
+
+# */
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL    =/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CC      =${MT_CC}
+CFLAGS  = ${DBG} -w -I${TOP_SRCDIR}/config ${MT_CFLAGS}
+
+LDFLAGS = ${DBG} ${XLDFLAGS}
+
+VICED   =../viced
+VLSERVER=../vlserver
+LWP     =../lwp
+LIBACL  =../libacl
+UTIL    =../util
+DIR     =../dir
+VOL     =../vol
+FSINT   =../fsint
+BUTM    =../butm
+BUTC    =../butc
+BUCOORD = ../bucoord
+VOLSER  = ../volser
+
+# ----------------------------------------------------------------
+# The default is to build butc without using the TSM API libraries. 
+# To build with TSM support, set XBSA_NOBUILD="". Be sure you have
+#  the TSM API version 3.7.1 installed.
+# ----------------------------------------------------------------
+XBSA_NOBUILD="true"
+
+BUCOORDOBJS=ubik_db_if.o ${BUCOORD}/volstub.o ${BUCOORD}/dlq.o \
+           ${BUCOORD}/status.o ${BUCOORD}/bucoord_errs.o
+
+VOLSERLIBOBJ=${VOLSER}/volint.cs.o  vsprocs.o              ${VOLSER}/vsutils.o \
+            ${VOLSER}/lockprocs.o  ${VOLSER}/volint.xdr.o ${VOLSER}/volerr.o \
+            ${VOLSER}/volint.ss.o  AFS_component_version_number.o 
+VOLSERLIBS=libvolser.a
+
+LWPOBJS    =lock.o
+
+BUTMOBJS   =file_tm.o
+BUTMLIBS   =libbutm.a
+BUTMINCLS  =${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
+BUTMINCLUDE=-I${SRCDIR}include
+
+BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
+           tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \
+            ${LWPOBJS} ${BUCOORDOBJS}
+BUTCINCLS  =${SRCDIR}include/afs/partition.h \
+           ${SRCDIR}include/afs/volume.h \
+           ${SRCDIR}include/afs/vlserver.h \
+           ${SRCDIR}include/rx/rx.h \
+           ${SRCDIR}include/rx/xdr.h \
+           ${SRCDIR}include/afs/keys.h \
+           ${SRCDIR}include/afs/cellconfig.h \
+           ${SRCDIR}include/ubik.h \
+           ${SRCDIR}include/afs/cmd.h \
+           ${SRCDIR}include/afs/butc.h \
+           ${SRCDIR}include/afs/tcdata.h \
+           ${SRCDIR}include/afs/bubasics.h \
+           ${SRCDIR}include/afs/butm.h
+BUTCINCLUDE=-I. -I${SRCDIR}include
+BUTCLIBS   =${SRCDIR}lib/afs/libbudb.a \
+           ${SRCDIR}lib/afs/libbubasics.a \
+           ${VOLSERLIBS} \
+            ${BUTMLIBS} \
+           ${SRCDIR}lib/afs/libvldb.a \
+           ${SRCDIR}/lib/libafsauthent.a \
+           ${SRCDIR}/lib/libafsrpc.a \
+            ${SRCDIR}lib/afs/libcmd.a \
+           ${SRCDIR}lib/afs/util.a \
+           ${SRCDIR}lib/afs/libusd.a \
+           ${SRCDIR}lib/afs/libprocmgmt.a \
+           ${SRCDIR}lib/librx.a
+
+include ../config/Makefile.version
+
+#----------------------------------------------- BUTC
+
+butc: pre ${BUTCOBJS} ${BUTCLIBS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCOBJS} ${BUTCLIBS} $$hdrdir ${MTLIBS} ${XLIBS} -o butc
+
+dbentries.o: ${BUTC}/dbentries.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dbentries.c
+
+tcprocs.o: ${BUTC}/tcprocs.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcprocs.c
+
+lwps.o: ${BUTC}/lwps.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/lwps.c
+
+tcmain.o: ${BUTC}/tcmain.c ${BUTCINCLS} AFS_component_version_number.c
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcmain.c
+
+list.o: ${BUTC}/list.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/list.c
+
+recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/recoverDb.c
+
+tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcudbprocs.c
+
+dump.o: ${BUTC}/dump.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/dump.c
+
+tcstatus.o: ${BUTC}/tcstatus.c ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/tcstatus.c
+
+butc_xbsa.o: ${BUTC}/butc_xbsa.c ${BUTC}/butc_xbsa.h ${BUTCINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUTC}/butc_xbsa.c
+
+#----------------------------------------------- BUCOORD
+
+ubik_db_if.o: ${BUCOORD}/ubik_db_if.c
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${BUCOORD}/ubik_db_if.c
+
+#----------------------------------------------- VOLSER
+# Build the libvolser.a library here. The file compiled
+# for is is vsprocs.c. The rest are from the VOLSER dir.
+
+libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
+       -rm -f libvolser.a
+       ar rv libvolser.a ${VOLSERLIBOBJ}
+       $(RANLIB) libvolser.a
+
+vsprocs.o: ${VOLSER}/vsprocs.c
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${VOLSER}/vsprocs.c
+
+#----------------------------------------------- LWP
+
+lock.o: ${LWP}/lock.c
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTCINCLUDE} $$hdrdir -c ${LWP}/lock.c
+
+#----------------------------------------------- BUTC
+
+file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir=-I"${XBSADIR}" ; \
+       else                               hdrdir=-I"${XBSA_HDRDIR}" ; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then hdrdir="" ; fi; \
+       ${CC} ${CFLAGS} $$xbsaflags ${BUTMINCLUDE} $$hdrdir -c ${BUTM}/file_tm.c
+
+libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
+       -rm -f libbutm.a
+       ${AR} rv libbutm.a $(BUTMOBJS) AFS_component_version_number.o
+       ${RANLIB} libbutm.a
+
+#-----------------------------------------------
+clean:
+       rm -f *.o *.a core AFS_component_version_number.c butc
+
+pre:
+       if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \
+       else                                xbsaflags=""; \
+       fi; \
+       if [ "$$xbsaflags" = "" ]; then \
+               echo 'Will not build with XBSA'; \
+       else \
+               if [ "${XBSA_HDRDIR}" = "" ]; then hdrdir="${XBSADIR}" ; \
+               else                               hdrdir="${XBSA_HDRDIR}" ; \
+               fi; \
+               if test "$$hdrdir" != "" -a ! -f "$$hdrdir/xbsa.h"; then \
+                       echo '*** This build of butc cannot support XBSA because'; \
+                       echo '*** the required header file "'$$hdrdir'/xbsa.h"'; \
+                       echo '*** does not exist. If you know the pathname to the'; \
+                       echo '*** header file, then use XBSA_HDRDIR="<path>" as a make'; \
+                       echo '*** argument.'; \
+                       echo '*** If you do not want to build an XBSA version of butc,'; \
+                       echo '*** then use XBSA_NOBUILD="true" as a make argument.'; \
+                       exit 2; \
+               else \
+                       echo 'Will use XBSA header files from "'$$hdrdir'" (XBSA_HDRDIR)'; \
+               fi; \
+       fi;
+
+all: butc ${BUTMLIBS}
+install install.noversion: all
+       ${INSTALL} butc ${DESTDIR}etc/butc
+
+noversion: install
+system: install
diff --git a/src/tsm41/Makefile b/src/tsm41/Makefile
deleted file mode 100644 (file)
index 9214e07..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
-
-include ../config/Makefile.${SYS_NAME}
-OPTIMIZE=-g
-CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
-AUTHLIBS=afs_dynamic_auth afs_dynamic_kerbauth
-IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp 
-LDFLAGS = -eafs_initialize ${IMPORTS}  -lsys -lcsys -lc
-
-install install.noversion: $(AUTHLIBS) 
-       ${INSTALL} afs_dynamic_auth ${DESTDIR}root.client/usr/vice/etc
-       ${INSTALL} afs_dynamic_kerbauth ${DESTDIR}root.client/usr/vice/etc
-clean:
-       rm -f $(AUTHLIBS) $(AUTHFILES) so_locations
-
-afs_dynamic_auth: aix41_auth.o ${AFSLIBS} ${AUTHFILES} 
-       $(LD) -o afs_dynamic_auth aix41_auth.o $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
-
-afs_dynamic_kerbauth: aix41_auth_krb.o ${KAFSLIBS} ${AUTHFILES}
-       $(LD) -o afs_dynamic_kerbauth aix41_auth_krb.o $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
-
-aix41_auth.o: aix41_auth.c
-       ${CC} ${CFLAGS} -c aix41_auth.c
-
-aix41_auth_krb.o: aix41_auth.c
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c aix41_auth.c -o aix41_auth_krb.o
diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
new file mode 100644 (file)
index 0000000..750bead
--- /dev/null
@@ -0,0 +1,45 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../config/Makefile.${SYS_NAME}
+OPTIMIZE=-g
+CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LIBDIR = ${DESTDIR}lib/
+AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
+KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
+         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
+         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
+          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
+AUTHLIBS=afs_dynamic_auth afs_dynamic_kerbauth
+IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp 
+LDFLAGS = -eafs_initialize ${IMPORTS}  -lsys -lcsys -lc
+
+install install.noversion: $(AUTHLIBS) 
+       ${INSTALL} afs_dynamic_auth ${DESTDIR}root.client/usr/vice/etc
+       ${INSTALL} afs_dynamic_kerbauth ${DESTDIR}root.client/usr/vice/etc
+clean:
+       rm -f $(AUTHLIBS) $(AUTHFILES) so_locations
+
+afs_dynamic_auth: aix41_auth.o ${AFSLIBS} ${AUTHFILES} 
+       $(LD) -o afs_dynamic_auth aix41_auth.o $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
+
+afs_dynamic_kerbauth: aix41_auth_krb.o ${KAFSLIBS} ${AUTHFILES}
+       $(LD) -o afs_dynamic_kerbauth aix41_auth_krb.o $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
+
+aix41_auth.o: aix41_auth.c
+       ${CC} ${CFLAGS} -c aix41_auth.c
+
+aix41_auth_krb.o: aix41_auth.c
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c aix41_auth.c -o aix41_auth_krb.o
diff --git a/src/tviced/Makefile b/src/tviced/Makefile
deleted file mode 100644 (file)
index 83bab93..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=tviced
-include ../config/Makefile.${SYS_NAME}
-
-CC=${MT_CC}
-INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}include -I${SRCDIR}include/afs
-CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG
-LDFLAGS=${DBG} ${XLDFLAGS}
-
-VICED=../viced
-VLSERVER=../vlserver
-LWP=../lwp
-LIBACL=../libacl
-UTIL=../util
-DIR=../dir
-VOL=../vol
-FSINT=../fsint
-
-VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o    
-
-VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o
-
-LWPOBJS=lock.o fasttime.o threadname.o
-
-LIBACLOBJS=aclprocs.o netprocs.o
-
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
-               volparse.o flipbase64.o
-
-DIROBJS=buffer.o dir.o salvage.o
-
-VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
-        clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o
-
-FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
-
-objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
-
-LIBS=  ${SRCDIR}lib/libafsauthent.a    \
-       ${SRCDIR}lib/libafsrpc.a \
-       ${SRCDIR}lib/afs/util.a
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: fileserver
-
-CRULE1=${CC} ${CFLAGS} -c $?
-
-viced.o: ${VICED}/viced.c
-       ${CRULE1}
-
-afsfileprocs.o: ${VICED}/afsfileprocs.c
-       ${CRULE1}
-
-host.o: ${VICED}/host.c
-       ${CRULE1}
-
-physio.o: ${VICED}/physio.c
-       ${CRULE1}
-
-callback.o: ${VICED}/callback.c
-       ${CRULE1}
-
-assert.o: ${UTIL}/assert.c
-       ${CRULE1};
-
-uuid.o: ${UTIL}/uuid.c
-       ${CRULE1};
-
-serverLog.o: ${UTIL}/serverLog.c
-       ${CRULE1};
-
-fileutil.o: ${UTIL}/fileutil.c
-       ${CRULE1};
-
-volparse.o: ${UTIL}/volparse.c
-       ${CRULE1};
-
-flipbase64.o: ${UTIL}/flipbase64.c
-       ${CRULE1};
-
-netutils.o: ${UTIL}/netutils.c
-       ${CRULE1};
-
-dirpath.o: ${UTIL}/dirpath.c
-       ${CRULE1};
-
-lock.o: ${LWP}/lock.c
-       ${CRULE1};
-
-fasttime.o: ${LWP}/fasttime.c
-       ${CRULE1};
-
-threadname.o: ${LWP}/threadname.c
-       ${CRULE1};
-
-aclprocs.o: ${LIBACL}/aclprocs.c
-       ${CRULE1}
-
-netprocs.o: ${LIBACL}/netprocs.c
-       ${CRULE1}
-
-vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
-       ${CRULE1}
-
-vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
-       ${CRULE1}
-
-buffer.o: ${DIR}/buffer.c
-       ${CRULE1}
-
-dir.o: ${DIR}/dir.c
-       ${CRULE1}
-
-salvage.o: ${DIR}/salvage.c
-       ${CRULE1}
-
-vnode.o: ${VOL}/vnode.c
-       ${CC} -c ${CFLAGS} ${VOL}/vnode.c
-
-volume.o: ${VOL}/volume.c
-       ${CC} -c ${CFLAGS} ${VOL}/volume.c
-
-vutil.o: ${VOL}/vutil.c
-       ${CC} -c ${CFLAGS} ${VOL}/vutil.c
-
-partition.o: ${VOL}/partition.c
-       ${CC} -c ${CFLAGS} ${VOL}/partition.c
-
-fssync.o: ${VOL}/fssync.c
-       ${CC} -c ${CFLAGS} ${VOL}/fssync.c
-
-purge.o: ${VOL}/purge.c
-       ${CC} -c ${CFLAGS} ${VOL}/purge.c
-
-clone.o: ${VOL}/clone.c
-       ${CC} -c ${CFLAGS} ${VOL}/clone.c
-
-nuke.o: ${VOL}/nuke.c
-       ${CC} -c ${CFLAGS} ${VOL}/nuke.c
-
-devname.o: ${VOL}/devname.c
-       ${CC} -c ${CFLAGS} ${VOL}/devname.c
-
-common.o: ${VOL}/common.c
-       ${CC} -c ${CFLAGS} ${VOL}/common.c
-
-listinodes.o: ${VOL}/listinodes.c
-       ${CC} -c ${CFLAGS} ${VOL}/listinodes.c
-
-ihandle.o: ${VOL}/ihandle.c
-       ${CC} -c ${CFLAGS} ${VOL}/ihandle.c
-
-namei_ops.o: ${VOL}/namei_ops.c
-       ${CC} -c ${CFLAGS} ${VOL}/namei_ops.c
-
-afsaux.o: ${FSINT}/afsaux.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsaux.c
-
-afscbint.cs.o: ${FSINT}/afscbint.cs.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.cs.c
-
-afscbint.ss.o: ${FSINT}/afscbint.ss.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.ss.c
-
-afsint.cs.o: ${FSINT}/afsint.cs.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.cs.c
-
-afsint.ss.o: ${FSINT}/afsint.ss.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.ss.c
-
-afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.xdr.c
-
-fileserver: callback_clean1 viced.o ${objects} ${LIBS}
-       ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MTLIBS} ${XLIBS}
-
-${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
-       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver
-
-install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
-
-system: install
-
-callback_clean1 callback_clean2: 
-       case ${SYS_NAME} in \
-       ncrx86_*) \
-               ${RM}  -f callback.o;\
-               echo ${RM} callback.o;;\
-       esac;
-
-lint:
-
-clean:
-       rm -f *.o fileserver core AFS_component_version_number.c
-
-beancount:
-       wc -l *.c *.h
diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
new file mode 100644 (file)
index 0000000..e7fd31b
--- /dev/null
@@ -0,0 +1,213 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CC=${MT_CC}
+INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}include -I${SRCDIR}include/afs
+CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG
+LDFLAGS=${DBG} ${XLDFLAGS}
+
+VICED=../viced
+VLSERVER=../vlserver
+LWP=../lwp
+LIBACL=../libacl
+UTIL=../util
+DIR=../dir
+VOL=../vol
+FSINT=../fsint
+
+VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o    
+
+VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o
+
+LWPOBJS=lock.o fasttime.o threadname.o
+
+LIBACLOBJS=aclprocs.o netprocs.o
+
+UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+               volparse.o flipbase64.o
+
+DIROBJS=buffer.o dir.o salvage.o
+
+VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
+        clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o
+
+FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
+
+objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
+        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+
+LIBS=  ${SRCDIR}lib/libafsauthent.a    \
+       ${SRCDIR}lib/libafsrpc.a \
+       ${SRCDIR}lib/afs/util.a
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: fileserver
+
+CRULE1=${CC} ${CFLAGS} -c $?
+
+viced.o: ${VICED}/viced.c
+       ${CRULE1}
+
+afsfileprocs.o: ${VICED}/afsfileprocs.c
+       ${CRULE1}
+
+host.o: ${VICED}/host.c
+       ${CRULE1}
+
+physio.o: ${VICED}/physio.c
+       ${CRULE1}
+
+callback.o: ${VICED}/callback.c
+       ${CRULE1}
+
+assert.o: ${UTIL}/assert.c
+       ${CRULE1};
+
+uuid.o: ${UTIL}/uuid.c
+       ${CRULE1};
+
+serverLog.o: ${UTIL}/serverLog.c
+       ${CRULE1};
+
+fileutil.o: ${UTIL}/fileutil.c
+       ${CRULE1};
+
+volparse.o: ${UTIL}/volparse.c
+       ${CRULE1};
+
+flipbase64.o: ${UTIL}/flipbase64.c
+       ${CRULE1};
+
+netutils.o: ${UTIL}/netutils.c
+       ${CRULE1};
+
+dirpath.o: ${UTIL}/dirpath.c
+       ${CRULE1};
+
+lock.o: ${LWP}/lock.c
+       ${CRULE1};
+
+fasttime.o: ${LWP}/fasttime.c
+       ${CRULE1};
+
+threadname.o: ${LWP}/threadname.c
+       ${CRULE1};
+
+aclprocs.o: ${LIBACL}/aclprocs.c
+       ${CRULE1}
+
+netprocs.o: ${LIBACL}/netprocs.c
+       ${CRULE1}
+
+vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
+       ${CRULE1}
+
+vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
+       ${CRULE1}
+
+buffer.o: ${DIR}/buffer.c
+       ${CRULE1}
+
+dir.o: ${DIR}/dir.c
+       ${CRULE1}
+
+salvage.o: ${DIR}/salvage.c
+       ${CRULE1}
+
+vnode.o: ${VOL}/vnode.c
+       ${CC} -c ${CFLAGS} ${VOL}/vnode.c
+
+volume.o: ${VOL}/volume.c
+       ${CC} -c ${CFLAGS} ${VOL}/volume.c
+
+vutil.o: ${VOL}/vutil.c
+       ${CC} -c ${CFLAGS} ${VOL}/vutil.c
+
+partition.o: ${VOL}/partition.c
+       ${CC} -c ${CFLAGS} ${VOL}/partition.c
+
+fssync.o: ${VOL}/fssync.c
+       ${CC} -c ${CFLAGS} ${VOL}/fssync.c
+
+purge.o: ${VOL}/purge.c
+       ${CC} -c ${CFLAGS} ${VOL}/purge.c
+
+clone.o: ${VOL}/clone.c
+       ${CC} -c ${CFLAGS} ${VOL}/clone.c
+
+nuke.o: ${VOL}/nuke.c
+       ${CC} -c ${CFLAGS} ${VOL}/nuke.c
+
+devname.o: ${VOL}/devname.c
+       ${CC} -c ${CFLAGS} ${VOL}/devname.c
+
+common.o: ${VOL}/common.c
+       ${CC} -c ${CFLAGS} ${VOL}/common.c
+
+listinodes.o: ${VOL}/listinodes.c
+       ${CC} -c ${CFLAGS} ${VOL}/listinodes.c
+
+ihandle.o: ${VOL}/ihandle.c
+       ${CC} -c ${CFLAGS} ${VOL}/ihandle.c
+
+namei_ops.o: ${VOL}/namei_ops.c
+       ${CC} -c ${CFLAGS} ${VOL}/namei_ops.c
+
+afsaux.o: ${FSINT}/afsaux.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afsaux.c
+
+afscbint.cs.o: ${FSINT}/afscbint.cs.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.cs.c
+
+afscbint.ss.o: ${FSINT}/afscbint.ss.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.ss.c
+
+afsint.cs.o: ${FSINT}/afsint.cs.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afsint.cs.c
+
+afsint.ss.o: ${FSINT}/afsint.ss.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afsint.ss.c
+
+afsint.xdr.o: ${FSINT}/afsint.xdr.c
+       ${CC} -c ${CFLAGS} ${FSINT}/afsint.xdr.c
+
+fileserver: callback_clean1 viced.o ${objects} ${LIBS}
+       ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MTLIBS} ${XLIBS}
+
+${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
+       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver
+
+install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
+
+system: install
+
+callback_clean1 callback_clean2: 
+       case ${SYS_NAME} in \
+       ncrx86_*) \
+               ${RM}  -f callback.o;\
+               echo ${RM} callback.o;;\
+       esac;
+
+lint:
+
+clean:
+       rm -f *.o fileserver core AFS_component_version_number.c
+
+beancount:
+       wc -l *.c *.h
diff --git a/src/ubik/Makefile b/src/ubik/Makefile
deleted file mode 100644 (file)
index 60100af..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=ubik
-include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}include ${XCFLAGS}
-UKERNELDIR=../libuafs/
-LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
-       ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
-       ubikclient.o uerrors.o
-INCLS= ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/lock.h ubik.h ubik_int.h
-LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
-     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libcmd.a \
-     ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/afs/libsys.a ${XLIBS}
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-UKSRCS=ubik.h ubikclient.c uerrors.c
-
-include ../config/Makefile.version
-
-all: libubik.a test
-
-test: utst_server utst_client udebug
-       ${INSTALL} udebug ${DESTDIR}bin
-       ${INSTALL} udebug ${DESTDIR}root.server/usr/afs/bin
-
-clean:
-       rm -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
-       rm -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
-
-system: install
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall: ${UKSRCS} Kubik_int.h Kubik_int.xdr.c Kubik_int.cs.c
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kubik_int.h ${UKERNELDIR}afsint/ubik_int.h
-       ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}afsint/ubik_int.cs.c
-       ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}afsint/ubik_int.xdr.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-beancount:
-       wc *.[ch] *.xg
-
-install: libubik.a ukinstall
-       ${INSTALL} libubik.a ${DESTDIR}lib
-       ${INSTALL} ubik.h ubik_int.h ${DESTDIR}include
-
-utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
-       ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
-
-utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a 
-       ${CC} ${CFLAGS} -o utst_client utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a $(LIBS)
-
-udebug: udebug.o libubik.a 
-       ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS)
-
-ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c ubik_int.h: ubik_int.xg
-       ${RXGEN} -x ubik_int.xg
-
-Kubik_int.cs.c: ubik_int.xg Kubik_int.h
-       ${RXGEN} -x -k -C -o Kubik_int.cs.c ubik_int.xg
-Kubik_int.xdr.c: ubik_int.xg
-       ${RXGEN} -x -k -c -o Kubik_int.xdr.c ubik_int.xg
-Kubik_int.h: ubik_int.xg
-       ${RXGEN} -x -k -h -o Kubik_int.h ubik_int.xg
-
-utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
-utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
-utst_int.xdr.o: utst_int.xdr.c utst_int.h
-utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg
-       ${RXGEN}  utst_int.xg
-
-utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
-utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c
-
-udebug.o: udebug.c ${INCLS} AFS_component_version_number.c
-       ${CC} ${CFLAGS} -g -I. -I${DESTDIR}/include -I${DESTDIR}/include/afs -I${DESTDIR}/ -c udebug.c
-
-uerrors.o: uerrors.c
-
-uerrors.c ubik.h: uerrors.et ubik.p.h
-       rm -f ubik.h uerrors.c; ${COMPILE_ET} uerrors -h ubik
-
-libubik.a: ${LIBOBJS} AFS_component_version_number.o
-       -rm -f $@
-       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) $@
-
-disk.o: disk.c ${INCLS}
-remote.o: remote.c ${INCLS}
-beacon.o: beacon.c ${INCLS}
-lock.o: lock.c ${INCLS}
-recovery.o: recovery.c ${INCLS}
-ubik.o: ubik.c ${INCLS}
-phys.o: phys.c ${INCLS}
-vote.o: vote.c ${INCLS}
-ubikcmd.o: ubikcmd.c ${INCLS}
-ubikclient.o: ubikclient.c ${INCLS}
-ubik_int.ss.o: ubik_int.ss.c ${INCLS}
-ubik_int.cs.o: ubik_int.cs.c ${INCLS}
-ubik_int.xdr.o: ubik_int.xdr.c ${INCLS}
-utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h
-utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h
-utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h 
-
-
-
-
-
diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
new file mode 100644 (file)
index 0000000..49fd405
--- /dev/null
@@ -0,0 +1,129 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}include ${XCFLAGS}
+UKERNELDIR=../libuafs/
+LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
+       ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
+       ubikclient.o uerrors.o
+INCLS= ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
+       ${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
+       ${SRCDIR}include/lock.h ubik.h ubik_int.h
+LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
+     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libcmd.a \
+     ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/afs/libsys.a ${XLIBS}
+RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+UKSRCS=ubik.h ubikclient.c uerrors.c
+
+include ../config/Makefile.version
+
+all: libubik.a test
+
+test: utst_server utst_client udebug
+       ${INSTALL} udebug ${DESTDIR}bin
+       ${INSTALL} udebug ${DESTDIR}root.server/usr/afs/bin
+
+clean:
+       rm -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
+       rm -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
+
+system: install
+
+kinstall:
+       @echo No $@ source here.
+
+ukinstall webinstall: ${UKSRCS} Kubik_int.h Kubik_int.xdr.c Kubik_int.cs.c
+       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
+       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kubik_int.h ${UKERNELDIR}afsint/ubik_int.h
+       ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}afsint/ubik_int.cs.c
+       ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}afsint/ubik_int.xdr.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+
+beancount:
+       wc *.[ch] *.xg
+
+install: libubik.a ukinstall
+       ${INSTALL} libubik.a ${DESTDIR}lib
+       ${INSTALL} ubik.h ubik_int.h ${DESTDIR}include
+
+utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
+       ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
+
+utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a 
+       ${CC} ${CFLAGS} -o utst_client utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a $(LIBS)
+
+udebug: udebug.o libubik.a 
+       ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS)
+
+ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c ubik_int.h: ubik_int.xg
+       ${RXGEN} -x ubik_int.xg
+
+Kubik_int.cs.c: ubik_int.xg Kubik_int.h
+       ${RXGEN} -x -k -C -o Kubik_int.cs.c ubik_int.xg
+Kubik_int.xdr.c: ubik_int.xg
+       ${RXGEN} -x -k -c -o Kubik_int.xdr.c ubik_int.xg
+Kubik_int.h: ubik_int.xg
+       ${RXGEN} -x -k -h -o Kubik_int.h ubik_int.xg
+
+utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
+utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
+utst_int.xdr.o: utst_int.xdr.c utst_int.h
+utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg
+       ${RXGEN}  utst_int.xg
+
+utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
+utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c
+
+udebug.o: udebug.c ${INCLS} AFS_component_version_number.c
+       ${CC} ${CFLAGS} -g -I. -I${DESTDIR}/include -I${DESTDIR}/include/afs -I${DESTDIR}/ -c udebug.c
+
+uerrors.o: uerrors.c
+
+uerrors.c ubik.h: uerrors.et ubik.p.h
+       rm -f ubik.h uerrors.c; ${COMPILE_ET} uerrors -h ubik
+
+libubik.a: ${LIBOBJS} AFS_component_version_number.o
+       -rm -f $@
+       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) $@
+
+disk.o: disk.c ${INCLS}
+remote.o: remote.c ${INCLS}
+beacon.o: beacon.c ${INCLS}
+lock.o: lock.c ${INCLS}
+recovery.o: recovery.c ${INCLS}
+ubik.o: ubik.c ${INCLS}
+phys.o: phys.c ${INCLS}
+vote.o: vote.c ${INCLS}
+ubikcmd.o: ubikcmd.c ${INCLS}
+ubikclient.o: ubikclient.c ${INCLS}
+ubik_int.ss.o: ubik_int.ss.c ${INCLS}
+ubik_int.cs.o: ubik_int.cs.c ${INCLS}
+ubik_int.xdr.o: ubik_int.xdr.c ${INCLS}
+utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h
+utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h
+utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h 
+
+
+
+
+
diff --git a/src/update/Makefile b/src/update/Makefile
deleted file mode 100644 (file)
index b4b45ec..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=update
-include ../config/Makefile.${SYS_NAME}
-
-LIBRX=${SRCDIR}lib/librx.a
-LIBS = ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a ${LIBRX} ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a 
-CFLAGS= ${DBUG}  -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
-
-PROGS=upclient upserver
-
-include ../config/Makefile.version
-
-all:  ${PROGS}
-
-upclient: client.o update.cs.o utils.o ${LIBS} 
-       ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS}
-
-upserver: server.o utils.o update.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o upserver server.o utils.o update.ss.o ${LIBS} ${XLIBS}
-
-utils.o: utils.c update.h global.h
-
-client.o server.o: update.h global.h AFS_component_version_number.c
-
-update.cs.c update.ss.c update.er.c update.h: update.xg
-       ${SRCDIR}bin/rxgen update.xg
-clean: 
-       rm -f upclient upserver *.o update.ss.c update.cs.c update.xdr.c update.h core\
-       AFS_component_version_number.c
-
-system: install
-install : all
-       ${INSTALL} upserver ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} upclient ${DESTDIR}root.server/usr/afs/bin
diff --git a/src/update/Makefile.in b/src/update/Makefile.in
new file mode 100644 (file)
index 0000000..3f18202
--- /dev/null
@@ -0,0 +1,49 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+LIBRX=${SRCDIR}lib/librx.a
+LIBS = ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/libdes.a ${LIBRX} ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
+       ${SRCDIR}lib/afs/libsys.a 
+CFLAGS= ${DBUG}  -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+
+PROGS=upclient upserver
+
+include ../config/Makefile.version
+
+all:  ${PROGS}
+
+upclient: client.o update.cs.o utils.o ${LIBS} 
+       ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS}
+
+upserver: server.o utils.o update.ss.o ${LIBS}
+       ${CC} ${CFLAGS} -o upserver server.o utils.o update.ss.o ${LIBS} ${XLIBS}
+
+utils.o: utils.c update.h global.h
+
+client.o server.o: update.h global.h AFS_component_version_number.c
+
+update.cs.c update.ss.c update.er.c update.h: update.xg
+       ${SRCDIR}bin/rxgen update.xg
+clean: 
+       rm -f upclient upserver *.o update.ss.c update.cs.c update.xdr.c update.h core\
+       AFS_component_version_number.c
+
+system: install
+install : all
+       ${INSTALL} upserver ${DESTDIR}root.server/usr/afs/bin
+       ${INSTALL} upclient ${DESTDIR}root.server/usr/afs/bin
diff --git a/src/usd/Makefile b/src/usd/Makefile
deleted file mode 100644 (file)
index a6cdad6..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=ptserver
-include ../config/Makefile.${SYS_NAME}
-
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-#####################################################################
-# include files
-INCLS=${SRCDIR}include/afs/param.h \
-       usd.h
-
-LINCLS=usd.h
-
-#####################################################################
-include ../config/Makefile.version
-
-clean:
-       $(RM) -f *.o libusd.a   \
-        core  AFS_component_version_number.c
-
-########################################################################
-# build libusd.a
-LIBOBJS=usd_file.o
-
-libusd.a: ${LIBOBJS} AFS_component_version_number.o
-       $(RM) -f libusd.a
-       $(AR) r libusd.a ${LIBOBJS} AFS_component_version_number.o
-       $(RANLIB) libusd.a
-
-usd_file.o: usd_file.c $(LINCLS)
-
-#######################################################################
-system: install
-
-kinstall:
-       @echo No kernel source here.
-
-
-${DESTDIR}lib/afs/libusd.a: libusd.a
-       ${INSTALL}   $? $@
-
-
-install: ${DESTDIR}lib/afs/libusd.a 
-       ${INSTALL} usd.h ${DESTDIR}include/afs
diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in
new file mode 100644 (file)
index 0000000..e7aadd2
--- /dev/null
@@ -0,0 +1,59 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+#####################################################################
+# include files
+INCLS=${SRCDIR}include/afs/param.h \
+       usd.h
+
+LINCLS=usd.h
+
+#####################################################################
+include ../config/Makefile.version
+
+clean:
+       $(RM) -f *.o libusd.a   \
+        core  AFS_component_version_number.c
+
+########################################################################
+# build libusd.a
+LIBOBJS=usd_file.o
+
+libusd.a: ${LIBOBJS} AFS_component_version_number.o
+       $(RM) -f libusd.a
+       $(AR) r libusd.a ${LIBOBJS} AFS_component_version_number.o
+       $(RANLIB) libusd.a
+
+usd_file.o: usd_file.c $(LINCLS)
+
+#######################################################################
+system: install
+
+kinstall:
+       @echo No kernel source here.
+
+
+${DESTDIR}lib/afs/libusd.a: libusd.a
+       ${INSTALL}   $? $@
+
+
+install: ${DESTDIR}lib/afs/libusd.a 
+       ${INSTALL} usd.h ${DESTDIR}include/afs
diff --git a/src/usd/test/Makefile b/src/usd/test/Makefile
deleted file mode 100644 (file)
index ffeab39..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-include ../../config/Makefile.${SYS_NAME}
-#include ../../config/Makefile.version
-
-INSTALL=${SRCDIR}bin/install
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-INCDIRS= -I${DESTDIR}include  -I.. -I${BACKDIR}include
-CFLAGS = $(DBUG) -I${SRCDIR}include ${INCDIRS} ${XCFLAGS}
-LIBUSD=DEST/lib/afs/libusd.a
-
-#####################################################################
-# include files
-INCLS=${SRCDIR}include/afs/param.h ${SRCDIR}include/afs/usd.h
-
-
-# build usd_test
-usd_test: usd_test.o ${LIBUSD} $(INCLS)
-       $(CC) ${CFLAGS} -o usd_test usd_test.o ${LIBUSD} ${XLIBS}
-
-usd_test.o: usd_test.c
-
-clean:
-       -rm  -f *.o usd_test \
-        core  AFS_component_version_number.c
-
-#######################################################################
-
-test tests: usd_test
-
-kinstall:
-       @echo No kernel source here.
-
-
-
-
diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in
new file mode 100644 (file)
index 0000000..095d347
--- /dev/null
@@ -0,0 +1,49 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
+#include ../../config/Makefile.version
+
+INSTALL=${SRCDIR}bin/install
+RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+INCDIRS= -I${DESTDIR}include  -I.. -I${BACKDIR}include
+CFLAGS = $(DBUG) -I${SRCDIR}include ${INCDIRS} ${XCFLAGS}
+LIBUSD=DEST/lib/afs/libusd.a
+
+#####################################################################
+# include files
+INCLS=${SRCDIR}include/afs/param.h ${SRCDIR}include/afs/usd.h
+
+
+# build usd_test
+usd_test: usd_test.o ${LIBUSD} $(INCLS)
+       $(CC) ${CFLAGS} -o usd_test usd_test.o ${LIBUSD} ${XLIBS}
+
+usd_test.o: usd_test.c
+
+clean:
+       -rm  -f *.o usd_test \
+        core  AFS_component_version_number.c
+
+#######################################################################
+
+test tests: usd_test
+
+kinstall:
+       @echo No kernel source here.
+
+
+
+
diff --git a/src/uss/Makefile b/src/uss/Makefile
deleted file mode 100644 (file)
index 9b044bb..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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
-
-# uss Makefile
-
-
-SHELL=/bin/sh
-COMPONENT=uss
-include ../config/Makefile.${SYS_NAME}
-
-#
-# This makefile creates the following things:
-#
-PROGRAMS = uss
-
-#
-# and here's what it uses to do so:
-#
-LIBS = ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libvldb.a  \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a\
-       ${SRCDIR}lib/afs/util.a \
-       ${XLIBS}
-
-CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I. ${XCFLAGS}
-OBJS =  uss_procs.o \
-       uss_common.o \
-       uss_vol.o \
-       uss_acl.o \
-       uss_ptserver.o \
-       uss_kauth.o \
-       uss_fs.o \
-       lex.yy.o \
-       y.tab.o 
-
-include ../config/Makefile.version
-
-#
-# Top-level options:
-#
-all :  ${PROGRAMS}
-
-install: all
-       ${INSTALL} uss ${DESTDIR}etc
-
-system: install
-
-clean:
-       rm -f *.o ${PROGRAMS} y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c
-
-###### uss program ######
-
-uss: uss.o  ${OBJS} 
-       ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS}
-
-uss.o:  uss.c AFS_component_version_number.c
-        ${CC} -c ${CFLAGS} uss.c
-
-###### common stuff ######
-
-uss_procs.o : uss_procs.c
-       ${CC} -c ${CFLAGS} uss_procs.c
-
-uss_common.o : uss_common.c
-       ${CC} -c ${CFLAGS} uss_common.c
-
-uss_vol.o : uss_vol.c
-       ${CC} -c ${CFLAGS} uss_vol.c
-
-uss_acl.o : uss_acl.c
-       ${CC} -c ${CFLAGS} uss_acl.c
-
-uss_ptserver.o : uss_ptserver.c
-       ${CC} -c ${CFLAGS} uss_ptserver.c
-
-uss_kauth.o : uss_kauth.c
-       ${CC} -c ${CFLAGS} uss_kauth.c
-
-uss_fs.o : uss_fs.c
-       ${CC} -c ${CFLAGS} uss_fs.c
-
-lex.yy.o : lex.yy.c y.tab.c
-       ${CC} -c ${CFLAGS} lex.yy.c
-
-lex.yy.c : lex.c
-       ${LEX} lex.c
-
-y.tab.o : y.tab.c
-       ${CC} -c ${CFLAGS} y.tab.c
-
-uss.c: uss_common.h uss_procs.h uss_kauth.h uss_fs.h
-
-uss_procs.c : uss_procs.h uss_common.h uss_acl.h
-
-uss_common.c : uss_common.h
-
-uss_vol.c : uss_vol.h uss_common.h uss_fs.h
-
-uss_acl.c : uss_acl.h uss_common.h uss_fs.h
-
-uss_ptserver.c: uss_ptserver.h
-
-uss_kauth.c: uss_kauth.h uss_common.h
-
-uss_fs.c: uss_fs.h
-
-y.tab.c : grammar.y
-       ${YACC} -d grammar.y
diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
new file mode 100644 (file)
index 0000000..8d4f9b8
--- /dev/null
@@ -0,0 +1,128 @@
+# 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
+
+# uss Makefile
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+#
+# This makefile creates the following things:
+#
+PROGRAMS = uss
+
+#
+# and here's what it uses to do so:
+#
+LIBS = ${SRCDIR}lib/afs/libvolser.a \
+       ${SRCDIR}lib/afs/libvldb.a  \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libprot.a \
+       ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/afs/libcom_err.a\
+       ${SRCDIR}lib/afs/util.a \
+       ${XLIBS}
+
+CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include -I. ${XCFLAGS}
+OBJS =  uss_procs.o \
+       uss_common.o \
+       uss_vol.o \
+       uss_acl.o \
+       uss_ptserver.o \
+       uss_kauth.o \
+       uss_fs.o \
+       lex.yy.o \
+       y.tab.o 
+
+include ../config/Makefile.version
+
+#
+# Top-level options:
+#
+all :  ${PROGRAMS}
+
+install: all
+       ${INSTALL} uss ${DESTDIR}etc
+
+system: install
+
+clean:
+       rm -f *.o ${PROGRAMS} y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c
+
+###### uss program ######
+
+uss: uss.o  ${OBJS} 
+       ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS}
+
+uss.o:  uss.c AFS_component_version_number.c
+        ${CC} -c ${CFLAGS} uss.c
+
+###### common stuff ######
+
+uss_procs.o : uss_procs.c
+       ${CC} -c ${CFLAGS} uss_procs.c
+
+uss_common.o : uss_common.c
+       ${CC} -c ${CFLAGS} uss_common.c
+
+uss_vol.o : uss_vol.c
+       ${CC} -c ${CFLAGS} uss_vol.c
+
+uss_acl.o : uss_acl.c
+       ${CC} -c ${CFLAGS} uss_acl.c
+
+uss_ptserver.o : uss_ptserver.c
+       ${CC} -c ${CFLAGS} uss_ptserver.c
+
+uss_kauth.o : uss_kauth.c
+       ${CC} -c ${CFLAGS} uss_kauth.c
+
+uss_fs.o : uss_fs.c
+       ${CC} -c ${CFLAGS} uss_fs.c
+
+lex.yy.o : lex.yy.c y.tab.c
+       ${CC} -c ${CFLAGS} lex.yy.c
+
+lex.yy.c : lex.c
+       ${LEX} lex.c
+
+y.tab.o : y.tab.c
+       ${CC} -c ${CFLAGS} y.tab.c
+
+uss.c: uss_common.h uss_procs.h uss_kauth.h uss_fs.h
+
+uss_procs.c : uss_procs.h uss_common.h uss_acl.h
+
+uss_common.c : uss_common.h
+
+uss_vol.c : uss_vol.h uss_common.h uss_fs.h
+
+uss_acl.c : uss_acl.h uss_common.h uss_fs.h
+
+uss_ptserver.c: uss_ptserver.h
+
+uss_kauth.c: uss_kauth.h uss_common.h
+
+uss_fs.c: uss_fs.h
+
+y.tab.c : grammar.y
+       ${YACC} -d grammar.y
diff --git a/src/util/Makefile b/src/util/Makefile
deleted file mode 100644 (file)
index 8bf9c54..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=util
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I$(SRCDIR)include ${XCFLAGS}
-LDFLAGS = ${OPTMZ} ${XLDFLAGS}
-
-objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
-        hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
-        dirpath.o fileutil.o netutils.o flipbase64.o \
-        afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ}
-
-headers = assert.h potpourri.h itc.h errors.h afsutil.h pthread_glock.h \
-         dirpath.h afs_atomlist.h afs_lhash.h
-
-include ../config/Makefile.version
-
-system noversion: install
-
-all:   util.a sys
-
-${DESTDIR}bin/sys: sys
-       ${INSTALL} sys ${DESTDIR}bin/sys
-
-install0: ${DESTDIR}include/afs/dirpath.h \
-       ${DESTDIR}include/afs/pthread_nosigs.h \
-       ${objects} util.a ${DESTDIR}bin/sys ${someheaders} doc 
-       ${INSTALL} util.a ${DESTDIR}lib/afs
-       ${INSTALL} util.a ${DESTDIR}lib/afs/libafsutil.a
-       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
-               netutils.h packages.h afsutil.h pthread_glock.h \
-               afs_atomlist.h afs_lhash.h \
-               ${DESTDIR}include/afs
-       ${INSTALL} potpourri.h ${DESTDIR}include
-
-install: install0 kinstall ukinstall
-
-install_headers:
-       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
-               netutils.h packages.h afsutil.h pthread_glock.h \
-               afs_atomlist.h afs_lhash.h \
-               ${DESTDIR}include/afs
-
-kinstall:
-       ${INSTALL} vice.h ../libafs/afs
-       ${INSTALL} base64.c ../libafs/afs/afs_base64.c
-       ${INSTALL} uuid.c ../libafs/afs/afs_uuid.c
-       ${INSTALL} afs_atomlist.c ../libafs/afs
-       ${INSTALL} afs_atomlist.h ../libafs/afs
-       ${INSTALL} afs_lhash.c ../libafs/afs
-       ${INSTALL} afs_lhash.h ../libafs/afs
-
-ukinstall webinstall: install0
-       ${INSTALL} pthread_glock.h vice.h errors.h afsutil.h dirpath.h fileutil.h netutils.h casestrcpy.c dirpath.c hostparse.c fileutil.c netutils.c ../libuafs/afs
-       ${INSTALL} uuid.c ../libuafs/afs/afs_uuid.c
-       ${INSTALL} afs_atomlist.c ../libuafs/afs
-       ${INSTALL} afs_atomlist.h ../libuafs/afs
-       ${INSTALL} afs_lhash.c ../libuafs/afs
-       ${INSTALL} afs_lhash.h ../libuafs/afs
-
-${DESTDIR}include/afs/dirpath.h: dirpath.h
-       ${INSTALL} dirpath.h  ${DESTDIR}include/afs
-
-${DESTDIR}include/afs/pthread_nosigs.h: pthread_nosigs.h
-       ${INSTALL} pthread_nosigs.h  ${DESTDIR}include/afs
-
-doc:
-       echo no documents in this directory
-
-util.a: ${objects} AFS_component_version_number.o
-       rm -f util.a
-       $(AR) r util.a ${objects} AFS_component_version_number.o
-       $(RANLIB) util.a
-
-volparse.o: volparse.c
-       ${CC} ${CFLAGS} -c volparse.c
-
-snprintf.o: snprintf.c
-       ${CC} ${CFLAGS} -c snprintf.c
-
-base64.o: base64.c
-       ${CC} ${CFLAGS} -c base64.c
-
-hostparse.o: hostparse.c afsutil.h
-       ${CC} ${CFLAGS} -c hostparse.c
-
-ktime.o: ktime.c
-       ${CC} ${CFLAGS} -c ktime.c
-
-kreltime.o: kreltime.c
-       ${CC} ${CFLAGS} -c kreltime.c
-
-get_krbrlm.o: get_krbrlm.c
-       ${CC} ${CFLAGS} -c get_krbrlm.c
-
-uuid.o: uuid.c
-       ${CC} ${CFLAGS} -c uuid.c
-
-sys.o: sys.c ${SRCDIR}include/afs/param.h AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c sys.c
-
-sys: sys.o 
-       ${CC} ${LDFLAGS} -o sys sys.o
-
-isathing.o: isathing.c
-       ${CC} ${CFLAGS} -c isathing.c
-
-serverLog.o: serverLog.c
-       ${CC} ${CFLAGS} -c serverLog.c
-
-dirpath.o: dirpath.c dirpath.h
-       ${CC} ${CFLAGS} -c dirpath.c
-
-fileutil.o: fileutil.c fileutil.h
-       ${CC} ${CFLAGS} -c fileutil.c
-
-netutils.o: netutils.c netutils.h
-       ${CC} ${CFLAGS} -c netutils.c
-
-afs_atomlist.o: afs_atomlist.c afs_atomlist.h
-       ${CC} ${CFLAGS} -c afs_atomlist.c
-
-afs_lhash.o: afs_lhash.c afs_lhash.h afs_atomlist.h
-       ${CC} ${CFLAGS} -c afs_lhash.c
-
-clean:
-       rm -f ${objects} sys
-       rm -f util.a *.o core AFS_component_version_number.c
-
-beancount:
-       wc -l *.c *.h
-
-test:
-       cd test; $(MAKE)
-
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
new file mode 100644 (file)
index 0000000..780dace
--- /dev/null
@@ -0,0 +1,147 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I$(SRCDIR)include ${XCFLAGS}
+LDFLAGS = ${OPTMZ} ${XLDFLAGS}
+
+objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
+        hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
+        dirpath.o fileutil.o netutils.o flipbase64.o \
+        afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ}
+
+headers = assert.h potpourri.h itc.h errors.h afsutil.h pthread_glock.h \
+         dirpath.h afs_atomlist.h afs_lhash.h
+
+include ../config/Makefile.version
+
+system noversion: install
+
+all:   util.a sys
+
+${DESTDIR}bin/sys: sys
+       ${INSTALL} sys ${DESTDIR}bin/sys
+
+install0: ${DESTDIR}include/afs/dirpath.h \
+       ${DESTDIR}include/afs/pthread_nosigs.h \
+       ${objects} util.a ${DESTDIR}bin/sys ${someheaders} doc 
+       ${INSTALL} util.a ${DESTDIR}lib/afs
+       ${INSTALL} util.a ${DESTDIR}lib/afs/libafsutil.a
+       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
+               netutils.h packages.h afsutil.h pthread_glock.h \
+               afs_atomlist.h afs_lhash.h \
+               ${DESTDIR}include/afs
+       ${INSTALL} potpourri.h ${DESTDIR}include
+
+install: install0 kinstall ukinstall
+
+install_headers:
+       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
+               netutils.h packages.h afsutil.h pthread_glock.h \
+               afs_atomlist.h afs_lhash.h \
+               ${DESTDIR}include/afs
+
+kinstall:
+       ${INSTALL} vice.h ../libafs/afs
+       ${INSTALL} base64.c ../libafs/afs/afs_base64.c
+       ${INSTALL} uuid.c ../libafs/afs/afs_uuid.c
+       ${INSTALL} afs_atomlist.c ../libafs/afs
+       ${INSTALL} afs_atomlist.h ../libafs/afs
+       ${INSTALL} afs_lhash.c ../libafs/afs
+       ${INSTALL} afs_lhash.h ../libafs/afs
+
+ukinstall webinstall: install0
+       ${INSTALL} pthread_glock.h vice.h errors.h afsutil.h dirpath.h fileutil.h netutils.h casestrcpy.c dirpath.c hostparse.c fileutil.c netutils.c ../libuafs/afs
+       ${INSTALL} uuid.c ../libuafs/afs/afs_uuid.c
+       ${INSTALL} afs_atomlist.c ../libuafs/afs
+       ${INSTALL} afs_atomlist.h ../libuafs/afs
+       ${INSTALL} afs_lhash.c ../libuafs/afs
+       ${INSTALL} afs_lhash.h ../libuafs/afs
+
+${DESTDIR}include/afs/dirpath.h: dirpath.h
+       ${INSTALL} dirpath.h  ${DESTDIR}include/afs
+
+${DESTDIR}include/afs/pthread_nosigs.h: pthread_nosigs.h
+       ${INSTALL} pthread_nosigs.h  ${DESTDIR}include/afs
+
+doc:
+       echo no documents in this directory
+
+util.a: ${objects} AFS_component_version_number.o
+       rm -f util.a
+       $(AR) r util.a ${objects} AFS_component_version_number.o
+       $(RANLIB) util.a
+
+volparse.o: volparse.c
+       ${CC} ${CFLAGS} -c volparse.c
+
+snprintf.o: snprintf.c
+       ${CC} ${CFLAGS} -c snprintf.c
+
+base64.o: base64.c
+       ${CC} ${CFLAGS} -c base64.c
+
+hostparse.o: hostparse.c afsutil.h
+       ${CC} ${CFLAGS} -c hostparse.c
+
+ktime.o: ktime.c
+       ${CC} ${CFLAGS} -c ktime.c
+
+kreltime.o: kreltime.c
+       ${CC} ${CFLAGS} -c kreltime.c
+
+get_krbrlm.o: get_krbrlm.c
+       ${CC} ${CFLAGS} -c get_krbrlm.c
+
+uuid.o: uuid.c
+       ${CC} ${CFLAGS} -c uuid.c
+
+sys.o: sys.c ${SRCDIR}include/afs/param.h AFS_component_version_number.c
+       ${CC} ${CFLAGS} -c sys.c
+
+sys: sys.o 
+       ${CC} ${LDFLAGS} -o sys sys.o
+
+isathing.o: isathing.c
+       ${CC} ${CFLAGS} -c isathing.c
+
+serverLog.o: serverLog.c
+       ${CC} ${CFLAGS} -c serverLog.c
+
+dirpath.o: dirpath.c dirpath.h
+       ${CC} ${CFLAGS} -c dirpath.c
+
+fileutil.o: fileutil.c fileutil.h
+       ${CC} ${CFLAGS} -c fileutil.c
+
+netutils.o: netutils.c netutils.h
+       ${CC} ${CFLAGS} -c netutils.c
+
+afs_atomlist.o: afs_atomlist.c afs_atomlist.h
+       ${CC} ${CFLAGS} -c afs_atomlist.c
+
+afs_lhash.o: afs_lhash.c afs_lhash.h afs_atomlist.h
+       ${CC} ${CFLAGS} -c afs_lhash.c
+
+clean:
+       rm -f ${objects} sys
+       rm -f util.a *.o core AFS_component_version_number.c
+
+beancount:
+       wc -l *.c *.h
+
+test:
+       cd test; $(MAKE)
+
diff --git a/src/util/test/Makefile b/src/util/test/Makefile
deleted file mode 100644 (file)
index baf9545..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-CFLAGS = -I. -I.. -I${SRCDIR}include ${XCFLAGS} -g
-
-tests: test_ktime ktest dirpath_test
-
-ktests.o: ktests.c ../ktime.h
-       ${CC} ${CFLAGS} -c ktests.c
-
-ktest: ktest.o ../util.a
-       ${CC} ${CFLAGS} -o ktest ktest.o ../util.a ${XLIBS}
-
-test_ktime.o: test_ktime.c ../ktime.h
-       ${CC} ${CFLAGS} -c test_ktime.c
-
-test_ktime: test_ktime.o ../util.a
-       ${CC} ${CFLAGS} -o test_ktime test_ktime.o ../util.a ${XLIBS}
-
-dirpath_test: dirpath_test.o ../util.a 
-       ${CC} dirpath_test.o  ${CFLAGS} -o dirpath_test ../util.a ${XLIBS}
-
-b64: b64.o ../util.a
-       ${CC} b64.o ${CFLAGS} -o b64 ../util.a ${XLIBS}
-
-fb64: fb64.o ../util.a
-       ${CC} fb64.o ${CFLAGS} -o fb64 ../util.a ${XLIBS}
diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in
new file mode 100644 (file)
index 0000000..4a97d37
--- /dev/null
@@ -0,0 +1,38 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+CFLAGS = -I. -I.. -I${SRCDIR}include ${XCFLAGS} -g
+
+tests: test_ktime ktest dirpath_test
+
+ktests.o: ktests.c ../ktime.h
+       ${CC} ${CFLAGS} -c ktests.c
+
+ktest: ktest.o ../util.a
+       ${CC} ${CFLAGS} -o ktest ktest.o ../util.a ${XLIBS}
+
+test_ktime.o: test_ktime.c ../ktime.h
+       ${CC} ${CFLAGS} -c test_ktime.c
+
+test_ktime: test_ktime.o ../util.a
+       ${CC} ${CFLAGS} -o test_ktime test_ktime.o ../util.a ${XLIBS}
+
+dirpath_test: dirpath_test.o ../util.a 
+       ${CC} dirpath_test.o  ${CFLAGS} -o dirpath_test ../util.a ${XLIBS}
+
+b64: b64.o ../util.a
+       ${CC} b64.o ${CFLAGS} -o b64 ../util.a ${XLIBS}
+
+fb64: fb64.o ../util.a
+       ${CC} fb64.o ${CFLAGS} -o fb64 ../util.a ${XLIBS}
diff --git a/src/venus/Makefile b/src/venus/Makefile
deleted file mode 100644 (file)
index 507852f..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=venus
-LINUX_VERS=dummy
-include ../config/Makefile.${SYS_NAME}
-
-INSTALLex = ${INSTALL} -m 755
-CCXPG2= /usr/xpg2bin/cc
-
-CFLAGS = ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-INCLS = ${DESTDIR}include/afs/afsint.h \
-       ${DESTDIR}include/afs/cmd.h \
-       ${DESTDIR}include/afs/afsutil.h
-
-VLIB = ${DESTDIR}lib/afs/
-
-LIB = ${DESTDIR}lib/
-
-FSLIBS = ${VLIB}libsys.a \
-        ${VLIB}libvldb.a \
-        ${LIB}libubik.a \
-        ${VLIB}vlib.a \
-        ${VLIB}libauth.a \
-        ${DESTDIR}lib/librxkad.a \
-        ${VLIB}libcom_err.a \
-        ${VLIB}libcmd.a \
-        ${VLIB}libkauth.a \
-        ${DESTDIR}lib/libdes.a \
-        ${LIB}librx.a \
-        ${VLIB}libsys.a \
-        $(VLIB)util.a \
-        ${LIB}liblwp.a \
-        ${VLIB}libaudit.a
-
-CMLIBS = ${VLIB}libsys.a \
-        ${VLIB}libafsint.a \
-        ${DESTDIR}lib/librxkad.a \
-        ${VLIB}libauth.a \
-        ${VLIB}libcom_err.a \
-        ${VLIB}libcmd.a \
-        ${LIB}librx.a \
-        ${VLIB}libsys.a \
-        $(VLIB)util.a \
-        ${LIB}liblwp.a 
-
-LIBS = ${FSLIBS} 
-
-include ../config/Makefile.version
-
-cacheout: cacheout.o
-       $(CC) ${CFLAGS} -o cacheout cacheout.o ${LIBS} ${XLIBS} ${CMLIBS}
-
-cacheout.o: cacheout.c
-
-all: fs up cmdebug fstrace kdump gcpags kdump64
-
-${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs: fs
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/up: up
-       ${INSTALL} -s $? $@
-
-${DESTDIR}etc/fstrace: fstrace
-       ${INSTALL} -s $? $@
-
-${DESTDIR}bin/cmdebug: cmdebug
-       ${INSTALL} -s $? $@
-
-${DESTDIR}etc/kdump: kdump
-       -set -x; \
-       case ${SYS_NAME} in \
-       sgi_6? ) \
-               ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \
-               ln -fs kdump ${DESTDIR}etc/kdump32; \
-               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP22; \
-               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP32; \
-               for f in kdump.IP??; \
-               do ${INSTALL} -s $$f ${DESTDIR}etc/$$f || exit $$? ; \
-               done ;; \
-       sun4x_57 ) \
-               ${INSTALLex} -f kdump.sh.solaris7 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
-       *linux* ) \
-               for lv in ${LINUX_VERS}; do \
-                       ${INSTALL} -s kdump-$$lv ${DESTDIR}etc/kdump-$$lv ; \
-               done ;; \
-       hp_ux11* ) \
-               ${INSTALLex} -f kdump.sh.hp_ux11 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
-       *) \
-               ${INSTALL} -s $? $@ ;; \
-       esac
-
-${DESTDIR}etc/kdump64: kdump64
-       -set -x; \
-       case ${SYS_NAME} in \
-       sun4x_57 | hp_ux11* ) \
-               ${INSTALL} -s $? $@ ;;\
-       * ) \
-               echo skipping kdump64 for ${SYS_NAME} ;; \
-       esac
-
-
-install: all ${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs \
-       ${DESTDIR}bin/up ${DESTDIR}etc/fstrace ${DESTDIR}bin/cmdebug \
-       ${DESTDIR}etc/kdump ${DESTDIR}etc/kdump64
-
-system: install
-
-up.o: up.c AFS_component_version_number.c
-
-up: up.o
-       ${CC} ${CFLAGS} -g -o up up.o ${LIBS} ${XLIBS}
-
-fs.o: fs.c ${INCLS} AFS_component_version_number.c
-
-fs: fs.o $(LIBS)
-       ${CC} ${CFLAGS} -g -o fs fs.o ${DESTDIR}lib/afs/libprot.a $(LIBS) ${XLIBS}
-
-twiddle: twiddle.c $(LIBS)
-       ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
-
-gcpags: gcpags.c $(LIBS)
-       ${CC} -g -o gcpags $(CFLAGS) gcpags.c $(LIBS) ${XLIBS}
-
-whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
-
-whatfid: whatfid.o ${LIBS}
-       ${CC} ${CFLAGS} -g -o whatfid whatfid.o ${LIBS} ${XLIBS}
-
-fstrace.o: fstrace.c AFS_component_version_number.c
-       case ${SYS_NAME} in \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
-               * ) \
-                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
-       esac
-
-fstrace: fstrace.o
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a ) \
-                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a /usr/lib/libi.a ;; \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
-               hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \
-                       ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
-               * ) \
-                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
-       esac
-
-cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
-
-cmdebug: cmdebug.o ${CMLIBS}
-       $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS}
-
-kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
-       -set -x; \
-       case ${SYS_NAME} in \
-               alpha_linux* ) \
-                       for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
-                               done ;; \
-               *linux* ) \
-                       for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
-                       done ;; \
-               alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
-                       ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
-               sgi_6? ) \
-                       for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
-                       do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
-                               CPU_KDEFS=`sed 's/-mips.//' $$f`; \
-                               echo IP = $$IP; \
-                               echo CPU_KDEFS = $$CPU_KDEFS; \
-                               case $$CPU_KDEFS in \
-                               *-64*)  ${CC} -D_KMEMUSER -woff 1178 \
-                                               -g -I${DESTDIR}include \
-                                               -I${TOP_SRCDIR}/config \
-                                               $$CPU_KDEFS \
-                                               ${XCFLAGS64} \
-                                               -c kdump.c -o kdump.$$IP.o \
-                                       ;; \
-                               *)      ${CC} -D_KMEMUSER -woff 1178 \
-                                               -g -I${DESTDIR}include \
-                                               -I${TOP_SRCDIR}/config \
-                                               $$CPU_KDEFS \
-                                               ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
-                                               -c kdump.c -o kdump.$$IP.o \
-                                       ;; \
-                               esac || exit $$?; \
-                       done \
-                       ;; \
-               *) \
-                       ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -c kdump.c ;; \
-       esac ;
-
-kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
-       -set -x; \
-       case ${SYS_NAME} in \
-       sun4x_57 | hp_ux11* ) \
-               ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
-       esac
-
-kdump:  kdump.o
-       -set -x; \
-       case ${SYS_NAME} in \
-       sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
-       sun4x_5? ) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a  ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
-       sgi_6? ) \
-               for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
-               do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
-                       CPU_KDEFS=`sed 's/-mips.//' $$f`; \
-                       echo IP = $$IP; \
-                       echo CPU_KDEFS = $$CPU_KDEFS; \
-                       case $$CPU_KDEFS in \
-                       *-64*)  ${CC} ${XCFLAGS64} -g \
-                                       $$CPU_KDEFS \
-                                       -o kdump.$$IP kdump.$$IP.o \
-                                       ${DESTDIR}lib/afs/libcmd64.a -lelf \
-                               ;; \
-                       *)      ${CC} ${XCFLAGS} -g \
-                                       $$CPU_KDEFS \
-                                       -o kdump.$$IP kdump.$$IP.o \
-                                       ${DESTDIR}lib/afs/libcmd.a -lelf \
-                               ;; \
-                       esac || exit $$? ; \
-               done ;; \
-       *linux* ) \
-               for lv in ${LINUX_VERS}; do \
-                       ${CC} -g -o kdump-$$lv kdump-$$lv.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ; \
-               done ;; \
-       alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} -ll -lmld;; \
-       ncrx86_* ) ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a -lelf ${XLIBS} ;; \
-       * )     ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ;; \
-       esac
-
-## kdump to read from 64 bit kernel dumps
-
-kdump64 : kdump64.o
-       -set -x; \
-       case ${SYS_NAME} in \
-       sun4x_57 | hp_ux11* )  \
-               ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}lib/afs/libcmd64.a ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
-       esac
-
-clean:
-       rm -f *.o *.a up fs core cmdebug AFS_component_version_number.c fstrace gcpags
-
-beancount:
-       wc -l *.c *.h
-
-test:
-       cd test; $(MAKE)
-
diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
new file mode 100644 (file)
index 0000000..9407b9b
--- /dev/null
@@ -0,0 +1,269 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+LINUX_VERS=dummy
+include ../config/Makefile.${SYS_NAME}
+
+INSTALLex = ${INSTALL} -m 755
+CCXPG2= /usr/xpg2bin/cc
+
+CFLAGS = ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+
+INCLS = ${DESTDIR}include/afs/afsint.h \
+       ${DESTDIR}include/afs/cmd.h \
+       ${DESTDIR}include/afs/afsutil.h
+
+VLIB = ${DESTDIR}lib/afs/
+
+LIB = ${DESTDIR}lib/
+
+FSLIBS = ${VLIB}libsys.a \
+        ${VLIB}libvldb.a \
+        ${LIB}libubik.a \
+        ${VLIB}vlib.a \
+        ${VLIB}libauth.a \
+        ${DESTDIR}lib/librxkad.a \
+        ${VLIB}libcom_err.a \
+        ${VLIB}libcmd.a \
+        ${VLIB}libkauth.a \
+        ${DESTDIR}lib/libdes.a \
+        ${LIB}librx.a \
+        ${VLIB}libsys.a \
+        $(VLIB)util.a \
+        ${LIB}liblwp.a \
+        ${VLIB}libaudit.a
+
+CMLIBS = ${VLIB}libsys.a \
+        ${VLIB}libafsint.a \
+        ${DESTDIR}lib/librxkad.a \
+        ${VLIB}libauth.a \
+        ${VLIB}libcom_err.a \
+        ${VLIB}libcmd.a \
+        ${LIB}librx.a \
+        ${VLIB}libsys.a \
+        $(VLIB)util.a \
+        ${LIB}liblwp.a 
+
+LIBS = ${FSLIBS} 
+
+include ../config/Makefile.version
+
+cacheout: cacheout.o
+       $(CC) ${CFLAGS} -o cacheout cacheout.o ${LIBS} ${XLIBS} ${CMLIBS}
+
+cacheout.o: cacheout.c
+
+all: fs up cmdebug fstrace kdump gcpags kdump64
+
+${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs: fs
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/up: up
+       ${INSTALL} -s $? $@
+
+${DESTDIR}etc/fstrace: fstrace
+       ${INSTALL} -s $? $@
+
+${DESTDIR}bin/cmdebug: cmdebug
+       ${INSTALL} -s $? $@
+
+${DESTDIR}etc/kdump: kdump
+       -set -x; \
+       case ${SYS_NAME} in \
+       sgi_6? ) \
+               ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \
+               ln -fs kdump ${DESTDIR}etc/kdump32; \
+               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP22; \
+               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP32; \
+               for f in kdump.IP??; \
+               do ${INSTALL} -s $$f ${DESTDIR}etc/$$f || exit $$? ; \
+               done ;; \
+       sun4x_57 ) \
+               ${INSTALLex} -f kdump.sh.solaris7 $@; \
+               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
+       *linux* ) \
+               for lv in ${LINUX_VERS}; do \
+                       ${INSTALL} -s kdump-$$lv ${DESTDIR}etc/kdump-$$lv ; \
+               done ;; \
+       hp_ux11* ) \
+               ${INSTALLex} -f kdump.sh.hp_ux11 $@; \
+               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
+       *) \
+               ${INSTALL} -s $? $@ ;; \
+       esac
+
+${DESTDIR}etc/kdump64: kdump64
+       -set -x; \
+       case ${SYS_NAME} in \
+       sun4x_57 | hp_ux11* ) \
+               ${INSTALL} -s $? $@ ;;\
+       * ) \
+               echo skipping kdump64 for ${SYS_NAME} ;; \
+       esac
+
+
+install: all ${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs \
+       ${DESTDIR}bin/up ${DESTDIR}etc/fstrace ${DESTDIR}bin/cmdebug \
+       ${DESTDIR}etc/kdump ${DESTDIR}etc/kdump64
+
+system: install
+
+up.o: up.c AFS_component_version_number.c
+
+up: up.o
+       ${CC} ${CFLAGS} -g -o up up.o ${LIBS} ${XLIBS}
+
+fs.o: fs.c ${INCLS} AFS_component_version_number.c
+
+fs: fs.o $(LIBS)
+       ${CC} ${CFLAGS} -g -o fs fs.o ${DESTDIR}lib/afs/libprot.a $(LIBS) ${XLIBS}
+
+twiddle: twiddle.c $(LIBS)
+       ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
+
+gcpags: gcpags.c $(LIBS)
+       ${CC} -g -o gcpags $(CFLAGS) gcpags.c $(LIBS) ${XLIBS}
+
+whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
+
+whatfid: whatfid.o ${LIBS}
+       ${CC} ${CFLAGS} -g -o whatfid whatfid.o ${LIBS} ${XLIBS}
+
+fstrace.o: fstrace.c AFS_component_version_number.c
+       case ${SYS_NAME} in \
+               sun4_411 | sun4c_411 | sun4m_412 ) \
+                       ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
+               * ) \
+                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
+       esac
+
+fstrace: fstrace.o
+       case ${SYS_NAME} in \
+               pmax_ul43 | pmax_ul43a ) \
+                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a /usr/lib/libi.a ;; \
+               sun4_411 | sun4c_411 | sun4m_412 ) \
+                       ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+               hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \
+                       ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+               * ) \
+                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+       esac
+
+cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
+
+cmdebug: cmdebug.o ${CMLIBS}
+       $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS}
+
+kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
+       -set -x; \
+       case ${SYS_NAME} in \
+               alpha_linux* ) \
+                       for lv in ${LINUX_VERS}; do \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
+                               done ;; \
+               *linux* ) \
+                       for lv in ${LINUX_VERS}; do \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
+                       done ;; \
+               alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
+                       ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
+               sgi_6? ) \
+                       for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
+                       do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
+                               CPU_KDEFS=`sed 's/-mips.//' $$f`; \
+                               echo IP = $$IP; \
+                               echo CPU_KDEFS = $$CPU_KDEFS; \
+                               case $$CPU_KDEFS in \
+                               *-64*)  ${CC} -D_KMEMUSER -woff 1178 \
+                                               -g -I${DESTDIR}include \
+                                               -I${TOP_SRCDIR}/config \
+                                               $$CPU_KDEFS \
+                                               ${XCFLAGS64} \
+                                               -c kdump.c -o kdump.$$IP.o \
+                                       ;; \
+                               *)      ${CC} -D_KMEMUSER -woff 1178 \
+                                               -g -I${DESTDIR}include \
+                                               -I${TOP_SRCDIR}/config \
+                                               $$CPU_KDEFS \
+                                               ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
+                                               -c kdump.c -o kdump.$$IP.o \
+                                       ;; \
+                               esac || exit $$?; \
+                       done \
+                       ;; \
+               *) \
+                       ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -c kdump.c ;; \
+       esac ;
+
+kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
+       -set -x; \
+       case ${SYS_NAME} in \
+       sun4x_57 | hp_ux11* ) \
+               ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
+       esac
+
+kdump:  kdump.o
+       -set -x; \
+       case ${SYS_NAME} in \
+       sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
+       sun4x_5? ) \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a  ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
+       sgi_6? ) \
+               for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
+               do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
+                       CPU_KDEFS=`sed 's/-mips.//' $$f`; \
+                       echo IP = $$IP; \
+                       echo CPU_KDEFS = $$CPU_KDEFS; \
+                       case $$CPU_KDEFS in \
+                       *-64*)  ${CC} ${XCFLAGS64} -g \
+                                       $$CPU_KDEFS \
+                                       -o kdump.$$IP kdump.$$IP.o \
+                                       ${DESTDIR}lib/afs/libcmd64.a -lelf \
+                               ;; \
+                       *)      ${CC} ${XCFLAGS} -g \
+                                       $$CPU_KDEFS \
+                                       -o kdump.$$IP kdump.$$IP.o \
+                                       ${DESTDIR}lib/afs/libcmd.a -lelf \
+                               ;; \
+                       esac || exit $$? ; \
+               done ;; \
+       *linux* ) \
+               for lv in ${LINUX_VERS}; do \
+                       ${CC} -g -o kdump-$$lv kdump-$$lv.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ; \
+               done ;; \
+       alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} -ll -lmld;; \
+       ncrx86_* ) ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a -lelf ${XLIBS} ;; \
+       * )     ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ;; \
+       esac
+
+## kdump to read from 64 bit kernel dumps
+
+kdump64 : kdump64.o
+       -set -x; \
+       case ${SYS_NAME} in \
+       sun4x_57 | hp_ux11* )  \
+               ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}lib/afs/libcmd64.a ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
+       esac
+
+clean:
+       rm -f *.o *.a up fs core cmdebug AFS_component_version_number.c fstrace gcpags
+
+beancount:
+       wc -l *.c *.h
+
+test:
+       cd test; $(MAKE)
+
diff --git a/src/venus/test/Makefile b/src/venus/test/Makefile
deleted file mode 100644 (file)
index b3e40f7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-
-include ../../config/Makefile.${SYS_NAME}
-
-# SRCDIR=DEST/
-# DESTDIR=DEST/
-OPTIMIZE=-O
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I..
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L..
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp ${utilib}
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS}
-
-install all system test:  fulltest owntest idtest getinitparams
-
-fulltest: fulltest.o
-       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
-owntest: owntest.o
-       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
-idtest: idtest.o
-       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
-getinitparams: getinitparams.o
-       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
-
-clean:
-       rm -f *.o fulltest owntest idtest getinitparams
-
diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in
new file mode 100644 (file)
index 0000000..64e4819
--- /dev/null
@@ -0,0 +1,38 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+include ../../config/Makefile.${SYS_NAME}
+
+
+
+OPTIMIZE=-O
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I..
+LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L..
+LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil
+
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS}
+
+install all system test:  fulltest owntest idtest getinitparams
+
+fulltest: fulltest.o
+       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
+owntest: owntest.o
+       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
+idtest: idtest.o
+       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
+getinitparams: getinitparams.o
+       $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS)
+
+clean:
+       rm -f *.o fulltest owntest idtest getinitparams
+
diff --git a/src/vfsck/Makefile b/src/vfsck/Makefile
deleted file mode 100644 (file)
index 9598045..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#      @(#)Makefile    5.12 (Berkeley) 6/26/89
-#
-COMPONENT=vfsck
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS=        ${DBUG} -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LIBC=  /lib/libc.a
-SRCS=  dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
-       pass5.c setup.c utilities.c ufs_subr.c ufs_tables.c dirutils.c\
-       vprintf.c proplist.c
-LOCOBJS=dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \
-       pass5.o setup.o utilities.o dirutils.o vprintf.o proplist.o
-SYSOBJS=ufs_subr.o ufs_tables.o
-OBJS=  ${LOCOBJS} ${SYSOBJS}
-MAN =
-#MAN=  fsck.0
-
-include ../config/Makefile.version
-
-all: vfsck
-
-vfsck: main.o ${OBJS} 
-
-${OBJS}:       ${SRCS}
-       case ${SYS_NAME} in                                     \
-         hp_ux11? )                                            \
-           ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${SRCDIR}include ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \
-                       ;;                                      \
-         hp?00_ux101 | hp_ux10? )                              \
-           ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS} -D_FILE64\
-                       ;;                                      \
-           * )                                                 \
-           ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS}\
-                       ;;                                      \
-       esac
-
-main.o: main.c AFS_component_version_number.c
-
-#${LOCOBJS}:
-#      ${CC} ${CFLAGS} -c $*.c
-
-clean:
-       rm -f ${OBJS} vfsck core AFS_component_version_number.c
-
-cleandir: clean
-       rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-       mkdep ${CFLAGS} ${SRCS}
-
-system: install
-
-install: all ${MAN}
-       ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/etc
-       ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/usr/afs/bin
-       case ${SYS_NAME} in                             \
-               hp_ux10? )                              \
-                       ${CP} bcheckrc ${DESTDIR}/root.server/etc; \
-                       ;;                              \
-               hp_ux11? )                              \
-                       ${CP} bcheckrc-hp_ux110 ${DESTDIR}/root.server/etc/bcheckrc; \
-                       ;;                              \
-       esac
-       case ${SYS_NAME} in                             \
-               hp_ux10? | hp_ux11? )                   \
-                        ${CP} mount ${DESTDIR}/root.server/etc ;\
-                        ${CP} umount ${DESTDIR}/root.server/etc; \
-                        chmod 755 ${DESTDIR}/root.server/etc/bcheckrc ${DESTDIR}/root.server/etc/mount ${DESTDIR}/root.server/etc/umount ;\
-                               ;;                                      \
-       esac
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in
new file mode 100644 (file)
index 0000000..d4d3df1
--- /dev/null
@@ -0,0 +1,96 @@
+#
+# Copyright (c) 1987 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    5.12 (Berkeley) 6/26/89
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS=        ${DBUG} -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LIBC=  /lib/libc.a
+SRCS=  dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
+       pass5.c setup.c utilities.c ufs_subr.c ufs_tables.c dirutils.c\
+       vprintf.c proplist.c
+LOCOBJS=dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \
+       pass5.o setup.o utilities.o dirutils.o vprintf.o proplist.o
+SYSOBJS=ufs_subr.o ufs_tables.o
+OBJS=  ${LOCOBJS} ${SYSOBJS}
+MAN =
+#MAN=  fsck.0
+
+include ../config/Makefile.version
+
+all: vfsck
+
+vfsck: main.o ${OBJS} 
+
+${OBJS}:       ${SRCS}
+       case ${SYS_NAME} in                                     \
+         hp_ux11? )                                            \
+           ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${SRCDIR}include ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \
+                       ;;                                      \
+         hp?00_ux101 | hp_ux10? )                              \
+           ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS} -D_FILE64\
+                       ;;                                      \
+           * )                                                 \
+           ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS}\
+                       ;;                                      \
+       esac
+
+main.o: main.c AFS_component_version_number.c
+
+#${LOCOBJS}:
+#      ${CC} ${CFLAGS} -c $*.c
+
+clean:
+       rm -f ${OBJS} vfsck core AFS_component_version_number.c
+
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}
+       mkdep ${CFLAGS} ${SRCS}
+
+system: install
+
+install: all ${MAN}
+       ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/etc
+       ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/usr/afs/bin
+       case ${SYS_NAME} in                             \
+               hp_ux10? )                              \
+                       ${CP} bcheckrc ${DESTDIR}/root.server/etc; \
+                       ;;                              \
+               hp_ux11? )                              \
+                       ${CP} bcheckrc-hp_ux110 ${DESTDIR}/root.server/etc/bcheckrc; \
+                       ;;                              \
+       esac
+       case ${SYS_NAME} in                             \
+               hp_ux10? | hp_ux11? )                   \
+                        ${CP} mount ${DESTDIR}/root.server/etc ;\
+                        ${CP} umount ${DESTDIR}/root.server/etc; \
+                        chmod 755 ${DESTDIR}/root.server/etc/bcheckrc ${DESTDIR}/root.server/etc/mount ${DESTDIR}/root.server/etc/umount ;\
+                               ;;                                      \
+       esac
+lint: ${SRCS}
+       lint ${CFLAGS} ${SRCS}
+
+tags: ${SRCS}
+       ctags ${SRCS}
diff --git a/src/viced/Makefile b/src/viced/Makefile
deleted file mode 100644 (file)
index 2c5ac08..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=viced
-include ../config/Makefile.${SYS_NAME}
-
-DBUG = -g
-CFLAGS =  -DNINTERFACE ${DBUG} \
-       -I${TOP_SRCDIR}/config -I. -I${SRCDIR}include -I${SRCDIR}include/afs \
-        ${XCFLAGS} ${DBG_DEFS} -DRXDEBUG
-LDFLAGS = ${DBUG} ${XLDFLAGS}
-
-UTILLIB=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-LIBS=  ${SRCDIR}lib/afs/libacl.a       \
-       ${SRCDIR}lib/afs/libvldb.a      \
-       ${SRCDIR}lib/afs/libprot.a      \
-       ${SRCDIR}lib/afs/libauth.a      \
-       ${SRCDIR}lib/librxkad.a         \
-       ${SRCDIR}lib/libubik.a          \
-       ${SRCDIR}lib/afs/vlib.a         \
-       ${SRCDIR}lib/afs/libdir.a       \
-       ${UTILLIB}                      \
-       ${SRCDIR}lib/afs/libsys.a       \
-       ${SRCDIR}lib/afs/libafsint.a    \
-       ${SRCDIR}lib/librxstat.a        \
-       ${SRCDIR}lib/librx.a            \
-       ${SRCDIR}lib/afs/libsys.a       \
-       ${SRCDIR}lib/libdes.a           \
-       ${SRCDIR}lib/afs/libcom_err.a   \
-       ${SRCDIR}lib/afs/util.a         \
-       ${SRCDIR}lib/liblwp.a 
-
-headers=${SRCDIR}include/lwp.h         \
-       ${SRCDIR}include/afs/acl.h      \
-       ${SRCDIR}include/afs/errors.h   \
-       ${SRCDIR}include/afs/ptclient.h \
-       ${SRCDIR}include/lock.h         \
-       ${SRCDIR}include/afs/volume.h   \
-       ${SRCDIR}include/afs/vnode.h    \
-       ${SRCDIR}include/rx/rx.h        \
-       ${SRCDIR}include/rx/xdr.h       \
-       ${SRCDIR}include/afs/auth.h     \
-       ${SRCDIR}include/afs/afsint.h   \
-       viced.h                         \
-       host.h                          \
-       fs_stats.h
-
-objects=viced.o                \
-       afsfileprocs.o  \
-       host.o          \
-       physio.o        \
-       callback.o      
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: cbd fsprobe check_sysid
-
-${objects}:${headers}
-viced.o: AFS_component_version_number.o
-
-check_sysid: check_sysid.c
-       ${CC} ${CFLAGS} -IDEST/include -o check_sysid check_sysid.c
-
-fileserver: viced.o ${objects} ${headers} ${LIBS}
-       set -x; \
-       case ${SYS_NAME} in \
-       *linux* | *fbsd* ) \
-           ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
-       rs_aix*) \
-           ${CC} -K ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
-       *) \
-           ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
-       esac
-
-fsprobe.o: fsprobe.c  AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c fsprobe.c
-
-fsprobe: fsprobe.o
-       ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS}  
-
-cbd.o: callback.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o callback.c
-
-cbd: cbd.o
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS}  
-
-lint:
-       lint -uvn  -I${SRCDIR}include viced.c afsfileprocs.c host.c physio.c callback.c ${SRCDIR}lib/afs/llib-lutil.ln
-
-${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
-       @case ${SYS_NAME} in \
-       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \
-       echo "Don't install fileserver for ${SYS_NAME}" ;; \
-       *) \
-       echo ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ; \
-       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ;; \
-       esac
-
-install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
-       ${INSTALL} fs_stats.h ${DESTDIR}/include/afs
-
-system: install
-
-clean:
-       rm -f *.o llib-lvice.ln fileserver core AFS_component_version_number.c cbd check_sysid fsprobe
-
-beancount:
-       wc -l *.c *.h
diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
new file mode 100644 (file)
index 0000000..2bd2124
--- /dev/null
@@ -0,0 +1,125 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+DBUG = -g
+CFLAGS =  -DNINTERFACE ${DBUG} \
+       -I${TOP_SRCDIR}/config -I. -I${SRCDIR}include -I${SRCDIR}include/afs \
+        ${XCFLAGS} -DRXDEBUG
+LDFLAGS = ${DBUG} ${XLDFLAGS}
+
+UTILLIB=${SRCDIR}lib/afs/util.a
+auditlib=${SRCDIR}lib/afs/libaudit.a
+
+LIBS=  ${SRCDIR}lib/afs/libacl.a       \
+       ${SRCDIR}lib/afs/libvldb.a      \
+       ${SRCDIR}lib/afs/libprot.a      \
+       ${SRCDIR}lib/afs/libauth.a      \
+       ${SRCDIR}lib/librxkad.a         \
+       ${SRCDIR}lib/libubik.a          \
+       ${SRCDIR}lib/afs/vlib.a         \
+       ${SRCDIR}lib/afs/libdir.a       \
+       ${UTILLIB}                      \
+       ${SRCDIR}lib/afs/libsys.a       \
+       ${SRCDIR}lib/afs/libafsint.a    \
+       ${SRCDIR}lib/librxstat.a        \
+       ${SRCDIR}lib/librx.a            \
+       ${SRCDIR}lib/afs/libsys.a       \
+       ${SRCDIR}lib/libdes.a           \
+       ${SRCDIR}lib/afs/libcom_err.a   \
+       ${SRCDIR}lib/afs/util.a         \
+       ${SRCDIR}lib/liblwp.a 
+
+headers=${SRCDIR}include/lwp.h         \
+       ${SRCDIR}include/afs/acl.h      \
+       ${SRCDIR}include/afs/errors.h   \
+       ${SRCDIR}include/afs/ptclient.h \
+       ${SRCDIR}include/lock.h         \
+       ${SRCDIR}include/afs/volume.h   \
+       ${SRCDIR}include/afs/vnode.h    \
+       ${SRCDIR}include/rx/rx.h        \
+       ${SRCDIR}include/rx/xdr.h       \
+       ${SRCDIR}include/afs/auth.h     \
+       ${SRCDIR}include/afs/afsint.h   \
+       viced.h                         \
+       host.h                          \
+       fs_stats.h
+
+objects=viced.o                \
+       afsfileprocs.o  \
+       host.o          \
+       physio.o        \
+       callback.o      
+
+include ../config/Makefile.version
+
+noversion: install
+
+all: cbd fsprobe check_sysid
+
+${objects}:${headers}
+viced.o: AFS_component_version_number.o
+
+check_sysid: check_sysid.c
+       ${CC} ${CFLAGS} -IDEST/include -o check_sysid check_sysid.c
+
+fileserver: viced.o ${objects} ${headers} ${LIBS}
+       set -x; \
+       case ${SYS_NAME} in \
+       *linux* | *fbsd* ) \
+           ${CC} ${LDFLAGS} -o fileserver ${objects} \
+           ${auditlib} ${LIBS} ${XLIBS} ;; \
+       rs_aix*) \
+           ${CC} -K ${LDFLAGS} -o fileserver ${objects} \
+           ${auditlib} ${LIBS} ${XLIBS} ;; \
+       *) \
+           ${CC} ${LDFLAGS} -o fileserver ${objects} \
+           ${auditlib} ${LIBS} ${XLIBS} ;; \
+       esac
+
+fsprobe.o: fsprobe.c  AFS_component_version_number.c
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c fsprobe.c
+
+fsprobe: fsprobe.o
+       ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS}  
+
+cbd.o: callback.c AFS_component_version_number.c
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o callback.c
+
+cbd: cbd.o
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS}  
+
+lint:
+       lint -uvn  -I${SRCDIR}include viced.c afsfileprocs.c host.c physio.c callback.c ${SRCDIR}lib/afs/llib-lutil.ln
+
+${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
+       @case ${SYS_NAME} in \
+       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \
+       echo "Don't install fileserver for ${SYS_NAME}" ;; \
+       *) \
+       echo ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ; \
+       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ;; \
+       esac
+
+install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
+       ${INSTALL} fs_stats.h ${DESTDIR}/include/afs
+
+system: install
+
+clean:
+       rm -f *.o llib-lvice.ln fileserver core AFS_component_version_number.c cbd check_sysid fsprobe
+
+beancount:
+       wc -l *.c *.h
diff --git a/src/vlserver/Makefile b/src/vlserver/Makefile
deleted file mode 100644 (file)
index 62dba44..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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
-
-SHELL = /bin/sh
-COMPONENT=vlserver
-include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-KERNELDIR=../libafs/
-UKERNELDIR=../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-             ${SRCDIR}include/afs/keys.h \
-             ${SRCDIR}include/afs/cellconfig.h \
-       vlserver.h vlclient.h vldbint.h
-
-LIBS = \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a
-
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-RXGEN=${SRCDIR}bin/rxgen
-KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h
-UKSRCS=$(KSRCS)
-
-OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o
-
-CDIR=../../../src/${COMPONENT}
-include ../config/Makefile.version
-
-noversion: install
-
-all: 
-
-clean:
-       $(RM) -f *.o vlserver vlclient cnvldb vldbint.cs.c vldbint.ss.c \
-       vldbint.xdr.c vldbint.h Kvldbint.cs.c Kvldbint.xdr.c \
-       core *.a *.otl vlserver.h vldb_check\
-       vl_errors.c AFS_component_version_number.c
-
-vldb_check: vldb_check.c
-       $(CC) ${CFLAGS} -o vldb_check vldb_check.c ${XLIBS} \
-               ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/util.a
-
-cnvldb: cnvldb.o 
-       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${DESTDIR}lib/afs/libcmd.a\
-                ${DESTDIR}lib/afs/util.a                
-
-cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o
-
-sascnvldb: sascnvldb.o 
-       $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${XLIBS}
-
-sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
-
-vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
-       $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o  $(LIBS) ${XLIBS} ${auditlib}
-
-vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o
-vlutils.o: vlutils.c ${INCLS}
-vlprocs.o: vlprocs.c ${INCLS}
-vldbint.ss.o: vldbint.ss.c vldbint.xdr.c
-vldbint.cs.o: vldbint.cs.c vldbint.xdr.c
-vldbint.xdr.o: vldbint.xdr.c vldbint.h
-vldbint.ss.c vldbint.cs.c vldbint.xdr.c vldbint.h: vldbint.xg
-       ${RXGEN} -x vldbint.xg
-
-Kvldbint.cs.c: vldbint.xg
-       ${RXGEN} -x -k -C -o $@ vldbint.xg
-Kvldbint.xdr.c: vldbint.xg
-       ${RXGEN} -x -k -c -o $@ vldbint.xg
-
-libvldb.a: $(OBJS) AFS_component_version_number.o
-       -$(RM) -f libvldb.a
-       $(AR) r libvldb.a $(OBJS) AFS_component_version_number.o
-       $(RANLIB) libvldb.a
-
-vlclient: vlclient.o libvldb.a $(LIBS)
-       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}lib/afs/libcmd.a
-
-vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
-
-vl_errors.o: vl_errors.c
-vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} vl_errors -h vlserver
-
-system: install
-
-kinstall: $(KSRCS)
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
-
-ukinstall webinstall: $(UKSRCS)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
-
-${DESTDIR}root.server/usr/afs/bin/vlserver: vlserver
-       ${INSTALL} vlserver ${DESTDIR}root.server/usr/afs/bin
-
-${DESTDIR}/etc/vldb_convert: cnvldb
-       ${INSTALL} -f cnvldb ${DESTDIR}/etc/vldb_convert
-
-install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check
-       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
-       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
-       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
-       ${INSTALL} vldb_check ${DESTDIR}/etc
-
-libinstall: libvldb.a
-       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
-       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
-       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
new file mode 100644 (file)
index 0000000..f942ac6
--- /dev/null
@@ -0,0 +1,136 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+
+KERNELDIR=../libafs/
+UKERNELDIR=../libuafs/
+COMPILE_ET = ${SRCDIR}bin/compile_et
+
+CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+INCLS=${SRCDIR}include/ubik.h \
+             ${SRCDIR}include/lwp.h \
+             ${SRCDIR}include/lock.h  \
+             ${SRCDIR}include/rx/rx.h \
+             ${SRCDIR}include/rx/xdr.h \
+             ${SRCDIR}include/afs/keys.h \
+             ${SRCDIR}include/afs/cellconfig.h \
+       vlserver.h vlclient.h vldbint.h
+
+LIBS = \
+       ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/librxstat.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/util.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/util.a
+
+auditlib=${SRCDIR}lib/afs/libaudit.a
+
+RXGEN=${SRCDIR}bin/rxgen
+KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h
+UKSRCS=$(KSRCS)
+
+OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o
+
+CDIR=../../../src/vlserver
+include ../config/Makefile.version
+
+noversion: install
+
+all: 
+
+clean:
+       $(RM) -f *.o vlserver vlclient cnvldb vldbint.cs.c vldbint.ss.c \
+       vldbint.xdr.c vldbint.h Kvldbint.cs.c Kvldbint.xdr.c \
+       core *.a *.otl vlserver.h vldb_check\
+       vl_errors.c AFS_component_version_number.c
+
+vldb_check: vldb_check.c
+       $(CC) ${CFLAGS} -o vldb_check vldb_check.c ${XLIBS} \
+               ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/util.a
+
+cnvldb: cnvldb.o 
+       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${DESTDIR}lib/afs/libcmd.a\
+                ${DESTDIR}lib/afs/util.a                
+
+cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o
+
+sascnvldb: sascnvldb.o 
+       $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${XLIBS}
+
+sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
+
+vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
+       $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o  $(LIBS) ${XLIBS} ${auditlib}
+
+vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o
+vlutils.o: vlutils.c ${INCLS}
+vlprocs.o: vlprocs.c ${INCLS}
+vldbint.ss.o: vldbint.ss.c vldbint.xdr.c
+vldbint.cs.o: vldbint.cs.c vldbint.xdr.c
+vldbint.xdr.o: vldbint.xdr.c vldbint.h
+vldbint.ss.c vldbint.cs.c vldbint.xdr.c vldbint.h: vldbint.xg
+       ${RXGEN} -x vldbint.xg
+
+Kvldbint.cs.c: vldbint.xg
+       ${RXGEN} -x -k -C -o $@ vldbint.xg
+Kvldbint.xdr.c: vldbint.xg
+       ${RXGEN} -x -k -c -o $@ vldbint.xg
+
+libvldb.a: $(OBJS) AFS_component_version_number.o
+       -$(RM) -f libvldb.a
+       $(AR) r libvldb.a $(OBJS) AFS_component_version_number.o
+       $(RANLIB) libvldb.a
+
+vlclient: vlclient.o libvldb.a $(LIBS)
+       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}lib/afs/libcmd.a
+
+vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
+
+vl_errors.o: vl_errors.c
+vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
+       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} vl_errors -h vlserver
+
+system: install
+
+kinstall: $(KSRCS)
+       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
+
+ukinstall webinstall: $(UKSRCS)
+       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
+
+${DESTDIR}root.server/usr/afs/bin/vlserver: vlserver
+       ${INSTALL} vlserver ${DESTDIR}root.server/usr/afs/bin
+
+${DESTDIR}/etc/vldb_convert: cnvldb
+       ${INSTALL} -f cnvldb ${DESTDIR}/etc/vldb_convert
+
+install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check
+       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
+       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
+       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
+       ${INSTALL} vldb_check ${DESTDIR}/etc
+
+libinstall: libvldb.a
+       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
+       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
+       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
diff --git a/src/vol/Makefile b/src/vol/Makefile
deleted file mode 100644 (file)
index 6baabcf..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=vol
-include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
-
-INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}include ${FSINCLUDES}
-LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
-
-LIBS= ${DESTDIR}lib/afs/libcmd.a vlib.a ${SRCDIR}lib/afs/util.a \
-       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
-       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
-
-CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG} ${DBG_DEFS}
-
-PROGS = salvager volinfo
-
-PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\
-       fssync.h ihandle.h namei_ops.h
-
-VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
-        clone.o nuke.o devname.o listinodes.o common.o ihandle.o \
-        namei_ops.o
-
-
-OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o 
-
-all:   ${DESTDIR}lib/afs/vlib.a \
-       ${DESTDIR}lib/afs/libvlib.a \
-       ${DESTDIR}root.server/usr/afs/bin/salvager \
-       ${DESTDIR}root.server/usr/afs/bin/volinfo \
-       gi
-
-system: install
-
-kinstall ukinstall webinstall:
-       @echo No kernel source here.
-
-${DESTDIR}root.server/usr/afs/bin/salvager: salvager 
-       ${INSTALL} -s $? $@
-
-${DESTDIR}root.server/usr/afs/bin/volinfo: volinfo
-       ${INSTALL} -s $? $@
-
-${DESTDIR}lib/afs/vlib.a: vlib.a
-       ${INSTALL} $? $@
-
-${DESTDIR}lib/afs/libvlib.a: vlib.a
-       ${INSTALL} $? $@
-
-$(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D:  fs_conv_dux40D
-          ${INSTALL} -s $? $@
-
-$(DESTDIR)root.server/usr/afs/bin/xfs_size_check:  xfs_size_check
-          ${INSTALL} -s $? $@
-
-$(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26:  fs_conv_sol26
-          ${INSTALL} -s $? $@
-
-install: all $(FS_CONV_OSF40D) $(XFS_SIZE_CHECK) $(FS_CONV_SOL26)
-       ${INSTALL} ${PUBLICHEADERS} ${DESTDIR}include/afs
-
-
-${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
-        ${SRCDIR}include/afs/afsint.h vutils.h salvage.h\
-       AFS_component_version_number.c
-
-vol-salvage.o vutil.o: volinodes.h
-
-vlib.a:        ${VLIBOBJS} AFS_component_version_number.o
-       rm -f vlib.a
-       $(AR) r vlib.a ${VLIBOBJS} AFS_component_version_number.o
-       $(RANLIB) vlib.a
-
-# new salvager:  remove references to /vice by linking with novice.o
-salvager: vol-salvage.o physio.o vlib.a
-       ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o ${LIBS}
-
-vol-salvage: vol-salvage.o
-vol-info: vol-info.o physio.o ihandle.o
-
-listinodes.o: listinodes.c AFS_component_version_number.c
-       case ${SYS_NAME} in                             \
-               hp?00_ux101 | hp_ux10? )                \
-                       ${CC} ${CFLAGS} -D_FILE64 -c listinodes.c \
-                               ;;                      \
-               * )     ${CC} ${CFLAGS} -c listinodes.c \
-                               ;;                      \
-       esac
-
-gi: ${DESTDIR}/lib/afs/libsys.a
-       case ${SYS_NAME} in \
-                *linux* | sgi_* | *fbsd* ) \
-                       echo "Don't build gi on ${SYS_NAME}";; \
-                *) \
-                       ${CC} ${CFLAGS} -c gi.c ; \
-                       ${CC} ${LDFLAGS} -o gi gi.o ${DESTDIR}/lib/afs/libsys.a;; \
-        esac
-
-volinfo: vol-info.o physio.o ihandle.o
-       case ${SYS_NAME} in \
-               *linux* | *fbsd*) \
-                       ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
-                               ihandle.o ${LIBS}  ;; \
-               *) \
-                       ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
-                                ihandle.o ${LIBS} ;; \
-       esac
-
-
-fs_conv_dux40D: fs_conv_411.o
-       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} 
-
-fs_conv_sol26: fs_conv_411.o vlib.a 
-       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
-
-fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c fs_conv_411.c
-
-xfs_size_check: xfs_size_check.c
-       ${CC} ${CFLAGS} -o xfs_size_check xfs_size_check.c
-
-clean:
-       rm -f *.o *.a AFS_component_version_number.c
-       rm -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D
-
-
-beancount:
-       wc -l *.c *.h
-
-test:
-       cd test; $(MAKE)
diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
new file mode 100644 (file)
index 0000000..8361bfb
--- /dev/null
@@ -0,0 +1,143 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+include ../config/Makefile.version
+
+INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}include ${FSINCLUDES}
+LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
+
+LIBS= ${DESTDIR}lib/afs/libcmd.a vlib.a ${SRCDIR}lib/afs/util.a \
+       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
+       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
+
+CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG}
+
+PROGS = salvager volinfo
+
+PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\
+       fssync.h ihandle.h namei_ops.h
+
+VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
+        clone.o nuke.o devname.o listinodes.o common.o ihandle.o \
+        namei_ops.o
+
+
+OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o 
+
+all:   ${DESTDIR}lib/afs/vlib.a \
+       ${DESTDIR}lib/afs/libvlib.a \
+       ${DESTDIR}root.server/usr/afs/bin/salvager \
+       ${DESTDIR}root.server/usr/afs/bin/volinfo \
+       gi
+
+system: install
+
+kinstall ukinstall webinstall:
+       @echo No kernel source here.
+
+${DESTDIR}root.server/usr/afs/bin/salvager: salvager 
+       ${INSTALL} -s $? $@
+
+${DESTDIR}root.server/usr/afs/bin/volinfo: volinfo
+       ${INSTALL} -s $? $@
+
+${DESTDIR}lib/afs/vlib.a: vlib.a
+       ${INSTALL} $? $@
+
+${DESTDIR}lib/afs/libvlib.a: vlib.a
+       ${INSTALL} $? $@
+
+$(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D:  fs_conv_dux40D
+          ${INSTALL} -s $? $@
+
+$(DESTDIR)root.server/usr/afs/bin/xfs_size_check:  xfs_size_check
+          ${INSTALL} -s $? $@
+
+$(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26:  fs_conv_sol26
+          ${INSTALL} -s $? $@
+
+install: all $(FS_CONV_OSF40D) $(XFS_SIZE_CHECK) $(FS_CONV_SOL26)
+       ${INSTALL} ${PUBLICHEADERS} ${DESTDIR}include/afs
+
+
+${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
+        ${SRCDIR}include/afs/afsint.h vutils.h salvage.h\
+       AFS_component_version_number.c
+
+vol-salvage.o vutil.o: volinodes.h
+
+vlib.a:        ${VLIBOBJS} AFS_component_version_number.o
+       rm -f vlib.a
+       $(AR) r vlib.a ${VLIBOBJS} AFS_component_version_number.o
+       $(RANLIB) vlib.a
+
+# new salvager:  remove references to /vice by linking with novice.o
+salvager: vol-salvage.o physio.o vlib.a
+       ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o ${LIBS}
+
+vol-salvage: vol-salvage.o
+vol-info: vol-info.o physio.o ihandle.o
+
+listinodes.o: listinodes.c AFS_component_version_number.c
+       case ${SYS_NAME} in                             \
+               hp?00_ux101 | hp_ux10? )                \
+                       ${CC} ${CFLAGS} -D_FILE64 -c listinodes.c \
+                               ;;                      \
+               * )     ${CC} ${CFLAGS} -c listinodes.c \
+                               ;;                      \
+       esac
+
+gi: ${DESTDIR}/lib/afs/libsys.a
+       case ${SYS_NAME} in \
+                *linux* | sgi_* | *fbsd* ) \
+                       echo "Don't build gi on ${SYS_NAME}";; \
+                *) \
+                       ${CC} ${CFLAGS} -c gi.c ; \
+                       ${CC} ${LDFLAGS} -o gi gi.o ${DESTDIR}/lib/afs/libsys.a;; \
+        esac
+
+volinfo: vol-info.o physio.o ihandle.o
+       case ${SYS_NAME} in \
+               *linux* | *fbsd*) \
+                       ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
+                               ihandle.o ${LIBS}  ;; \
+               *) \
+                       ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
+                                ihandle.o ${LIBS} ;; \
+       esac
+
+
+fs_conv_dux40D: fs_conv_411.o
+       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} 
+
+fs_conv_sol26: fs_conv_411.o vlib.a 
+       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
+
+fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
+       ${CC} ${CFLAGS} -c fs_conv_411.c
+
+xfs_size_check: xfs_size_check.c
+       ${CC} ${CFLAGS} -o xfs_size_check xfs_size_check.c
+
+clean:
+       rm -f *.o *.a AFS_component_version_number.c
+       rm -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D
+
+
+beancount:
+       wc -l *.c *.h
+
+test:
+       cd test; $(MAKE)
diff --git a/src/vol/test/Makefile b/src/vol/test/Makefile
deleted file mode 100644 (file)
index dbba05d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=vol
-include ../../config/Makefile.${SYS_NAME}
-
-INCDIRS= -I. -I.. -I${DESTDIR}include ${FSINCLUDES}
-INSTALL = ${SRCDIR}bin/install
-LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
-
-LIBS= ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/vlib.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
-       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
-
-NAMEI_LIBS = ../vlib.a ${SRCDIR}lib/afs/util.a ${DESTDIR}lib/liblwp.a
-
-CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} -g
-
-PROGS = listVicepx
-
-PUBLICHEADERS=../nfs.h ../vnode.h ../viceinode.h ../volume.h ../vldb.h \
-       ../voldefs.h ../partition.h ../fssync.h ../inodeops.h
-
-OBJECTS=listVicepx.o utilities.o  updateDirInode.o
-
-all system: install
-
-kinstall:
-       @echo No kernel source here.
-
-install:  listVicepx updateDirInode testpart
-
-${OBJECTS}:    ${PUBLICHEADERS} ${SRCDIR}include/lwp.h \
-               ${SRCDIR}include/lock.h  ${SRCDIR}include/afs/afsint.h \
-               ../filesignal.h ../vutils.h ../vldb.h ../salvage.h \
-               ../volinodes.h ../qiin.h 
-
-listVicepx.o:  listVicepx.c  utilities.c
-               ${CC} ${CFLAGS} -c listVicepx.c
-               ${CC} ${CFLAGS} -c utilities.c
-
-testpart:      testpart.c ../vlib.a
-               ${CC} ${CFLAGS} ${LDFLAGS} -o $@ testpart.c \
-               ${DESTDIR}lib/afs/vlib.a ${DESTDIR}lib/liblwp.a \
-               ${DESTDIR}lib/afs/util.a ${XLIBS}
-               
-
-listVicepx:    listVicepx.o utilities.o 
-               ${CC} ${LDFLAGS} -o listVicepx listVicepx.o utilities.o ${LIBS} 
-
-updateDirInode.o:      updateDirInode.c  
-               ${CC} ${CFLAGS} -c updateDirInode.c
-
-updateDirInode:        updateDirInode.o 
-               ${CC} ${LDFLAGS} -o updateDirInode updateDirInode.o ${LIBS} 
-
-
-NAMEI_PROGS = nicreate nincdec nino nilist
-namei: ${NAMEI_PROGS}
-
-nicreate: nicreate.o nsubr.o
-       ${CC} ${CFLAGS} -o nicreate nicreate.o nsubr.o ${NAMEI_LIBS}
-
-nincdec: nincdec.o nsubr.o
-       ${CC} ${CFLAGS} -o nincdec nincdec.o nsubr.o ${NAMEI_LIBS}
-
-nilist: nilist.o nsubr.o
-       ${CC} ${CFLAGS} -o nilist nilist.o nsubr.o ${NAMEI_LIBS}
-
-nino: nino.o
-       ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}lib/afs/util.a
-
-clean:
-       rm -f *.o *.a 
-       rm -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode
-
-beancount:
-       wc -l *.c *.h
diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in
new file mode 100644 (file)
index 0000000..fb30a0e
--- /dev/null
@@ -0,0 +1,89 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../../config/Makefile.${SYS_NAME}
+
+INCDIRS= -I. -I.. -I${DESTDIR}include ${FSINCLUDES}
+INSTALL = ${SRCDIR}bin/install
+LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
+
+LIBS= ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/vlib.a \
+       ${SRCDIR}lib/afs/util.a \
+       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
+       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
+
+NAMEI_LIBS = ../vlib.a ${SRCDIR}lib/afs/util.a ${DESTDIR}lib/liblwp.a
+
+CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} -g
+
+PROGS = listVicepx
+
+PUBLICHEADERS=../nfs.h ../vnode.h ../viceinode.h ../volume.h ../vldb.h \
+       ../voldefs.h ../partition.h ../fssync.h ../inodeops.h
+
+OBJECTS=listVicepx.o utilities.o  updateDirInode.o
+
+all system: install
+
+kinstall:
+       @echo No kernel source here.
+
+install:  listVicepx updateDirInode testpart
+
+${OBJECTS}:    ${PUBLICHEADERS} ${SRCDIR}include/lwp.h \
+               ${SRCDIR}include/lock.h  ${SRCDIR}include/afs/afsint.h \
+               ../filesignal.h ../vutils.h ../vldb.h ../salvage.h \
+               ../volinodes.h ../qiin.h 
+
+listVicepx.o:  listVicepx.c  utilities.c
+               ${CC} ${CFLAGS} -c listVicepx.c
+               ${CC} ${CFLAGS} -c utilities.c
+
+testpart:      testpart.c ../vlib.a
+               ${CC} ${CFLAGS} ${LDFLAGS} -o $@ testpart.c \
+               ${DESTDIR}lib/afs/vlib.a ${DESTDIR}lib/liblwp.a \
+               ${DESTDIR}lib/afs/util.a ${XLIBS}
+               
+
+listVicepx:    listVicepx.o utilities.o 
+               ${CC} ${LDFLAGS} -o listVicepx listVicepx.o utilities.o ${LIBS} 
+
+updateDirInode.o:      updateDirInode.c  
+               ${CC} ${CFLAGS} -c updateDirInode.c
+
+updateDirInode:        updateDirInode.o 
+               ${CC} ${LDFLAGS} -o updateDirInode updateDirInode.o ${LIBS} 
+
+
+NAMEI_PROGS = nicreate nincdec nino nilist
+namei: ${NAMEI_PROGS}
+
+nicreate: nicreate.o nsubr.o
+       ${CC} ${CFLAGS} -o nicreate nicreate.o nsubr.o ${NAMEI_LIBS}
+
+nincdec: nincdec.o nsubr.o
+       ${CC} ${CFLAGS} -o nincdec nincdec.o nsubr.o ${NAMEI_LIBS}
+
+nilist: nilist.o nsubr.o
+       ${CC} ${CFLAGS} -o nilist nilist.o nsubr.o ${NAMEI_LIBS}
+
+nino: nino.o
+       ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}lib/afs/util.a
+
+clean:
+       rm -f *.o *.a 
+       rm -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode
+
+beancount:
+       wc -l *.c *.h
diff --git a/src/volser/Makefile b/src/volser/Makefile
deleted file mode 100644 (file)
index ddfc168..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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
-
-SHELL=/bin/sh
-COMPONENT=volser
-include ../config/Makefile.${SYS_NAME}
-
-COMPILE_ET=${SRCDIR}bin/compile_et
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include \
-       ${XCFLAGS} ${DBG_DEFS}
-LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
-
-INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs -I${SRCDIR}include
-INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
-
-VINCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
-       ${SRCDIR}include/afs/vlserver.h vol.h dump.h volser.h  lockdata.h 
-
-RINCLS=${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/afs/keys.h ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/ubik.h ${SRCDIR}include/afs/cmd.h
-
-TARGETS= ${DESTDIR}include/afs/volser.h \
-        ${DESTDIR}include/afs/volint.h \
-        ${DESTDIR}etc/vos \
-        ${DESTDIR}root.server/usr/afs/bin/vos \
-        ${DESTDIR}root.server/usr/afs/bin/volserver \
-        ${DESTDIR}lib/afs/libvolser.a 
-
-INTINCLS=volint.h volser.h 
-
-HACKS=${SRCDIR}lib/afs/libdir.a
-
-LIBS= \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/vlib.a \
-       ${SRCDIR}/lib/afs/libacl.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libvldb.a \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libusd.a \
-       ${SRCDIR}lib/afs/util.a
-
-VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
-SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
- volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o
-COBJS=volint.cs.o volint.xdr.o
-
-include ../config/Makefile.version
-
-all: volserver libvolser.a vos restorevol
-
-restorevol: restorevol.c
-       ${CC} -g ${CFLAGS} -o restorevol restorevol.c \
-               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a
-       ${INSTALL} restorevol ${SRCDIR}etc
-
-vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
-       ${CC} ${LDFLAGS} -g -o vos vos.o $(VSOBJS) libvolser.a  ${LIBS} \
-               ${XLIBS}
-
-libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
-       -rm -f libvolser.a
-       ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o \
-               AFS_component_version_number.o 
-       $(RANLIB) libvolser.a
-
-volser.h volerr.c: volerr.et volser.p.h
-       rm -f volser.h volerr.c; ${COMPILE_ET} volerr -h volser
-
-volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
-       ${SRCDIR}bin/rxgen -x volint.xg
-
-vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
-
-volmain.o: volmain.c ${VINCLS} ${RINCLS} AFS_component_version_number.c
-volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
-dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
-voldump.o: voldump.c ${VINCLS} ${RINCLS}
-vos.o: vos.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
-vsprocs.o: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
-physio.o: physio.c ${VINCLS}
-common.o: common.c ${VINCLS}
-lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
-
-volint.cs.o: volint.cs.c ${INTINCLS}
-volint.ss.o: volint.ss.c ${INTINCLS}
-volint.xdr.o: volint.xdr.c ${INTINCLS}
-
-volserver: $(SOBJS) $(LIBS) $(HACKS)
-       case ${SYS_NAME} in \
-                *linux* | *fbsd* ) \
-                        ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \
-                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
-                *) \
-                        ${CC} ${DBUG} -g -o volserver $(SOBJS) $(HACKS) \
-                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
-        esac
-
-noversion system: install
-
-${DESTDIR}include/afs/volser.h :: volser.h
-       ${INSTALL} $? $@
-
-${DESTDIR}include/afs/volint.h :: volint.h
-       ${INSTALL} $? $@
-
-${DESTDIR}etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos
-       ${INSTALL} $? $@
-
-${DESTDIR}lib/afs/libvolser.a :: libvolser.a
-       ${INSTALL} $? $@
-
-${DESTDIR}root.server/usr/afs/bin/volserver :: volserver
-       ${INSTALL} $? $@
-
-install: all $(TARGETS)
-
-clean:
-       rm -f volserver *.o volint.ss.c volint.cs.c *.a  volint.h \
-       volint.xdr.c vos core volser.h volerr.c AFS_component_version_number.c restorevol
-
-lint:  vos.c vsprocs.c volmain.c volprocs.c lockprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} vos.c
-       lint -hb ${INCDIRS} ${INCLIBS} vsprocs.c
-       lint -hb  ${INCDIRS} ${INCLIBS} volmain.c
-       lint -hb ${INCDIRS} ${INCLIBS}  volprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} lockprocs.c
diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
new file mode 100644 (file)
index 0000000..40ad2bc
--- /dev/null
@@ -0,0 +1,146 @@
+# 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
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL=/bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+COMPILE_ET=${SRCDIR}bin/compile_et
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
+
+INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs -I${SRCDIR}include
+INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
+
+VINCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
+       ${SRCDIR}include/afs/vlserver.h vol.h dump.h volser.h  lockdata.h 
+
+RINCLS=${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
+       ${SRCDIR}include/afs/keys.h ${SRCDIR}include/afs/cellconfig.h \
+       ${SRCDIR}include/ubik.h ${SRCDIR}include/afs/cmd.h
+
+TARGETS= ${DESTDIR}include/afs/volser.h \
+        ${DESTDIR}include/afs/volint.h \
+        ${DESTDIR}etc/vos \
+        ${DESTDIR}root.server/usr/afs/bin/vos \
+        ${DESTDIR}root.server/usr/afs/bin/volserver \
+        ${DESTDIR}lib/afs/libvolser.a 
+
+INTINCLS=volint.h volser.h 
+
+HACKS=${SRCDIR}lib/afs/libdir.a
+
+LIBS= \
+       ${SRCDIR}lib/afs/libaudit.a \
+       ${SRCDIR}lib/afs/vlib.a \
+       ${SRCDIR}/lib/afs/libacl.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/libvldb.a \
+       ${SRCDIR}lib/libubik.a \
+       ${SRCDIR}lib/afs/libauth.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/librxkad.a \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/librxstat.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/libcom_err.a \
+       ${SRCDIR}lib/afs/libkauth.a \
+       ${SRCDIR}lib/afs/libusd.a \
+       ${SRCDIR}lib/afs/util.a
+
+VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
+SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
+ volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o
+COBJS=volint.cs.o volint.xdr.o
+
+include ../config/Makefile.version
+
+all: volserver libvolser.a vos restorevol
+
+restorevol: restorevol.c
+       ${CC} -g ${CFLAGS} -o restorevol restorevol.c \
+               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a
+       ${INSTALL} restorevol ${SRCDIR}etc
+
+vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
+       ${CC} ${LDFLAGS} -g -o vos vos.o $(VSOBJS) libvolser.a  ${LIBS} \
+               ${XLIBS}
+
+libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
+       -rm -f libvolser.a
+       ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o \
+               AFS_component_version_number.o 
+       $(RANLIB) libvolser.a
+
+volser.h volerr.c: volerr.et volser.p.h
+       rm -f volser.h volerr.c; ${COMPILE_ET} volerr -h volser
+
+volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
+       ${SRCDIR}bin/rxgen -x volint.xg
+
+vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
+
+volmain.o: volmain.c ${VINCLS} ${RINCLS} AFS_component_version_number.c
+volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
+dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
+voldump.o: voldump.c ${VINCLS} ${RINCLS}
+vos.o: vos.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
+vsprocs.o: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
+physio.o: physio.c ${VINCLS}
+common.o: common.c ${VINCLS}
+lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
+
+volint.cs.o: volint.cs.c ${INTINCLS}
+volint.ss.o: volint.ss.c ${INTINCLS}
+volint.xdr.o: volint.xdr.c ${INTINCLS}
+
+volserver: $(SOBJS) $(LIBS) $(HACKS)
+       case ${SYS_NAME} in \
+                *linux* | *fbsd* ) \
+                        ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \
+                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
+                *) \
+                        ${CC} ${DBUG} -g -o volserver $(SOBJS) $(HACKS) \
+                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
+        esac
+
+noversion system: install
+
+${DESTDIR}include/afs/volser.h :: volser.h
+       ${INSTALL} $? $@
+
+${DESTDIR}include/afs/volint.h :: volint.h
+       ${INSTALL} $? $@
+
+${DESTDIR}etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos
+       ${INSTALL} $? $@
+
+${DESTDIR}lib/afs/libvolser.a :: libvolser.a
+       ${INSTALL} $? $@
+
+${DESTDIR}root.server/usr/afs/bin/volserver :: volserver
+       ${INSTALL} $? $@
+
+install: all $(TARGETS)
+
+clean:
+       rm -f volserver *.o volint.ss.c volint.cs.c *.a  volint.h \
+       volint.xdr.c vos core volser.h volerr.c AFS_component_version_number.c restorevol
+
+lint:  vos.c vsprocs.c volmain.c volprocs.c lockprocs.c
+       lint -hb ${INCDIRS} ${INCLIBS} vos.c
+       lint -hb ${INCDIRS} ${INCLIBS} vsprocs.c
+       lint -hb  ${INCDIRS} ${INCLIBS} volmain.c
+       lint -hb ${INCDIRS} ${INCLIBS}  volprocs.c
+       lint -hb ${INCDIRS} ${INCLIBS} lockprocs.c
diff --git a/src/wsadmin.src/Makefile b/src/wsadmin.src/Makefile
deleted file mode 100644 (file)
index e4f4c32..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Makefile for the wsadmin src directory, the place where package files
-# are generated.
-#
-#      (C) Copyright Transarc Corporation 1989
-#      Licensed Materials - Property of Transarc
-#      All Rights Reserved.
-#
-CONFIG = \
-       staff.aix_22 \
-       staff.pmax_31 \
-       staff.rt_r4 \
-       staff.dkload.rt_r4 \
-       staff.sun3_35 \
-       staff.sun3_40 \
-       staff.sun3_40x \
-       staff.sun4_40 \
-       staff.sun4_40c \
-       staff.vax_30
-
-BASE_LIBS = \
-       ${wsadmin}/src/admin \
-       ${wsadmin}/lib/devel \
-       ${wsadmin}/lib/base.generic
-
-MACHINE_LIBS = \
-       ${wsadmin}/lib/aix_22.generic \
-       ${wsadmin}/lib/aix_22.generic.dev \
-       ${wsadmin}/lib/aix_22.readonly \
-       ${wsadmin}/lib/aix_22.readwrite \
- \
-       ${wsadmin}/lib/rt_r4.generic \
-       ${wsadmin}/lib/rt_r4.generic.dev \
-       ${wsadmin}/lib/rt_r4.generic.dkload \
-       ${wsadmin}/lib/rt_r4.generic.printer \
-       ${wsadmin}/lib/rt_r4.readonly \
-       ${wsadmin}/lib/rt_r4.readwrite \
- \
-       ${wsadmin}/lib/pmax_31.generic \
-       ${wsadmin}/lib/pmax_31.generic.dev \
-       ${wsadmin}/lib/pmax_31.readonly \
-       ${wsadmin}/lib/pmax_31.readwrite \
- \
-       ${wsadmin}/lib/sun3_35.generic \
-       ${wsadmin}/lib/sun3_35.generic.dev \
-       ${wsadmin}/lib/sun3_35.readonly \
-       ${wsadmin}/lib/sun3_35.readwrite \
- \
-       ${wsadmin}/lib/sun3_40.generic \
-       ${wsadmin}/lib/sun3_40.generic.dev \
-       ${wsadmin}/lib/sun3_40.readonly \
-       ${wsadmin}/lib/sun3_40.readwrite \
- \
-       ${wsadmin}/lib/sun3_40x.generic \
-       ${wsadmin}/lib/sun3_40x.generic.dev \
-       ${wsadmin}/lib/sun3_40x.readonly \
-       ${wsadmin}/lib/sun3_40x.readwrite \
- \
-       ${wsadmin}/lib/sun4_40.generic \
-       ${wsadmin}/lib/sun4_40.generic.dev \
-       ${wsadmin}/lib/sun4_40.readonly \
-       ${wsadmin}/lib/sun4_40.readwrite \
- \
-       ${wsadmin}/lib/sun4_40c.generic \
-       ${wsadmin}/lib/sun4_40c.generic.dev \
-       ${wsadmin}/lib/sun4_40c.readonly \
-       ${wsadmin}/lib/sun4_40c.readwrite \
- \
-       ${wsadmin}/lib/vax_30.generic \
-       ${wsadmin}/lib/vax_30.generic.dev \
-       ${wsadmin}/lib/vax_30.readonly \
-       ${wsadmin}/lib/vax_30.readwrite
-
-LIBS = ${MACHINE_LIBS} ${BASE_LIBS}
-
-.SUFFIXES: .aix_22 \
-               .pmax_31 \
-               .rt_r4 \
-               .proto \
-               .sun3_35 \
-               .sun3_40 \
-               .sun3_40x \
-               .sun4_40 \
-               .sun4_40c \
-               .vax_30
-
-.proto.aix_22: ; mpp -Dwsadmin=${wsadmin} -Dsys=aix_22  -Dname=$* $*.proto > $@
-.proto.pmax_31:        ; mpp -Dwsadmin=${wsadmin} -Dsys=pmax_31 -Dname=$* $*.proto > $@
-.proto.rt_r4:  ; mpp -Dwsadmin=${wsadmin} -Dsys=rt_r4   -Dname=$* $*.proto > $@
-.proto.sun3_35: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_35 -Dname=$* $*.proto > $@
-.proto.sun3_40: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_40 -Dname=$* $*.proto > $@
-.proto.sun3_40x: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_40x -Dname=$* $*.proto > $@
-.proto.sun4_40: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun4_40 -Dname=$* $*.proto > $@
-.proto.sun4_40c: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun4_40c -Dname=$* $*.proto > $@
-.proto.vax_30: ; mpp -Dwsadmin=${wsadmin} -Dsys=vax_30  -Dname=$* $*.proto > $@
-
-all: ${CONFIG}
-
-${CONFIG}: ${LIBS}
-
-system: install
-
-install: ${CONFIG}
-       cp ${CONFIG} ${wsadmin}/etc
-       
-clean:
-       rm -f ${CONFIG} *.BAK *.CKP
diff --git a/src/wsadmin.src/Makefile.in b/src/wsadmin.src/Makefile.in
new file mode 100644 (file)
index 0000000..156c9a4
--- /dev/null
@@ -0,0 +1,112 @@
+#
+# Makefile for the wsadmin src directory, the place where package files
+# are generated.
+#
+#      (C) Copyright Transarc Corporation 1989
+#      Licensed Materials - Property of Transarc
+#      All Rights Reserved.
+#
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+CONFIG = \
+       staff.aix_22 \
+       staff.pmax_31 \
+       staff.rt_r4 \
+       staff.dkload.rt_r4 \
+       staff.sun3_35 \
+       staff.sun3_40 \
+       staff.sun3_40x \
+       staff.sun4_40 \
+       staff.sun4_40c \
+       staff.vax_30
+
+BASE_LIBS = \
+       ${wsadmin}/src/admin \
+       ${wsadmin}/lib/devel \
+       ${wsadmin}/lib/base.generic
+
+MACHINE_LIBS = \
+       ${wsadmin}/lib/aix_22.generic \
+       ${wsadmin}/lib/aix_22.generic.dev \
+       ${wsadmin}/lib/aix_22.readonly \
+       ${wsadmin}/lib/aix_22.readwrite \
+ \
+       ${wsadmin}/lib/rt_r4.generic \
+       ${wsadmin}/lib/rt_r4.generic.dev \
+       ${wsadmin}/lib/rt_r4.generic.dkload \
+       ${wsadmin}/lib/rt_r4.generic.printer \
+       ${wsadmin}/lib/rt_r4.readonly \
+       ${wsadmin}/lib/rt_r4.readwrite \
+ \
+       ${wsadmin}/lib/pmax_31.generic \
+       ${wsadmin}/lib/pmax_31.generic.dev \
+       ${wsadmin}/lib/pmax_31.readonly \
+       ${wsadmin}/lib/pmax_31.readwrite \
+ \
+       ${wsadmin}/lib/sun3_35.generic \
+       ${wsadmin}/lib/sun3_35.generic.dev \
+       ${wsadmin}/lib/sun3_35.readonly \
+       ${wsadmin}/lib/sun3_35.readwrite \
+ \
+       ${wsadmin}/lib/sun3_40.generic \
+       ${wsadmin}/lib/sun3_40.generic.dev \
+       ${wsadmin}/lib/sun3_40.readonly \
+       ${wsadmin}/lib/sun3_40.readwrite \
+ \
+       ${wsadmin}/lib/sun3_40x.generic \
+       ${wsadmin}/lib/sun3_40x.generic.dev \
+       ${wsadmin}/lib/sun3_40x.readonly \
+       ${wsadmin}/lib/sun3_40x.readwrite \
+ \
+       ${wsadmin}/lib/sun4_40.generic \
+       ${wsadmin}/lib/sun4_40.generic.dev \
+       ${wsadmin}/lib/sun4_40.readonly \
+       ${wsadmin}/lib/sun4_40.readwrite \
+ \
+       ${wsadmin}/lib/sun4_40c.generic \
+       ${wsadmin}/lib/sun4_40c.generic.dev \
+       ${wsadmin}/lib/sun4_40c.readonly \
+       ${wsadmin}/lib/sun4_40c.readwrite \
+ \
+       ${wsadmin}/lib/vax_30.generic \
+       ${wsadmin}/lib/vax_30.generic.dev \
+       ${wsadmin}/lib/vax_30.readonly \
+       ${wsadmin}/lib/vax_30.readwrite
+
+LIBS = ${MACHINE_LIBS} ${BASE_LIBS}
+
+.SUFFIXES: .aix_22 \
+               .pmax_31 \
+               .rt_r4 \
+               .proto \
+               .sun3_35 \
+               .sun3_40 \
+               .sun3_40x \
+               .sun4_40 \
+               .sun4_40c \
+               .vax_30
+
+.proto.aix_22: ; mpp -Dwsadmin=${wsadmin} -Dsys=aix_22  -Dname=$* $*.proto > $@
+.proto.pmax_31:        ; mpp -Dwsadmin=${wsadmin} -Dsys=pmax_31 -Dname=$* $*.proto > $@
+.proto.rt_r4:  ; mpp -Dwsadmin=${wsadmin} -Dsys=rt_r4   -Dname=$* $*.proto > $@
+.proto.sun3_35: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_35 -Dname=$* $*.proto > $@
+.proto.sun3_40: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_40 -Dname=$* $*.proto > $@
+.proto.sun3_40x: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun3_40x -Dname=$* $*.proto > $@
+.proto.sun4_40: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun4_40 -Dname=$* $*.proto > $@
+.proto.sun4_40c: ; mpp -Dwsadmin=${wsadmin} -Dsys=sun4_40c -Dname=$* $*.proto > $@
+.proto.vax_30: ; mpp -Dwsadmin=${wsadmin} -Dsys=vax_30  -Dname=$* $*.proto > $@
+
+all: ${CONFIG}
+
+${CONFIG}: ${LIBS}
+
+system: install
+
+install: ${CONFIG}
+       cp ${CONFIG} ${wsadmin}/etc
+       
+clean:
+       rm -f ${CONFIG} *.BAK *.CKP
diff --git a/src/xstat/Makefile b/src/xstat/Makefile
deleted file mode 100644 (file)
index 73a4716..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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
-
-# Makefile for the module providing the client side of the File Server
-# and Cache Manager extended statistics gathering.
-SHELL = /bin/sh
-COMPONENT=xstat
-include ../config/Makefile.${SYS_NAME}
-
-CFLAGS= ${DBUG} -I. \
-       -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
-       -I${SRCDIR} \
-       -I/usr/include ${XCFLAGS}
-
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
-FSINCLS=xstat_fs.h ${RPCINCLS}
-CMINCLS=xstat_cm.h ${RPCINCLS}
-
-AFSLIBS=${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a
-
-LIBS = ${AFSLIBS} 
-
-FSOBJS=xstat_fs.o \
-       xstat_fs_callback.o
-
-CMOBJS=xstat_cm.o
-
-include ../config/Makefile.version
-
-all: libxstat_fs.a xstat_fs_test \
-     libxstat_cm.a xstat_cm_test
-
-#
-# ------------------------------------------ File Server data collection
-#
-libxstat_fs.a: ${FSOBJS} AFS_component_version_number.o
-       -rm -f libxstat_fs.a
-       ${AR} rv libxstat_fs.a ${FSOBJS} AFS_component_version_number.o
-       $(RANLIB) libxstat_fs.a
-
-xstat_fs.o: xstat_fs.c ${FSINCLS}
-
-xstat_fs_callback.o: xstat_fs_callback.c ${FSINCLS}
-
-xstat_fs_test.: xstat_fs_test.c ${FSINCLS}
-
-xstat_fs_test: xstat_fs_test.o libxstat_fs.a ${LIBS}
-       ${CC} ${CFLAGS} -o xstat_fs_test xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS}
-
-#
-# ---------------------------------------- Cache Manager data collection
-#
-libxstat_cm.a: ${CMOBJS} AFS_component_version_number.o
-       -rm -f libxstat_cm.a
-       ${AR} rv libxstat_cm.a ${CMOBJS} AFS_component_version_number.o
-       $(RANLIB) libxstat_cm.a
-
-xstat_cm.o: xstat_cm.c ${CMINCLS}
-
-xstat_cm_test.o: xstat_cm_test.c ${CMINCLS}
-
-xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS}
-       ${CC} ${CFLAGS} -o xstat_cm_test xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS}
-
-#
-# Misc others
-
-#
-system: install
-
-install: all
-       ${INSTALL} xstat_fs.h    ${DESTDIR}include/afs
-       ${INSTALL} xstat_cm.h    ${DESTDIR}include/afs
-       ${INSTALL} libxstat_fs.a ${DESTDIR}lib/afs
-       ${INSTALL} libxstat_cm.a ${DESTDIR}lib/afs
-       ${INSTALL} xstat_fs_test ${DESTDIR}bin
-       ${INSTALL} xstat_cm_test ${DESTDIR}bin
-
-clean:
-       rm -f *.o \
-               xstat_fs_test \
-               xstat_cm_test \
-               libxstat_fs.a \
-               libxstat_cm.a \
-               core\
-               AFS_component_version_number.c
diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in
new file mode 100644 (file)
index 0000000..138902a
--- /dev/null
@@ -0,0 +1,102 @@
+# 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
+
+# Makefile for the module providing the client side of the File Server
+# and Cache Manager extended statistics gathering.
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+SHELL = /bin/sh
+
+include ../config/Makefile.${SYS_NAME}
+
+CFLAGS= ${DBUG} -I. \
+       -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}include \
+       -I${SRCDIR}include/afs \
+       -I${SRCDIR} \
+       -I/usr/include ${XCFLAGS}
+
+RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
+FSINCLS=xstat_fs.h ${RPCINCLS}
+CMINCLS=xstat_cm.h ${RPCINCLS}
+
+AFSLIBS=${SRCDIR}lib/afs/libafsint.a \
+       ${SRCDIR}lib/afs/libcmd.a \
+       ${SRCDIR}lib/librx.a \
+       ${SRCDIR}lib/liblwp.a \
+       ${SRCDIR}lib/afs/libsys.a \
+       ${SRCDIR}lib/afs/util.a
+
+LIBS = ${AFSLIBS} 
+
+FSOBJS=xstat_fs.o \
+       xstat_fs_callback.o
+
+CMOBJS=xstat_cm.o
+
+include ../config/Makefile.version
+
+all: libxstat_fs.a xstat_fs_test \
+     libxstat_cm.a xstat_cm_test
+
+#
+# ------------------------------------------ File Server data collection
+#
+libxstat_fs.a: ${FSOBJS} AFS_component_version_number.o
+       -rm -f libxstat_fs.a
+       ${AR} rv libxstat_fs.a ${FSOBJS} AFS_component_version_number.o
+       $(RANLIB) libxstat_fs.a
+
+xstat_fs.o: xstat_fs.c ${FSINCLS}
+
+xstat_fs_callback.o: xstat_fs_callback.c ${FSINCLS}
+
+xstat_fs_test.: xstat_fs_test.c ${FSINCLS}
+
+xstat_fs_test: xstat_fs_test.o libxstat_fs.a ${LIBS}
+       ${CC} ${CFLAGS} -o xstat_fs_test xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS}
+
+#
+# ---------------------------------------- Cache Manager data collection
+#
+libxstat_cm.a: ${CMOBJS} AFS_component_version_number.o
+       -rm -f libxstat_cm.a
+       ${AR} rv libxstat_cm.a ${CMOBJS} AFS_component_version_number.o
+       $(RANLIB) libxstat_cm.a
+
+xstat_cm.o: xstat_cm.c ${CMINCLS}
+
+xstat_cm_test.o: xstat_cm_test.c ${CMINCLS}
+
+xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS}
+       ${CC} ${CFLAGS} -o xstat_cm_test xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS}
+
+#
+# Misc others
+
+#
+system: install
+
+install: all
+       ${INSTALL} xstat_fs.h    ${DESTDIR}include/afs
+       ${INSTALL} xstat_cm.h    ${DESTDIR}include/afs
+       ${INSTALL} libxstat_fs.a ${DESTDIR}lib/afs
+       ${INSTALL} libxstat_cm.a ${DESTDIR}lib/afs
+       ${INSTALL} xstat_fs_test ${DESTDIR}bin
+       ${INSTALL} xstat_cm_test ${DESTDIR}bin
+
+clean:
+       rm -f *.o \
+               xstat_fs_test \
+               xstat_cm_test \
+               libxstat_fs.a \
+               libxstat_cm.a \
+               core\
+               AFS_component_version_number.c