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

149 files changed:
Makefile.in
configure.in
src/afs/Makefile.in [moved from src/afs/Makefile with 96% similarity]
src/afsd/Makefile.in [moved from src/afsd/Makefile with 98% similarity]
src/afsmonitor/Makefile.in [moved from src/afsmonitor/Makefile with 96% similarity]
src/afsweb/Makefile.in [moved from src/afsweb/Makefile with 99% similarity]
src/audit/Makefile.in [moved from src/audit/Makefile with 96% similarity]
src/auth/Makefile.in [moved from src/auth/Makefile with 97% similarity]
src/auth/test/Makefile.in [moved from src/auth/test/Makefile with 86% similarity]
src/bozo/Makefile.in [moved from src/bozo/Makefile with 97% similarity]
src/bozo/test/Makefile.in [moved from src/bozo/test/Makefile with 90% similarity]
src/bu_utils/Makefile.in [moved from src/bu_utils/Makefile with 92% similarity]
src/bubasics/Makefile.in [moved from src/bubasics/Makefile with 95% similarity]
src/bucoord/Makefile.in [moved from src/bucoord/Makefile with 97% similarity]
src/budb/Makefile.in [moved from src/budb/Makefile with 81% similarity]
src/butc/Makefile.in [moved from src/butc/Makefile with 97% similarity]
src/butm/Makefile.in [moved from src/butm/Makefile with 94% similarity]
src/cmd/Makefile.in [moved from src/cmd/Makefile with 96% similarity]
src/cmd/test/Makefile.in [moved from src/cmd/test/Makefile with 88% similarity]
src/comerr/Makefile.in [moved from src/comerr/Makefile with 93% similarity]
src/comerr/test/Makefile.in [moved from src/comerr/test/Makefile with 90% similarity]
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 [moved from src/config/Makefile with 98% similarity]
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.in [moved from src/dauth/Makefile with 96% similarity]
src/des/Makefile.in [moved from src/des/Makefile with 99% similarity]
src/des/test/Makefile.in [moved from src/des/test/Makefile with 88% similarity]
src/des_stub/Makefile.in [moved from src/des_stub/Makefile with 94% similarity]
src/dir/Makefile.in [moved from src/dir/Makefile with 94% similarity]
src/dir/test/Makefile.in [moved from src/dir/test/Makefile with 92% similarity]
src/export/Makefile.in [moved from src/export/Makefile with 96% similarity]
src/finale/Makefile.in [moved from src/finale/Makefile with 77% similarity]
src/fsint/Makefile.in [moved from src/fsint/Makefile with 97% similarity]
src/fsprobe/Makefile.in [moved from src/fsprobe/Makefile with 96% similarity]
src/ftpd43+/Makefile.in [moved from src/ftpd43+/Makefile with 96% similarity]
src/gtx/Makefile.in [moved from src/gtx/Makefile with 98% similarity]
src/inetd/Makefile.in [moved from src/inetd/Makefile with 94% similarity]
src/kauth/Makefile.in [moved from src/kauth/Makefile with 88% similarity]
src/kauth/test/Makefile.in [moved from src/kauth/test/Makefile with 94% similarity]
src/libacl/Makefile.in [moved from src/libacl/Makefile with 93% similarity]
src/libacl/test/Makefile.in [moved from src/libacl/test/Makefile with 90% similarity]
src/libadmin/Makefile.in [moved from src/libadmin/Makefile with 83% similarity]
src/libadmin/adminutil/Makefile.in [moved from src/libadmin/adminutil/Makefile with 98% similarity]
src/libadmin/bos/Makefile.in [moved from src/libadmin/bos/Makefile with 92% similarity]
src/libadmin/cfg/Makefile.in [moved from src/libadmin/cfg/Makefile with 93% similarity]
src/libadmin/cfg/test/Makefile.in [moved from src/libadmin/cfg/test/Makefile with 93% similarity]
src/libadmin/client/Makefile.in [moved from src/libadmin/client/Makefile with 91% similarity]
src/libadmin/kas/Makefile.in [moved from src/libadmin/kas/Makefile with 93% similarity]
src/libadmin/pts/Makefile.in [moved from src/libadmin/pts/Makefile with 92% similarity]
src/libadmin/samples/Makefile.in [moved from src/libadmin/samples/Makefile with 97% similarity]
src/libadmin/test/Makefile.in [moved from src/libadmin/test/Makefile with 93% similarity]
src/libadmin/vos/Makefile.in [moved from src/libadmin/vos/Makefile with 94% similarity]
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.in [moved from src/libafsauthent/Makefile with 98% similarity]
src/libafsrpc/Makefile.in [moved from src/libafsrpc/Makefile with 94% similarity]
src/libuafs/MakefileProto.AIX.in [moved from src/libuafs/MakefileProto.AIX with 96% similarity]
src/libuafs/MakefileProto.DARWIN.in [moved from src/libuafs/MakefileProto.DARWIN with 96% similarity]
src/libuafs/MakefileProto.DUX.in [moved from src/libuafs/MakefileProto.DUX with 96% similarity]
src/libuafs/MakefileProto.FBSD.in [moved from src/libuafs/MakefileProto.FBSD with 96% similarity]
src/libuafs/MakefileProto.HPUX.in [moved from src/libuafs/MakefileProto.HPUX with 96% similarity]
src/libuafs/MakefileProto.IRIX.in [moved from src/libuafs/MakefileProto.IRIX with 96% similarity]
src/libuafs/MakefileProto.LINUX.in [moved from src/libuafs/MakefileProto.LINUX with 96% similarity]
src/libuafs/MakefileProto.SOLARIS.in [moved from src/libuafs/MakefileProto.SOLARIS with 96% similarity]
src/log/Makefile.in [moved from src/log/Makefile with 96% similarity]
src/log/test/Makefile.in [moved from src/log/test/Makefile with 85% similarity]
src/login/Makefile.in [moved from src/login/Makefile with 97% similarity]
src/lwp/Makefile.in [moved from src/lwp/Makefile with 95% similarity]
src/lwp/test/Makefile.in [moved from src/lwp/test/Makefile with 90% similarity]
src/mpp/Makefile.in [moved from src/mpp/Makefile with 86% similarity]
src/ntp/Makefile.in [moved from src/ntp/Makefile with 98% similarity]
src/null/Makefile.in [moved from src/null/Makefile with 89% similarity]
src/package/Makefile.in [moved from src/package/Makefile with 96% similarity]
src/pam/Makefile.in
src/pinstall/Makefile.in [moved from src/pinstall/Makefile with 96% similarity]
src/pinstall/test/Makefile.in [moved from src/pinstall/test/Makefile with 87% similarity]
src/procmgmt/Makefile.in [moved from src/procmgmt/Makefile with 93% similarity]
src/procmgmt/test/Makefile.in [moved from src/procmgmt/test/Makefile with 90% similarity]
src/ptserver/Makefile.in [moved from src/ptserver/Makefile with 98% similarity]
src/rcp/Makefile.in [moved from src/rcp/Makefile with 96% similarity]
src/rlogind/Makefile.in [moved from src/rlogind/Makefile with 97% similarity]
src/rsh/Makefile.in [moved from src/rsh/Makefile with 96% similarity]
src/rx/Makefile.in [moved from src/rx/Makefile with 88% similarity]
src/rx/bulk.example/Makefile.in [moved from src/rx/bulk.example/Makefile with 91% similarity]
src/rx/bulktest/Makefile.in [moved from src/rx/bulktest/Makefile with 91% similarity]
src/rx/multi.example/Makefile.in [moved from src/rx/multi.example/Makefile with 91% similarity]
src/rx/simple.example/Makefile.in [moved from src/rx/simple.example/Makefile with 91% similarity]
src/rx/test/Makefile.in [moved from src/rx/test/Makefile with 92% similarity]
src/rxgen/Makefile.in [moved from src/rxgen/Makefile with 96% similarity]
src/rxkad/Makefile.in [moved from src/rxkad/Makefile with 97% similarity]
src/rxkad/test/Makefile.in [moved from src/rxkad/test/Makefile with 96% similarity]
src/rxstat/Makefile.in [moved from src/rxstat/Makefile with 95% similarity]
src/scout/Makefile.in [moved from src/scout/Makefile with 96% similarity]
src/sgistuff/Makefile.in [moved from src/sgistuff/Makefile with 96% similarity]
src/sia/Makefile.in [moved from src/sia/Makefile with 95% similarity]
src/sys/Makefile.in [moved from src/sys/Makefile with 98% similarity]
src/tbutc/Makefile.in [moved from src/tbutc/Makefile with 99% similarity]
src/tsm41/Makefile.in [moved from src/tsm41/Makefile with 96% similarity]
src/tviced/Makefile.in [moved from src/tviced/Makefile with 98% similarity]
src/ubik/Makefile.in [moved from src/ubik/Makefile with 98% similarity]
src/update/Makefile.in [moved from src/update/Makefile with 94% similarity]
src/usd/Makefile.in [moved from src/usd/Makefile with 94% similarity]
src/usd/test/Makefile.in [moved from src/usd/test/Makefile with 93% similarity]
src/uss/Makefile.in [moved from src/uss/Makefile with 96% similarity]
src/util/Makefile.in [moved from src/util/Makefile with 97% similarity]
src/util/test/Makefile.in [moved from src/util/test/Makefile with 92% similarity]
src/venus/Makefile.in [moved from src/venus/Makefile with 98% similarity]
src/venus/test/Makefile.in [moved from src/venus/test/Makefile with 90% similarity]
src/vfsck/Makefile.in [moved from src/vfsck/Makefile with 97% similarity]
src/viced/Makefile.in [moved from src/viced/Makefile with 96% similarity]
src/vlserver/Makefile.in [moved from src/vlserver/Makefile with 97% similarity]
src/vol/Makefile.in [moved from src/vol/Makefile with 96% similarity]
src/vol/test/Makefile.in [moved from src/vol/test/Makefile with 96% similarity]
src/volser/Makefile.in [moved from src/volser/Makefile with 97% similarity]
src/wsadmin.src/Makefile.in [moved from src/wsadmin.src/Makefile with 97% similarity]
src/xstat/Makefile.in [moved from src/xstat/Makefile with 96% similarity]

index d108e2f..19b8f48 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 67286e8..4269c3a 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 \
 )
similarity index 96%
rename from src/afs/Makefile
rename to src/afs/Makefile.in
index 063159a..0258168 100644 (file)
@@ -5,13 +5,18 @@
 # 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
 
-COMPONENT=afs
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 
similarity index 98%
rename from src/afsd/Makefile
rename to src/afsd/Makefile.in
index 454b0e1..4d0c8f7 100644 (file)
@@ -6,14 +6,16 @@
 # 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
-DESTDIR = DEST/
-SRCDIR = DEST/
 
 SOURCES = afsd.c sys.c
 
-COMPONENT=afsd
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 
similarity index 96%
rename from src/afsmonitor/Makefile
rename to src/afsmonitor/Makefile.in
index a02e155..a51f005 100644 (file)
@@ -6,11 +6,15 @@
 # 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
-DESTDIR=DEST/
-SRCDIR=DEST/
-COMPONENT=afsmonitor
+
+
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
similarity index 99%
rename from src/afsweb/Makefile
rename to src/afsweb/Makefile.in
index 6c61a62..af38361 100644 (file)
@@ -5,8 +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
-COMPONENT=nsafs
+
 
 include ../config/Makefile.${SYS_NAME}
 
similarity index 96%
rename from src/audit/Makefile
rename to src/audit/Makefile.in
index f102b1e..cd553e0 100644 (file)
 # # supported (if not supported, don't show it).
 # ######################################################################
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 
-COMPONENT=audit
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
similarity index 97%
rename from src/auth/Makefile
rename to src/auth/Makefile.in
index 480ef3e..fa89271 100644 (file)
@@ -5,8 +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
-COMPONENT=auth
+
 
 include ../config/Makefile.${SYS_NAME}
 
similarity index 86%
rename from src/auth/test/Makefile
rename to src/auth/test/Makefile.in
index 81b5ae4..1f1ec5d 100644 (file)
@@ -5,16 +5,20 @@
 # 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=
-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}
+LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
 
similarity index 97%
rename from src/bozo/Makefile
rename to src/bozo/Makefile.in
index faed834..b285ba5 100644 (file)
@@ -5,8 +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
-COMPONENT=bozo
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=$(SRCDIR)bin/compile_et
similarity index 90%
rename from src/bozo/test/Makefile
rename to src/bozo/test/Makefile.in
index 4e43f3b..e1dad6e 100644 (file)
@@ -5,14 +5,18 @@
 # 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=
-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}
 
similarity index 92%
rename from src/bu_utils/Makefile
rename to src/bu_utils/Makefile.in
index 717aacd..07ccfc1 100644 (file)
@@ -5,8 +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
-COMPONENT=bu_utils
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET = ${DESTDIR}/bin/compile_et
similarity index 95%
rename from src/bubasics/Makefile
rename to src/bubasics/Makefile.in
index 237e23c..8b3f2c6 100644 (file)
@@ -5,8 +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
-COMPONENT=bubasics
+
 include ../config/Makefile.${SYS_NAME}
 
 RXGEN=${SRCDIR}bin/rxgen
similarity index 97%
rename from src/bucoord/Makefile
rename to src/bucoord/Makefile.in
index 131686f..968574a 100644 (file)
@@ -5,8 +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
-COMPONENT=bucoord
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET = ${SRCDIR}bin/compile_et
similarity index 81%
rename from src/budb/Makefile
rename to src/budb/Makefile.in
index 836b0c2..6bb2e0c 100644 (file)
@@ -7,9 +7,13 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
-COMPONENT=budb
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET = ${SRCDIR}bin/compile_et
@@ -31,31 +35,22 @@ INCLS= \
        ${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} 
+       ${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
similarity index 97%
rename from src/butc/Makefile
rename to src/butc/Makefile.in
index 19a4701..78e742e 100644 (file)
@@ -5,8 +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
-COMPONENT=butc
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
similarity index 94%
rename from src/butm/Makefile
rename to src/butm/Makefile.in
index 2a6a5f0..f0a55b0 100644 (file)
@@ -7,9 +7,12 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-SRCDIR=DEST/
-DESTDIR=DEST/
 
 CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
@@ -22,7 +25,7 @@ ${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
 
similarity index 96%
rename from src/cmd/Makefile
rename to src/cmd/Makefile.in
index 9f0107f..ee22499 100644 (file)
@@ -6,9 +6,13 @@
 # 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
-COMPONENT=cmd
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET = ${SRCDIR}bin/compile_et
similarity index 88%
rename from src/cmd/test/Makefile
rename to src/cmd/test/Makefile.in
index 68b235d..ccae8f9 100644 (file)
@@ -5,14 +5,19 @@
 # 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
-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
+LIBS=-lcmd -lcom_err -lafsutil
 
 INCDIRS=  -I${SRCDIR}include -I${SRCDIR}include/afs -I.. -I${BACKDIR}include -I${BACKDIR}include/afs
 
similarity index 93%
rename from src/comerr/Makefile
rename to src/comerr/Makefile.in
index 4070a4b..07918f9 100644 (file)
@@ -7,8 +7,13 @@
 #      $Locker$
 #
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=comerr
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
@@ -31,10 +36,8 @@ CFILES=      compile_et.c error_table.c error_msg.c et_name.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}
+include ../config/Makefile.version
 
 system noversion: install
 
@@ -86,9 +89,9 @@ doc:  com_err.dvi
 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 -L${DESTDIR}/lib/afs -lafsutil;; \
        * ) \
-       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o ${utilib} -ll;; \
+       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \
        esac
 
 et.tar:        ${FILES}
similarity index 90%
rename from src/comerr/test/Makefile
rename to src/comerr/test/Makefile.in
index a04dd0c..0da1e54 100644 (file)
@@ -1,12 +1,15 @@
+TOP_SRCDIR=@DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 
-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}
index ae78604..10b6780 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 45cbccb..000238d 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 f26b67d..7e9d5b1 100644 (file)
@@ -38,7 +38,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index f23fc92..8384093 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 058e1f1..aa034cc 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 fc57153..f5843b6 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 a627efa..56435d3 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 1f47b49..3dae1eb 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 38c7dfb..3de5076 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
similarity index 98%
rename from src/config/Makefile
rename to src/config/Makefile.in
index b83c73a..5de7b3e 100644 (file)
@@ -5,10 +5,15 @@
 # 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
-COMPONENT=config
+
 include Makefile.${SYS_NAME}
 
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
index 6edb0b6..3b8ca52 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 6edb0b6..3b8ca52 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 e67acec..07925bf 100644 (file)
@@ -36,7 +36,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
index 72aeaef..c64b724 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 81c039b..1e96ecc 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 9de4d60..9940046 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 74bffa2..1920d8c 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 5876368..2de0753 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 55aa0e3..e427a36 100644 (file)
@@ -38,5 +38,4 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
index 61b385d..dc7e30f 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 925e626..2bdd7ed 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 a8d184f..e1e515d 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 a8d184f..e1e515d 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 a8d184f..e1e515d 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 8d8d8d9..89ae292 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 e6a173b..c35b019 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 7561413..b669ee3 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 2b4bf10..fac5d19 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 b874f4a..7f71a1b 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
similarity index 96%
rename from src/dauth/Makefile
rename to src/dauth/Makefile.in
index 5e7da38..11708a3 100644 (file)
@@ -5,8 +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
-COMPONENT=     dauth
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET =   ${SRCDIR}bin/compile_et
similarity index 99%
rename from src/des/Makefile
rename to src/des/Makefile.in
index 178ae5f..5a00a7d 100644 (file)
 # 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}
 
@@ -153,7 +158,7 @@ TARGOBJS = \
        ${CRYPT_OBJ} \
        util.o
 
-COMPONENT=des
+
 include ../config/Makefile.version
 
 # This is required to get compiler flags, but not use CFLAGS.
similarity index 88%
rename from src/des/test/Makefile
rename to src/des/test/Makefile.in
index 79b0d23..6356801 100644 (file)
@@ -1,6 +1,11 @@
 
-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 CC     = cc
@@ -12,7 +17,6 @@ PROGS         = \
 
 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}
similarity index 94%
rename from src/des_stub/Makefile
rename to src/des_stub/Makefile.in
index c1ce990..0b69de2 100644 (file)
@@ -8,6 +8,10 @@
 # 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}
similarity index 94%
rename from src/dir/Makefile
rename to src/dir/Makefile.in
index e28dad7..41f186f 100644 (file)
@@ -5,8 +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
-COMPONENT=dir
+
 include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
similarity index 92%
rename from src/dir/test/Makefile
rename to src/dir/test/Makefile.in
index 83c0d5c..d596972 100644 (file)
@@ -5,8 +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
-COMPONENT=dtest
+
 include ../../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
similarity index 96%
rename from src/export/Makefile
rename to src/export/Makefile.in
index 98469f2..f02fe4c 100644 (file)
@@ -9,8 +9,12 @@
 #
 # Makefile for EXPORT kernel extension, and friends
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 
-COMPONENT=export
 include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
similarity index 77%
rename from src/finale/Makefile
rename to src/finale/Makefile.in
index 67099f6..4da24c3 100644 (file)
@@ -7,6 +7,10 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
@@ -28,17 +32,23 @@ INCLS=${SRCDIR}include/ubik.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 \
+       ${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}
 
-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
similarity index 97%
rename from src/fsint/Makefile
rename to src/fsint/Makefile.in
index 861d529..46f75c9 100644 (file)
@@ -5,7 +5,12 @@
 # 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
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 include ../config/Makefile.${SYS_NAME}
 SHELL = /bin/sh
 KERNELDIR = ../libafs/
similarity index 96%
rename from src/fsprobe/Makefile
rename to src/fsprobe/Makefile.in
index 97ac1db..4f05bb1 100644 (file)
@@ -8,8 +8,13 @@
 # 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
-COMPONENT=fsprobe
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
similarity index 96%
rename from src/ftpd43+/Makefile
rename to src/ftpd43+/Makefile.in
index dd15e67..11992f0 100644 (file)
 #
 #      @(#)Makefile    5.8 (Berkeley) 9/22/88
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 
-COMPONENT=ftpd43+
 include ../config/Makefile.version
 include ../config/Makefile.${SYS_NAME}
 
similarity index 98%
rename from src/gtx/Makefile
rename to src/gtx/Makefile.in
index 63c028d..6ff3f8e 100644 (file)
@@ -7,9 +7,13 @@
 
 # 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
-COMPONENT=gtx
+
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=$(SRCDIR)bin/compile_et
similarity index 94%
rename from src/inetd/Makefile
rename to src/inetd/Makefile.in
index 37aea02..56de9e3 100644 (file)
@@ -1,5 +1,11 @@
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
-COMPONENT=inetd
+
 include ../config/Makefile.${SYS_NAME}
 
 INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include
similarity index 88%
rename from src/kauth/Makefile
rename to src/kauth/Makefile.in
index b4124f6..a909b12 100644 (file)
@@ -6,10 +6,13 @@
 # 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
-COMPONENT=kauth
+
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR = ../libuafs/
@@ -26,36 +29,37 @@ INCLS=${SRCDIR}include/ubik.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/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 \
-       ${deslib} \
-       ${cmdlib} \
+       ${SRCDIR}lib/libdes.a \
+       ${SRCDIR}lib/afs/libcmd.a \
        ${SRCDIR}lib/afs/libcom_err.a \
-       ${utilib} \
+       ${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 ${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}
+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
@@ -72,8 +76,8 @@ test tests: install
 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: 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
 
@@ -193,13 +197,13 @@ 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}
+       ${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 ${utilib} $(deslib)
+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 ${utilib} $(deslib) ${XLIBS} ${cmdlib}
+               ${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
similarity index 94%
rename from src/kauth/test/Makefile
rename to src/kauth/test/Makefile.in
index b8361e8..7300b44 100644 (file)
@@ -5,8 +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
 
-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
@@ -14,8 +19,6 @@ 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
@@ -28,10 +31,10 @@ clean:
        rm -f *.o core
 
 multiklog: multiklog.o
-       cc -o  multiklog ${CFLAGS} multiklog.o ${utilib}
+       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 ${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
similarity index 93%
rename from src/libacl/Makefile
rename to src/libacl/Makefile.in
index 6656f35..136fe33 100644 (file)
@@ -5,8 +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
-COMPONENT=libacl
+
 include ../config/Makefile.${SYS_NAME}
 
 INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I.. \
similarity index 90%
rename from src/libacl/test/Makefile
rename to src/libacl/test/Makefile.in
index a1b4abb..cbe76ec 100644 (file)
@@ -5,14 +5,18 @@
 # 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/
+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
-utilib=${DESTDIR}lib/afs/util.a
 LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
similarity index 83%
rename from src/libadmin/Makefile
rename to src/libadmin/Makefile.in
index 84fed28..c84ba62 100644 (file)
@@ -5,6 +5,11 @@
 # 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: 
similarity index 98%
rename from src/libadmin/adminutil/Makefile
rename to src/libadmin/adminutil/Makefile.in
index 14ac506..648cc37 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 92%
rename from src/libadmin/bos/Makefile
rename to src/libadmin/bos/Makefile.in
index 5114af0..f045fa4 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 93%
rename from src/libadmin/cfg/Makefile
rename to src/libadmin/cfg/Makefile.in
index 54a8021..34c027b 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 93%
rename from src/libadmin/cfg/test/Makefile
rename to src/libadmin/cfg/test/Makefile.in
index c236ec2..ee649ab 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
similarity index 91%
rename from src/libadmin/client/Makefile
rename to src/libadmin/client/Makefile.in
index c512c7c..a92c2fe 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 93%
rename from src/libadmin/kas/Makefile
rename to src/libadmin/kas/Makefile.in
index c954d29..db18a16 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 92%
rename from src/libadmin/pts/Makefile
rename to src/libadmin/pts/Makefile.in
index 07b1376..875060f 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 97%
rename from src/libadmin/samples/Makefile
rename to src/libadmin/samples/Makefile.in
index b323eda..5be8f3e 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
similarity index 93%
rename from src/libadmin/test/Makefile
rename to src/libadmin/test/Makefile.in
index cab8766..2ad9c9e 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
similarity index 94%
rename from src/libadmin/vos/Makefile
rename to src/libadmin/vos/Makefile.in
index 797ec28..05876f9 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
index 2b908c0..7147a04 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 48d3fff..be15f5e 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 23c8f54..b3894b9 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 c1abece..b13b232 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 13fcbf7..ab9033d 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 89656fe..57e3ab5 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 286f69f..7602e88 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 94850a6..eaf052c 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 505692d..2fed3f3 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
 
similarity index 98%
rename from src/libafsauthent/Makefile
rename to src/libafsauthent/Makefile.in
index 2fe9f04..32e6a8b 100644 (file)
@@ -7,8 +7,13 @@
 
 # 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
-COMPONENT=libafsauthent
+
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
similarity index 94%
rename from src/libafsrpc/Makefile
rename to src/libafsrpc/Makefile.in
index 5140265..44cfdf2 100644 (file)
@@ -7,8 +7,13 @@
 
 # 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
-COMPONENT=libafsrpc
+
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
@@ -107,15 +112,7 @@ LIBOBJS = \
        ${RXSTATOBJS} \
        ${FSINTOBJS}
 
-system install:
-       if [ -f "../des/Makefile" ] ; then \
-               $(MAKE) install.lib ; \
-       else \
-               $(MAKE) libstub ; \
-       fi
-
-install.lib: ${DESTDIR}lib/libafsrpc.a
-
+system install: ${DESTDIR}lib/libafsrpc.a
 
 ${DESTDIR}lib/libafsrpc.a: libafsrpc.a
        ${INSTALL} libafsrpc.a ${DESTDIR}lib/libafsrpc.a
@@ -363,12 +360,3 @@ afsaux.o: ${FSINT}/afsaux.c
 
 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
similarity index 96%
rename from src/libuafs/MakefileProto.AIX
rename to src/libuafs/MakefileProto.AIX.in
index 0ee2219..ad19125 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/libuafs/MakefileProto.DARWIN
rename to src/libuafs/MakefileProto.DARWIN.in
index f507241..636a0a8 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/libuafs/MakefileProto.DUX
rename to src/libuafs/MakefileProto.DUX.in
index 525700c..fd0510c 100644 (file)
@@ -7,6 +7,12 @@
 
 # MakefileProto for Solaris systems
 #
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 DBUG=-O
 
 include ../config/Makefile.${SYS_NAME}
similarity index 96%
rename from src/libuafs/MakefileProto.FBSD
rename to src/libuafs/MakefileProto.FBSD.in
index 5086f2d..924f142 100644 (file)
@@ -2,6 +2,10 @@
 # 
 # MakefileProto for Solaris systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 
similarity index 96%
rename from src/libuafs/MakefileProto.HPUX
rename to src/libuafs/MakefileProto.HPUX.in
index 61aea37..0915f81 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/libuafs/MakefileProto.IRIX
rename to src/libuafs/MakefileProto.IRIX.in
index 039fee9..993e67a 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/libuafs/MakefileProto.LINUX
rename to src/libuafs/MakefileProto.LINUX.in
index 02ac4d7..c76ba65 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/libuafs/MakefileProto.SOLARIS
rename to src/libuafs/MakefileProto.SOLARIS.in
index 0b59c2b..f413019 100644 (file)
@@ -8,6 +8,11 @@
 # 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
similarity index 96%
rename from src/log/Makefile
rename to src/log/Makefile.in
index 270c142..09204ec 100644 (file)
@@ -5,11 +5,15 @@
 # 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
+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 
-utilib=${DESTDIR}lib/afs/util.a
 
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}
 
similarity index 85%
rename from src/log/test/Makefile
rename to src/log/test/Makefile.in
index 16ec358..aa99af0 100644 (file)
@@ -5,15 +5,19 @@
 # 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/
+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
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd ${utilib} ${XLIBS}
+LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 
similarity index 97%
rename from src/login/Makefile
rename to src/login/Makefile.in
index c094a51..86c39b8 100644 (file)
 # @(#)Makefile 5.1 (Berkeley) 10/18/88
 #
 
-COMPONENT=login
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 include ../config/Makefile.${SYS_NAME}
 
 LIBDIR = ${DESTDIR}lib/
similarity index 95%
rename from src/lwp/Makefile
rename to src/lwp/Makefile.in
index 4e01dd1..604cdc4 100644 (file)
@@ -5,8 +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
-COMPONENT=lwp
+
 include ../config/Makefile.${SYS_NAME}
 
 # this is important code, so let's optimize it.  The optimizer aggravates any
@@ -111,8 +116,8 @@ 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: 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
similarity index 90%
rename from src/lwp/test/Makefile
rename to src/lwp/test/Makefile.in
index b37982a..fa5d5d2 100644 (file)
@@ -5,8 +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
 
-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 OPTIMIZE= -g
 
 INCDIRS= -I.. -I${DESTDIR}include 
@@ -43,7 +48,7 @@ selsubs.o: selsubs.c seltest.h
 
 test_key: test_key.o
        ${CC} ${CFLAGS} -g -o test_key test_key.o \
-               ../liblwp.a DEST/lib/afs/util.a
+               ../liblwp.a $(DESTDIR)/lib/afs/util.a
 
 
 
similarity index 86%
rename from src/mpp/Makefile
rename to src/mpp/Makefile.in
index 403dbdd..20a8dd5 100644 (file)
@@ -1,16 +1,21 @@
 #
 #      (C) Copyright 10/17/86 by Carnegie Mellon University
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 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
 
similarity index 98%
rename from src/ntp/Makefile
rename to src/ntp/Makefile.in
index b50463d..282bfbf 100644 (file)
@@ -5,8 +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
-COMPONENT=ntp
+
 include ../config/Makefile.${SYS_NAME}
 
 INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}include
similarity index 89%
rename from src/null/Makefile
rename to src/null/Makefile.in
index 7ab2cda..79024d8 100644 (file)
@@ -6,11 +6,16 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 # Makefile for the null library.
-DESTDIR=DEST/
-SRCDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 SHELL=/bin/sh
 
-COMPONENT=null
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 CFLAGS = ${XCFLAGS}
similarity index 96%
rename from src/package/Makefile
rename to src/package/Makefile.in
index 7087c03..7b68dee 100644 (file)
@@ -4,9 +4,13 @@
 #
 # Makefile for package, the AFS workstation configuration tool.
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL    = /bin/sh
-COMPONENT=package
+
 include ../config/Makefile.${SYS_NAME}
 
 INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}include
index ee906d2..5f63cd5 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/
similarity index 96%
rename from src/pinstall/Makefile
rename to src/pinstall/Makefile.in
index bd0f457..6aaee98 100644 (file)
 ######################################################################
 
 # Make modified install
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=pinstall
+
 include ../config/Makefile.${SYS_NAME}
 
 LIBS= ${XLIBS}
similarity index 87%
rename from src/pinstall/test/Makefile
rename to src/pinstall/test/Makefile.in
index b5b2b93..e4a5bc5 100644 (file)
@@ -7,9 +7,13 @@
 
 # There's really not much in here to build...
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 
-SRCDIR=DEST/
-DESTDIR=DEST/
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
similarity index 93%
rename from src/procmgmt/Makefile
rename to src/procmgmt/Makefile.in
index 4e2d202..def0c21 100644 (file)
@@ -5,6 +5,11 @@
 # 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
 
similarity index 90%
rename from src/procmgmt/test/Makefile
rename to src/procmgmt/test/Makefile.in
index bafe395..2db9394 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
similarity index 98%
rename from src/ptserver/Makefile
rename to src/ptserver/Makefile.in
index ed79932..124e59d 100644 (file)
@@ -4,9 +4,13 @@
 # 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
-COMPONENT=ptserver
+
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
similarity index 96%
rename from src/rcp/Makefile
rename to src/rcp/Makefile.in
index 5c7a69a..b48063f 100644 (file)
 #
 # @(#)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
-COMPONENT=rcp
+
 
 CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
 LIBDIR = ${DESTDIR}lib/
similarity index 97%
rename from src/rlogind/Makefile
rename to src/rlogind/Makefile.in
index 241442f..385e57f 100644 (file)
 #
 # @(#)Makefile 5.3 (Berkeley) 9/20/88
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL=/bin/sh
-COMPONENT=rlogind
+
 include ../config/Makefile.${SYS_NAME}
 
 LIBC=  /lib/libc.a
similarity index 96%
rename from src/rsh/Makefile
rename to src/rsh/Makefile.in
index 5f9dc3e..9c78f32 100644 (file)
 #
 # @(#)Makefile 5.1 (Berkeley) 9/20/88
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
-COMPONENT=rsh
+
 include ../config/Makefile.${SYS_NAME}
 
 LIBDIR = ${DESTDIR}lib/
similarity index 88%
rename from src/rx/Makefile
rename to src/rx/Makefile.in
index 1d75a84..a6babcc 100644 (file)
@@ -5,8 +5,14 @@
 # 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
-COMPONENT=rx
+
 include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
@@ -62,7 +68,6 @@ 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
@@ -144,24 +149,7 @@ includes: rx.h rx_user.h rx_event.h rx_queue.h rx_clock.h xdr.h rx_null.h rx_glo
 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
+       $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx
 
 ukinstall webinstall: includes
        set $(UKERNELDIR)rx; $(MKDIR_IF_NEEDED)
similarity index 91%
rename from src/rx/bulk.example/Makefile
rename to src/rx/bulk.example/Makefile.in
index 00a59bc..1a0f9e7 100644 (file)
@@ -5,6 +5,11 @@
 # 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/
similarity index 91%
rename from src/rx/bulktest/Makefile
rename to src/rx/bulktest/Makefile.in
index 00a59bc..1a0f9e7 100644 (file)
@@ -5,6 +5,11 @@
 # 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/
similarity index 91%
rename from src/rx/multi.example/Makefile
rename to src/rx/multi.example/Makefile.in
index fa56eb7..76f06d1 100644 (file)
@@ -5,6 +5,11 @@
 # 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/
similarity index 91%
rename from src/rx/simple.example/Makefile
rename to src/rx/simple.example/Makefile.in
index 2acab6e..688d785 100644 (file)
@@ -5,6 +5,11 @@
 # 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/
similarity index 92%
rename from src/rx/test/Makefile
rename to src/rx/test/Makefile.in
index c46ca9f..fb2da46 100644 (file)
@@ -5,15 +5,19 @@
 # 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
+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  
-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}
+        ${DESTDIR}/lib/util.a ${DESTDIR}/lib/afs/libsys.a ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${LIBS} ${XCFLAGS}
 
similarity index 96%
rename from src/rxgen/Makefile
rename to src/rxgen/Makefile.in
index bf186b8..cb48bf1 100644 (file)
@@ -4,8 +4,13 @@
 # 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
-COMPONENT=rxgen
+
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
similarity index 97%
rename from src/rxkad/Makefile
rename to src/rxkad/Makefile.in
index 622ce58..9c32f56 100644 (file)
@@ -7,9 +7,13 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
-COMPONENT=rxkad
+
 include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
similarity index 96%
rename from src/rxkad/test/Makefile
rename to src/rxkad/test/Makefile.in
index ebca710..851df14 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
 
similarity index 95%
rename from src/rxstat/Makefile
rename to src/rxstat/Makefile.in
index 272ecc3..921f879 100644 (file)
@@ -5,6 +5,11 @@
 # 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
similarity index 96%
rename from src/scout/Makefile
rename to src/scout/Makefile.in
index 0f567a0..bcd14f5 100644 (file)
@@ -5,9 +5,14 @@
 # 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
-COMPONENT=scout
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS= ${DBUG} -I. \
similarity index 96%
rename from src/sgistuff/Makefile
rename to src/sgistuff/Makefile.in
index 3497313..0e91ebe 100644 (file)
@@ -5,6 +5,11 @@
 # 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
similarity index 95%
rename from src/sia/Makefile
rename to src/sia/Makefile.in
index 826bdac..4b9cc45 100644 (file)
@@ -7,9 +7,13 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
-COMPONENT=sia
+
 DEBUG = 
 #UNRESOLVED = -expect_unresolved \*
 UNRESOLVED =
similarity index 98%
rename from src/sys/Makefile
rename to src/sys/Makefile.in
index d7b5c69..b9f9da0 100644 (file)
@@ -7,14 +7,19 @@
 
 # System calls.
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 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}
+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
similarity index 99%
rename from src/tbutc/Makefile
rename to src/tbutc/Makefile.in
index e26124c..995f791 100644 (file)
@@ -7,10 +7,12 @@
 
 # */
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL    =/bin/sh
-SRCDIR   =DEST/
-DESTDIR  =DEST/
-COMPONENT=tbutc
 
 include ../config/Makefile.${SYS_NAME}
 
similarity index 96%
rename from src/tsm41/Makefile
rename to src/tsm41/Makefile.in
index 9214e07..750bead 100644 (file)
@@ -5,6 +5,11 @@
 # 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}
similarity index 98%
rename from src/tviced/Makefile
rename to src/tviced/Makefile.in
index 83bab93..e7fd31b 100644 (file)
@@ -5,8 +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
-COMPONENT=tviced
+
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
similarity index 98%
rename from src/ubik/Makefile
rename to src/ubik/Makefile.in
index 60100af..49fd405 100644 (file)
@@ -5,8 +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
-COMPONENT=ubik
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
similarity index 94%
rename from src/update/Makefile
rename to src/update/Makefile.in
index b4b45ec..3f18202 100644 (file)
@@ -5,8 +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
-COMPONENT=update
+
 include ../config/Makefile.${SYS_NAME}
 
 LIBRX=${SRCDIR}lib/librx.a
similarity index 94%
rename from src/usd/Makefile
rename to src/usd/Makefile.in
index a6cdad6..e7aadd2 100644 (file)
@@ -5,8 +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
-COMPONENT=ptserver
+
 include ../config/Makefile.${SYS_NAME}
 
 RXGEN=${SRCDIR}bin/rxgen
similarity index 93%
rename from src/usd/test/Makefile
rename to src/usd/test/Makefile.in
index ffeab39..095d347 100644 (file)
@@ -5,6 +5,11 @@
 # 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
similarity index 96%
rename from src/uss/Makefile
rename to src/uss/Makefile.in
index 9b044bb..8d4f9b8 100644 (file)
@@ -7,9 +7,13 @@
 
 # uss Makefile
 
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
 
 SHELL=/bin/sh
-COMPONENT=uss
+
 include ../config/Makefile.${SYS_NAME}
 
 #
similarity index 97%
rename from src/util/Makefile
rename to src/util/Makefile.in
index 8bf9c54..780dace 100644 (file)
@@ -5,8 +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
-COMPONENT=util
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I$(SRCDIR)include ${XCFLAGS}
similarity index 92%
rename from src/util/test/Makefile
rename to src/util/test/Makefile.in
index baf9545..4a97d37 100644 (file)
@@ -5,6 +5,11 @@
 # 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
similarity index 98%
rename from src/venus/Makefile
rename to src/venus/Makefile.in
index 507852f..9407b9b 100644 (file)
@@ -5,8 +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
-COMPONENT=venus
+
 LINUX_VERS=dummy
 include ../config/Makefile.${SYS_NAME}
 
similarity index 90%
rename from src/venus/test/Makefile
rename to src/venus/test/Makefile.in
index b3e40f7..64e4819 100644 (file)
@@ -5,16 +5,20 @@
 # 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=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}
+LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS}
 
similarity index 97%
rename from src/vfsck/Makefile
rename to src/vfsck/Makefile.in
index 9598045..d4d3df1 100644 (file)
 #
 #      @(#)Makefile    5.12 (Berkeley) 6/26/89
 #
-COMPONENT=vfsck
+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}
similarity index 96%
rename from src/viced/Makefile
rename to src/viced/Makefile.in
index 2c5ac08..2bd2124 100644 (file)
@@ -5,14 +5,19 @@
 # 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
-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
+        ${XCFLAGS} -DRXDEBUG
 LDFLAGS = ${DBUG} ${XLDFLAGS}
 
 UTILLIB=${SRCDIR}lib/afs/util.a
similarity index 97%
rename from src/vlserver/Makefile
rename to src/vlserver/Makefile.in
index 62dba44..f942ac6 100644 (file)
@@ -5,8 +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
-COMPONENT=vlserver
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
@@ -45,7 +50,7 @@ UKSRCS=$(KSRCS)
 
 OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o
 
-CDIR=../../../src/${COMPONENT}
+CDIR=../../../src/vlserver
 include ../config/Makefile.version
 
 noversion: install
similarity index 96%
rename from src/vol/Makefile
rename to src/vol/Makefile.in
index 6baabcf..8361bfb 100644 (file)
@@ -5,8 +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
-COMPONENT=vol
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 
@@ -17,7 +22,7 @@ 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}
+CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG}
 
 PROGS = salvager volinfo
 
similarity index 96%
rename from src/vol/test/Makefile
rename to src/vol/test/Makefile.in
index dbba05d..fb30a0e 100644 (file)
@@ -5,8 +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
-COMPONENT=vol
+
 include ../../config/Makefile.${SYS_NAME}
 
 INCDIRS= -I. -I.. -I${DESTDIR}include ${FSINCLUDES}
similarity index 97%
rename from src/volser/Makefile
rename to src/volser/Makefile.in
index ddfc168..40ad2bc 100644 (file)
@@ -5,13 +5,17 @@
 # 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
-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}
+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
similarity index 97%
rename from src/wsadmin.src/Makefile
rename to src/wsadmin.src/Makefile.in
index e4f4c32..156c9a4 100644 (file)
@@ -6,6 +6,11 @@
 #      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 \
similarity index 96%
rename from src/xstat/Makefile
rename to src/xstat/Makefile.in
index 73a4716..138902a 100644 (file)
@@ -7,8 +7,13 @@
 
 # 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
-COMPONENT=xstat
+
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS= ${DBUG} -I. \