From 0207991adcc2aa2b417abc73469ced3586465640 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Thu, 2 Aug 2001 16:45:35 +0000 Subject: [PATCH] convert-all-makefiles-to-makefile-ins-20010802 all relevant variables become subst'd and not passed in the environment --- Makefile.in | 66 ++++------- configure.in | 107 ++++++++++++++++++ src/afs/{Makefile => Makefile.in} | 7 +- src/afsd/{Makefile => Makefile.in} | 8 +- src/afsmonitor/{Makefile => Makefile.in} | 10 +- src/afsweb/{Makefile => Makefile.in} | 7 +- src/audit/{Makefile => Makefile.in} | 7 +- src/auth/{Makefile => Makefile.in} | 7 +- src/auth/test/{Makefile => Makefile.in} | 10 +- src/bozo/{Makefile => Makefile.in} | 7 +- src/bozo/test/{Makefile => Makefile.in} | 8 +- src/bu_utils/{Makefile => Makefile.in} | 7 +- src/bubasics/{Makefile => Makefile.in} | 7 +- src/bucoord/{Makefile => Makefile.in} | 7 +- src/budb/{Makefile => Makefile.in} | 43 ++++--- src/butc/{Makefile => Makefile.in} | 7 +- src/butm/{Makefile => Makefile.in} | 9 +- src/cmd/{Makefile => Makefile.in} | 6 +- src/cmd/test/{Makefile => Makefile.in} | 11 +- src/comerr/{Makefile => Makefile.in} | 15 ++- src/comerr/test/{Makefile => Makefile.in} | 9 +- src/config/Makefile.alpha_dux40.in | 1 - src/config/Makefile.alpha_dux50.in | 1 - src/config/Makefile.alpha_linux_22.in | 1 - src/config/Makefile.hp_ux102.in | 1 - src/config/Makefile.hp_ux110.in | 1 - src/config/Makefile.i386_djgpp | 3 - src/config/Makefile.i386_fbsd_42.in | 4 - src/config/Makefile.i386_linux22.in | 1 - src/config/Makefile.i386_linux24.in | 1 - src/config/{Makefile => Makefile.in} | 7 +- src/config/Makefile.ppc_darwin_12.in | 3 - src/config/Makefile.ppc_darwin_13.in | 3 - src/config/Makefile.ppc_linux22.in | 1 - src/config/Makefile.ppc_linux24.in | 2 +- src/config/Makefile.rs_aix42.in | 1 - src/config/Makefile.s390_linux22.in | 1 - src/config/Makefile.s390_linux24.in | 1 - src/config/Makefile.sgi_62.in | 1 - src/config/Makefile.sgi_63.in | 1 - src/config/Makefile.sgi_64.in | 1 - src/config/Makefile.sgi_65.in | 1 - src/config/Makefile.sparc64_linux22.in | 1 - src/config/Makefile.sparc64_linux24.in | 1 - src/config/Makefile.sparc_linux22.in | 1 - src/config/Makefile.sun4x_55.in | 1 - src/config/Makefile.sun4x_56.in | 1 - src/config/Makefile.sun4x_57.in | 1 - src/config/Makefile.sun4x_58.in | 1 - src/config/Makefile.sunx86_54.in | 1 - src/dauth/{Makefile => Makefile.in} | 7 +- src/des/{Makefile => Makefile.in} | 7 +- src/des/test/{Makefile => Makefile.in} | 10 +- src/des_stub/{Makefile => Makefile.in} | 4 + src/dir/{Makefile => Makefile.in} | 7 +- src/dir/test/{Makefile => Makefile.in} | 7 +- src/export/{Makefile => Makefile.in} | 6 +- src/finale/{Makefile => Makefile.in} | 30 +++-- src/fsint/{Makefile => Makefile.in} | 7 +- src/fsprobe/{Makefile => Makefile.in} | 7 +- src/ftpd43+/{Makefile => Makefile.in} | 6 +- src/gtx/{Makefile => Makefile.in} | 6 +- src/inetd/{Makefile => Makefile.in} | 8 +- src/kauth/{Makefile => Makefile.in} | 50 ++++---- src/kauth/test/{Makefile => Makefile.in} | 15 ++- src/libacl/{Makefile => Makefile.in} | 7 +- src/libacl/test/{Makefile => Makefile.in} | 10 +- src/libadmin/{Makefile => Makefile.in} | 5 + .../adminutil/{Makefile => Makefile.in} | 5 + src/libadmin/bos/{Makefile => Makefile.in} | 5 + src/libadmin/cfg/{Makefile => Makefile.in} | 5 + .../cfg/test/{Makefile => Makefile.in} | 5 + src/libadmin/client/{Makefile => Makefile.in} | 5 + src/libadmin/kas/{Makefile => Makefile.in} | 5 + src/libadmin/pts/{Makefile => Makefile.in} | 5 + .../samples/{Makefile => Makefile.in} | 5 + src/libadmin/test/{Makefile => Makefile.in} | 5 + src/libadmin/vos/{Makefile => Makefile.in} | 5 + src/libafs/Makefile.common | 2 - src/libafs/MakefileProto.AIX.in | 5 +- src/libafs/MakefileProto.DARWIN.in | 5 +- src/libafs/MakefileProto.DUX.in | 5 +- src/libafs/MakefileProto.FBSD.in | 7 +- src/libafs/MakefileProto.HPUX.in | 7 +- src/libafs/MakefileProto.IRIX.in | 9 +- src/libafs/MakefileProto.LINUX.in | 7 +- src/libafs/MakefileProto.SOLARIS.in | 7 +- src/libafsauthent/{Makefile => Makefile.in} | 7 +- src/libafsrpc/{Makefile => Makefile.in} | 26 ++--- ...MakefileProto.AIX => MakefileProto.AIX.in} | 5 + ...leProto.DARWIN => MakefileProto.DARWIN.in} | 5 + ...MakefileProto.DUX => MakefileProto.DUX.in} | 6 + ...kefileProto.FBSD => MakefileProto.FBSD.in} | 4 + ...kefileProto.HPUX => MakefileProto.HPUX.in} | 5 + ...kefileProto.IRIX => MakefileProto.IRIX.in} | 5 + ...fileProto.LINUX => MakefileProto.LINUX.in} | 5 + ...Proto.SOLARIS => MakefileProto.SOLARIS.in} | 5 + src/log/{Makefile => Makefile.in} | 8 +- src/log/test/{Makefile => Makefile.in} | 12 +- src/login/{Makefile => Makefile.in} | 7 +- src/lwp/{Makefile => Makefile.in} | 11 +- src/lwp/test/{Makefile => Makefile.in} | 11 +- src/mpp/{Makefile => Makefile.in} | 11 +- src/ntp/{Makefile => Makefile.in} | 7 +- src/null/{Makefile => Makefile.in} | 11 +- src/package/{Makefile => Makefile.in} | 6 +- src/pam/Makefile.in | 5 +- src/pinstall/{Makefile => Makefile.in} | 7 +- src/pinstall/test/{Makefile => Makefile.in} | 8 +- src/procmgmt/{Makefile => Makefile.in} | 5 + src/procmgmt/test/{Makefile => Makefile.in} | 5 + src/ptserver/{Makefile => Makefile.in} | 6 +- src/rcp/{Makefile => Makefile.in} | 7 +- src/rlogind/{Makefile => Makefile.in} | 6 +- src/rsh/{Makefile => Makefile.in} | 7 +- src/rx/{Makefile => Makefile.in} | 28 ++--- src/rx/bulk.example/{Makefile => Makefile.in} | 5 + src/rx/bulktest/{Makefile => Makefile.in} | 5 + .../multi.example/{Makefile => Makefile.in} | 5 + .../simple.example/{Makefile => Makefile.in} | 5 + src/rx/test/{Makefile => Makefile.in} | 10 +- src/rxgen/{Makefile => Makefile.in} | 7 +- src/rxkad/{Makefile => Makefile.in} | 6 +- src/rxkad/test/{Makefile => Makefile.in} | 5 + src/rxstat/{Makefile => Makefile.in} | 5 + src/scout/{Makefile => Makefile.in} | 7 +- src/sgistuff/{Makefile => Makefile.in} | 5 + src/sia/{Makefile => Makefile.in} | 6 +- src/sys/{Makefile => Makefile.in} | 9 +- src/tbutc/{Makefile => Makefile.in} | 8 +- src/tsm41/{Makefile => Makefile.in} | 5 + src/tviced/{Makefile => Makefile.in} | 7 +- src/ubik/{Makefile => Makefile.in} | 7 +- src/update/{Makefile => Makefile.in} | 7 +- src/usd/{Makefile => Makefile.in} | 7 +- src/usd/test/{Makefile => Makefile.in} | 5 + src/uss/{Makefile => Makefile.in} | 6 +- src/util/{Makefile => Makefile.in} | 7 +- src/util/test/{Makefile => Makefile.in} | 5 + src/venus/{Makefile => Makefile.in} | 7 +- src/venus/test/{Makefile => Makefile.in} | 12 +- src/vfsck/{Makefile => Makefile.in} | 7 +- src/viced/{Makefile => Makefile.in} | 9 +- src/vlserver/{Makefile => Makefile.in} | 9 +- src/vol/{Makefile => Makefile.in} | 9 +- src/vol/test/{Makefile => Makefile.in} | 7 +- src/volser/{Makefile => Makefile.in} | 10 +- src/wsadmin.src/{Makefile => Makefile.in} | 5 + src/xstat/{Makefile => Makefile.in} | 7 +- 149 files changed, 861 insertions(+), 319 deletions(-) rename src/afs/{Makefile => Makefile.in} (96%) rename src/afsd/{Makefile => Makefile.in} (98%) rename src/afsmonitor/{Makefile => Makefile.in} (96%) rename src/afsweb/{Makefile => Makefile.in} (99%) rename src/audit/{Makefile => Makefile.in} (96%) rename src/auth/{Makefile => Makefile.in} (97%) rename src/auth/test/{Makefile => Makefile.in} (86%) rename src/bozo/{Makefile => Makefile.in} (97%) rename src/bozo/test/{Makefile => Makefile.in} (90%) rename src/bu_utils/{Makefile => Makefile.in} (92%) rename src/bubasics/{Makefile => Makefile.in} (95%) rename src/bucoord/{Makefile => Makefile.in} (97%) rename src/budb/{Makefile => Makefile.in} (81%) rename src/butc/{Makefile => Makefile.in} (97%) rename src/butm/{Makefile => Makefile.in} (94%) rename src/cmd/{Makefile => Makefile.in} (96%) rename src/cmd/test/{Makefile => Makefile.in} (88%) rename src/comerr/{Makefile => Makefile.in} (93%) rename src/comerr/test/{Makefile => Makefile.in} (90%) rename src/config/{Makefile => Makefile.in} (98%) rename src/dauth/{Makefile => Makefile.in} (96%) rename src/des/{Makefile => Makefile.in} (99%) rename src/des/test/{Makefile => Makefile.in} (88%) rename src/des_stub/{Makefile => Makefile.in} (94%) rename src/dir/{Makefile => Makefile.in} (94%) rename src/dir/test/{Makefile => Makefile.in} (92%) rename src/export/{Makefile => Makefile.in} (96%) rename src/finale/{Makefile => Makefile.in} (77%) rename src/fsint/{Makefile => Makefile.in} (97%) rename src/fsprobe/{Makefile => Makefile.in} (96%) rename src/ftpd43+/{Makefile => Makefile.in} (96%) rename src/gtx/{Makefile => Makefile.in} (98%) rename src/inetd/{Makefile => Makefile.in} (94%) rename src/kauth/{Makefile => Makefile.in} (88%) rename src/kauth/test/{Makefile => Makefile.in} (94%) rename src/libacl/{Makefile => Makefile.in} (93%) rename src/libacl/test/{Makefile => Makefile.in} (90%) rename src/libadmin/{Makefile => Makefile.in} (83%) rename src/libadmin/adminutil/{Makefile => Makefile.in} (98%) rename src/libadmin/bos/{Makefile => Makefile.in} (92%) rename src/libadmin/cfg/{Makefile => Makefile.in} (93%) rename src/libadmin/cfg/test/{Makefile => Makefile.in} (93%) rename src/libadmin/client/{Makefile => Makefile.in} (91%) rename src/libadmin/kas/{Makefile => Makefile.in} (93%) rename src/libadmin/pts/{Makefile => Makefile.in} (92%) rename src/libadmin/samples/{Makefile => Makefile.in} (97%) rename src/libadmin/test/{Makefile => Makefile.in} (93%) rename src/libadmin/vos/{Makefile => Makefile.in} (94%) rename src/libafsauthent/{Makefile => Makefile.in} (98%) rename src/libafsrpc/{Makefile => Makefile.in} (94%) rename src/libuafs/{MakefileProto.AIX => MakefileProto.AIX.in} (96%) rename src/libuafs/{MakefileProto.DARWIN => MakefileProto.DARWIN.in} (96%) rename src/libuafs/{MakefileProto.DUX => MakefileProto.DUX.in} (96%) rename src/libuafs/{MakefileProto.FBSD => MakefileProto.FBSD.in} (96%) rename src/libuafs/{MakefileProto.HPUX => MakefileProto.HPUX.in} (96%) rename src/libuafs/{MakefileProto.IRIX => MakefileProto.IRIX.in} (96%) rename src/libuafs/{MakefileProto.LINUX => MakefileProto.LINUX.in} (96%) rename src/libuafs/{MakefileProto.SOLARIS => MakefileProto.SOLARIS.in} (96%) rename src/log/{Makefile => Makefile.in} (96%) rename src/log/test/{Makefile => Makefile.in} (85%) rename src/login/{Makefile => Makefile.in} (97%) rename src/lwp/{Makefile => Makefile.in} (95%) rename src/lwp/test/{Makefile => Makefile.in} (90%) rename src/mpp/{Makefile => Makefile.in} (86%) rename src/ntp/{Makefile => Makefile.in} (98%) rename src/null/{Makefile => Makefile.in} (89%) rename src/package/{Makefile => Makefile.in} (96%) rename src/pinstall/{Makefile => Makefile.in} (96%) rename src/pinstall/test/{Makefile => Makefile.in} (87%) rename src/procmgmt/{Makefile => Makefile.in} (93%) rename src/procmgmt/test/{Makefile => Makefile.in} (90%) rename src/ptserver/{Makefile => Makefile.in} (98%) rename src/rcp/{Makefile => Makefile.in} (96%) rename src/rlogind/{Makefile => Makefile.in} (97%) rename src/rsh/{Makefile => Makefile.in} (96%) rename src/rx/{Makefile => Makefile.in} (88%) rename src/rx/bulk.example/{Makefile => Makefile.in} (91%) rename src/rx/bulktest/{Makefile => Makefile.in} (91%) rename src/rx/multi.example/{Makefile => Makefile.in} (91%) rename src/rx/simple.example/{Makefile => Makefile.in} (91%) rename src/rx/test/{Makefile => Makefile.in} (92%) rename src/rxgen/{Makefile => Makefile.in} (96%) rename src/rxkad/{Makefile => Makefile.in} (97%) rename src/rxkad/test/{Makefile => Makefile.in} (96%) rename src/rxstat/{Makefile => Makefile.in} (95%) rename src/scout/{Makefile => Makefile.in} (96%) rename src/sgistuff/{Makefile => Makefile.in} (96%) rename src/sia/{Makefile => Makefile.in} (95%) rename src/sys/{Makefile => Makefile.in} (98%) rename src/tbutc/{Makefile => Makefile.in} (99%) rename src/tsm41/{Makefile => Makefile.in} (96%) rename src/tviced/{Makefile => Makefile.in} (98%) rename src/ubik/{Makefile => Makefile.in} (98%) rename src/update/{Makefile => Makefile.in} (94%) rename src/usd/{Makefile => Makefile.in} (94%) rename src/usd/test/{Makefile => Makefile.in} (93%) rename src/uss/{Makefile => Makefile.in} (96%) rename src/util/{Makefile => Makefile.in} (97%) rename src/util/test/{Makefile => Makefile.in} (92%) rename src/venus/{Makefile => Makefile.in} (98%) rename src/venus/test/{Makefile => Makefile.in} (90%) rename src/vfsck/{Makefile => Makefile.in} (97%) rename src/viced/{Makefile => Makefile.in} (96%) rename src/vlserver/{Makefile => Makefile.in} (97%) rename src/vol/{Makefile => Makefile.in} (96%) rename src/vol/test/{Makefile => Makefile.in} (96%) rename src/volser/{Makefile => Makefile.in} (97%) rename src/wsadmin.src/{Makefile => Makefile.in} (97%) rename src/xstat/{Makefile => Makefile.in} (96%) diff --git a/Makefile.in b/Makefile.in index d108e2ffcc..19b8f48451 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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=". +# 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 ". 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 diff --git a/configure.in b/configure.in index 67286e89de..4269c3a960 100644 --- a/configure.in +++ b/configure.in @@ -354,6 +354,8 @@ fi SRCDIR_PARENT=`pwd` TOP_SRCDIR="${SRCDIR_PARENT}/src" +DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/" +SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/" dnl checks for header files. AC_HEADER_STDC @@ -379,6 +381,8 @@ AC_SUBST(LINUX_KERNEL_PATH) AC_SUBST(LINUX_VERSION) AC_SUBST(MKAFS_OSTYPE) AC_SUBST(TOP_SRCDIR) +AC_SUBST(DESTDIR) +AC_SUBST(SRCDIR) AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) @@ -387,6 +391,109 @@ Makefile \ src/config/Makefile.version-NOCML \ src/config/Makefile.${AFS_SYSNAME} \ src/libafs/MakefileProto.${MKAFS_OSTYPE} \ +src/libuafs/MakefileProto.${MKAFS_OSTYPE} \ src/pam/Makefile \ src/afsd/afs.ppc_darwin.plist \ +src/afs/Makefile \ +src/afsd/Makefile \ +src/afsmonitor/Makefile \ +src/afsweb/Makefile \ +src/audit/Makefile \ +src/auth/test/Makefile \ +src/auth/Makefile \ +src/bozo/test/Makefile \ +src/bozo/Makefile \ +src/bu_utils/Makefile \ +src/bubasics/Makefile \ +src/bucoord/Makefile \ +src/budb/Makefile \ +src/butc/Makefile \ +src/butm/Makefile \ +src/cmd/test/Makefile \ +src/cmd/Makefile \ +src/comerr/test/Makefile \ +src/comerr/Makefile \ +src/config/Makefile \ +src/dauth/Makefile \ +src/des/test/Makefile \ +src/des/Makefile \ +src/des_stub/Makefile \ +src/dir/test/Makefile \ +src/dir/Makefile \ +src/export/Makefile \ +src/finale/Makefile \ +src/fsint/Makefile \ +src/fsprobe/Makefile \ +src/ftpd43+/Makefile \ +src/gtx/Makefile \ +src/inetd/Makefile \ +src/kauth/test/Makefile \ +src/kauth/Makefile \ +src/libacl/test/Makefile \ +src/libacl/Makefile \ +src/libadmin/adminutil/Makefile \ +src/libadmin/Makefile \ +src/libadmin/bos/Makefile \ +src/libadmin/cfg/test/Makefile \ +src/libadmin/cfg/Makefile \ +src/libadmin/client/Makefile \ +src/libadmin/kas/Makefile \ +src/libadmin/pts/Makefile \ +src/libadmin/samples/Makefile \ +src/libadmin/test/Makefile \ +src/libadmin/vos/Makefile \ +src/libafsauthent/Makefile \ +src/libafsrpc/Makefile \ +src/log/test/Makefile \ +src/log/Makefile \ +src/login/Makefile \ +src/lwp/test/Makefile \ +src/lwp/Makefile \ +src/mpp/Makefile \ +src/ntp/Makefile \ +src/null/Makefile \ +src/package/Makefile \ +src/pam/Makefile \ +src/pinstall/test/Makefile \ +src/pinstall/Makefile \ +src/procmgmt/Makefile \ +src/procmgmt/test/Makefile \ +src/ptserver/Makefile \ +src/rcp/Makefile \ +src/rlogind/Makefile \ +src/rsh/Makefile \ +src/rx/Makefile \ +src/rx/bulk.example/Makefile \ +src/rx/bulktest/Makefile \ +src/rx/multi.example/Makefile \ +src/rx/simple.example/Makefile \ +src/rx/test/Makefile \ +src/rxgen/Makefile \ +src/rxkad/Makefile \ +src/rxkad/test/Makefile \ +src/rxstat/Makefile \ +src/scout/Makefile \ +src/sgistuff/Makefile \ +src/sia/Makefile \ +src/sys/Makefile \ +src/tbutc/Makefile \ +src/tsm41/Makefile \ +src/tviced/Makefile \ +src/ubik/Makefile \ +src/update/Makefile \ +src/usd/test/Makefile \ +src/usd/Makefile \ +src/uss/Makefile \ +src/util/Makefile \ +src/util/test/Makefile \ +src/venus/test/Makefile \ +src/venus/Makefile \ +src/vfsck/Makefile \ +src/viced/Makefile \ +src/vlserver/Makefile \ +src/vol/Makefile \ +src/vol/test/Makefile \ +src/volser/Makefile \ +src/wsadmin.src/Makefile \ +src/xstat/Makefile \ ) diff --git a/src/afs/Makefile b/src/afs/Makefile.in similarity index 96% rename from src/afs/Makefile rename to src/afs/Makefile.in index 063159a0f2..0258168156 100644 --- a/src/afs/Makefile +++ b/src/afs/Makefile.in @@ -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 diff --git a/src/afsd/Makefile b/src/afsd/Makefile.in similarity index 98% rename from src/afsd/Makefile rename to src/afsd/Makefile.in index 454b0e10b6..4d0c8f7c37 100644 --- a/src/afsd/Makefile +++ b/src/afsd/Makefile.in @@ -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 diff --git a/src/afsmonitor/Makefile b/src/afsmonitor/Makefile.in similarity index 96% rename from src/afsmonitor/Makefile rename to src/afsmonitor/Makefile.in index a02e155bd5..a51f005915 100644 --- a/src/afsmonitor/Makefile +++ b/src/afsmonitor/Makefile.in @@ -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. \ diff --git a/src/afsweb/Makefile b/src/afsweb/Makefile.in similarity index 99% rename from src/afsweb/Makefile rename to src/afsweb/Makefile.in index 6c61a62058..af383611a9 100644 --- a/src/afsweb/Makefile +++ b/src/afsweb/Makefile.in @@ -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} diff --git a/src/audit/Makefile b/src/audit/Makefile.in similarity index 96% rename from src/audit/Makefile rename to src/audit/Makefile.in index f102b1e4b7..cd553e009f 100644 --- a/src/audit/Makefile +++ b/src/audit/Makefile.in @@ -12,9 +12,14 @@ # # 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 diff --git a/src/auth/Makefile b/src/auth/Makefile.in similarity index 97% rename from src/auth/Makefile rename to src/auth/Makefile.in index 480ef3e72e..fa8927102f 100644 --- a/src/auth/Makefile +++ b/src/auth/Makefile.in @@ -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} diff --git a/src/auth/test/Makefile b/src/auth/test/Makefile.in similarity index 86% rename from src/auth/test/Makefile rename to src/auth/test/Makefile.in index 81b5ae437b..1f1ec5d7a9 100644 --- a/src/auth/test/Makefile +++ b/src/auth/test/Makefile.in @@ -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} diff --git a/src/bozo/Makefile b/src/bozo/Makefile.in similarity index 97% rename from src/bozo/Makefile rename to src/bozo/Makefile.in index faed8345cf..b285ba5fa1 100644 --- a/src/bozo/Makefile +++ b/src/bozo/Makefile.in @@ -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 diff --git a/src/bozo/test/Makefile b/src/bozo/test/Makefile.in similarity index 90% rename from src/bozo/test/Makefile rename to src/bozo/test/Makefile.in index 4e43f3b841..e1dad6e271 100644 --- a/src/bozo/test/Makefile +++ b/src/bozo/test/Makefile.in @@ -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} diff --git a/src/bu_utils/Makefile b/src/bu_utils/Makefile.in similarity index 92% rename from src/bu_utils/Makefile rename to src/bu_utils/Makefile.in index 717aacdb9a..07ccfc13e9 100644 --- a/src/bu_utils/Makefile +++ b/src/bu_utils/Makefile.in @@ -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 diff --git a/src/bubasics/Makefile b/src/bubasics/Makefile.in similarity index 95% rename from src/bubasics/Makefile rename to src/bubasics/Makefile.in index 237e23c618..8b3f2c6fee 100644 --- a/src/bubasics/Makefile +++ b/src/bubasics/Makefile.in @@ -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 diff --git a/src/bucoord/Makefile b/src/bucoord/Makefile.in similarity index 97% rename from src/bucoord/Makefile rename to src/bucoord/Makefile.in index 131686f3ad..968574a32a 100644 --- a/src/bucoord/Makefile +++ b/src/bucoord/Makefile.in @@ -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 diff --git a/src/budb/Makefile b/src/budb/Makefile.in similarity index 81% rename from src/budb/Makefile rename to src/budb/Makefile.in index 836b0c2788..6bb2e0c010 100644 --- a/src/budb/Makefile +++ b/src/budb/Makefile.in @@ -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 diff --git a/src/butc/Makefile b/src/butc/Makefile.in similarity index 97% rename from src/butc/Makefile rename to src/butc/Makefile.in index 19a47017e6..78e742efcd 100644 --- a/src/butc/Makefile +++ b/src/butc/Makefile.in @@ -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} diff --git a/src/butm/Makefile b/src/butm/Makefile.in similarity index 94% rename from src/butm/Makefile rename to src/butm/Makefile.in index 2a6a5f0e99..f0a55b0c2e 100644 --- a/src/butm/Makefile +++ b/src/butm/Makefile.in @@ -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 diff --git a/src/cmd/Makefile b/src/cmd/Makefile.in similarity index 96% rename from src/cmd/Makefile rename to src/cmd/Makefile.in index 9f0107f2b4..ee22499532 100644 --- a/src/cmd/Makefile +++ b/src/cmd/Makefile.in @@ -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 diff --git a/src/cmd/test/Makefile b/src/cmd/test/Makefile.in similarity index 88% rename from src/cmd/test/Makefile rename to src/cmd/test/Makefile.in index 68b235d6e1..ccae8f9f0b 100644 --- a/src/cmd/test/Makefile +++ b/src/cmd/test/Makefile.in @@ -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 diff --git a/src/comerr/Makefile b/src/comerr/Makefile.in similarity index 93% rename from src/comerr/Makefile rename to src/comerr/Makefile.in index 4070a4bc1c..07918f91e8 100644 --- a/src/comerr/Makefile +++ b/src/comerr/Makefile.in @@ -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} diff --git a/src/comerr/test/Makefile b/src/comerr/test/Makefile.in similarity index 90% rename from src/comerr/test/Makefile rename to src/comerr/test/Makefile.in index a04dd0c123..0da1e54cf3 100644 --- a/src/comerr/test/Makefile +++ b/src/comerr/test/Makefile.in @@ -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} diff --git a/src/config/Makefile.alpha_dux40.in b/src/config/Makefile.alpha_dux40.in index ae78604e17..10b6780e63 100644 --- a/src/config/Makefile.alpha_dux40.in +++ b/src/config/Makefile.alpha_dux40.in @@ -21,7 +21,6 @@ OPTMZ=-O2 DBG=-g3 CSTATIC=-non_shared RANLIB=/bin/true -WASHTOOL=${DESTDIR}bin/washtool INSTALL=${DESTDIR}bin/install CP=cp diff --git a/src/config/Makefile.alpha_dux50.in b/src/config/Makefile.alpha_dux50.in index 45cbccb9c6..000238df65 100644 --- a/src/config/Makefile.alpha_dux50.in +++ b/src/config/Makefile.alpha_dux50.in @@ -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 diff --git a/src/config/Makefile.alpha_linux_22.in b/src/config/Makefile.alpha_linux_22.in index f26b67d31a..7e9d5b1f23 100644 --- a/src/config/Makefile.alpha_linux_22.in +++ b/src/config/Makefile.alpha_linux_22.in @@ -38,7 +38,6 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -WASHTOOL=${SRCDIR}bin/washtool # # Other OS specific requirements # diff --git a/src/config/Makefile.hp_ux102.in b/src/config/Makefile.hp_ux102.in index f23fc92d67..8384093945 100644 --- a/src/config/Makefile.hp_ux102.in +++ b/src/config/Makefile.hp_ux102.in @@ -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 diff --git a/src/config/Makefile.hp_ux110.in b/src/config/Makefile.hp_ux110.in index 058e1f18b4..aa034ccfbe 100644 --- a/src/config/Makefile.hp_ux110.in +++ b/src/config/Makefile.hp_ux110.in @@ -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 diff --git a/src/config/Makefile.i386_djgpp b/src/config/Makefile.i386_djgpp index fc57153ecd..f5843b66cb 100644 --- a/src/config/Makefile.i386_djgpp +++ b/src/config/Makefile.i386_djgpp @@ -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 # diff --git a/src/config/Makefile.i386_fbsd_42.in b/src/config/Makefile.i386_fbsd_42.in index a627efa32c..56435d331a 100644 --- a/src/config/Makefile.i386_fbsd_42.in +++ b/src/config/Makefile.i386_fbsd_42.in @@ -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 # diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in index 1f47b49b91..3dae1eb288 100644 --- a/src/config/Makefile.i386_linux22.in +++ b/src/config/Makefile.i386_linux22.in @@ -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 diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in index 38c7dfba1a..3de5076791 100644 --- a/src/config/Makefile.i386_linux24.in +++ b/src/config/Makefile.i386_linux24.in @@ -35,7 +35,6 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -WASHTOOL=${DESTDIR}bin/washtool INSTALL=${DESTDIR}bin/install # # Other OS specific requirements diff --git a/src/config/Makefile b/src/config/Makefile.in similarity index 98% rename from src/config/Makefile rename to src/config/Makefile.in index b83c73a645..5de7b3edfb 100644 --- a/src/config/Makefile +++ b/src/config/Makefile.in @@ -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 diff --git a/src/config/Makefile.ppc_darwin_12.in b/src/config/Makefile.ppc_darwin_12.in index 6edb0b62ea..3b8ca52b63 100644 --- a/src/config/Makefile.ppc_darwin_12.in +++ b/src/config/Makefile.ppc_darwin_12.in @@ -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 diff --git a/src/config/Makefile.ppc_darwin_13.in b/src/config/Makefile.ppc_darwin_13.in index 6edb0b62ea..3b8ca52b63 100644 --- a/src/config/Makefile.ppc_darwin_13.in +++ b/src/config/Makefile.ppc_darwin_13.in @@ -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 diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in index e67acec078..07925bf690 100644 --- a/src/config/Makefile.ppc_linux22.in +++ b/src/config/Makefile.ppc_linux22.in @@ -36,7 +36,6 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -WASHTOOL=${SRCDIR}bin/washtool # # Other OS specific requirements # diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in index 72aeaef0dc..c64b7243f4 100644 --- a/src/config/Makefile.ppc_linux24.in +++ b/src/config/Makefile.ppc_linux24.in @@ -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 diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in index 81c039b44a..1e96eccf23 100644 --- a/src/config/Makefile.rs_aix42.in +++ b/src/config/Makefile.rs_aix42.in @@ -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) diff --git a/src/config/Makefile.s390_linux22.in b/src/config/Makefile.s390_linux22.in index 9de4d60c5e..9940046469 100644 --- a/src/config/Makefile.s390_linux22.in +++ b/src/config/Makefile.s390_linux22.in @@ -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 diff --git a/src/config/Makefile.s390_linux24.in b/src/config/Makefile.s390_linux24.in index 74bffa280e..1920d8ce73 100644 --- a/src/config/Makefile.s390_linux24.in +++ b/src/config/Makefile.s390_linux24.in @@ -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 diff --git a/src/config/Makefile.sgi_62.in b/src/config/Makefile.sgi_62.in index 587636880f..2de0753d64 100644 --- a/src/config/Makefile.sgi_62.in +++ b/src/config/Makefile.sgi_62.in @@ -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 diff --git a/src/config/Makefile.sgi_63.in b/src/config/Makefile.sgi_63.in index 55aa0e3392..e427a36ade 100644 --- a/src/config/Makefile.sgi_63.in +++ b/src/config/Makefile.sgi_63.in @@ -38,5 +38,4 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -WASHTOOL=${DESTDIR}bin/washtool INSTALL=${DESTDIR}bin/install diff --git a/src/config/Makefile.sgi_64.in b/src/config/Makefile.sgi_64.in index 61b385dab0..dc7e30f9c0 100644 --- a/src/config/Makefile.sgi_64.in +++ b/src/config/Makefile.sgi_64.in @@ -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 diff --git a/src/config/Makefile.sgi_65.in b/src/config/Makefile.sgi_65.in index 925e626aff..2bdd7edf95 100644 --- a/src/config/Makefile.sgi_65.in +++ b/src/config/Makefile.sgi_65.in @@ -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 diff --git a/src/config/Makefile.sparc64_linux22.in b/src/config/Makefile.sparc64_linux22.in index a8d184fd90..e1e515d058 100644 --- a/src/config/Makefile.sparc64_linux22.in +++ b/src/config/Makefile.sparc64_linux22.in @@ -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 diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in index a8d184fd90..e1e515d058 100644 --- a/src/config/Makefile.sparc64_linux24.in +++ b/src/config/Makefile.sparc64_linux24.in @@ -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 diff --git a/src/config/Makefile.sparc_linux22.in b/src/config/Makefile.sparc_linux22.in index a8d184fd90..e1e515d058 100644 --- a/src/config/Makefile.sparc_linux22.in +++ b/src/config/Makefile.sparc_linux22.in @@ -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 diff --git a/src/config/Makefile.sun4x_55.in b/src/config/Makefile.sun4x_55.in index 8d8d8d941c..89ae2929a9 100644 --- a/src/config/Makefile.sun4x_55.in +++ b/src/config/Makefile.sun4x_55.in @@ -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 diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in index e6a173baea..c35b019ab0 100644 --- a/src/config/Makefile.sun4x_56.in +++ b/src/config/Makefile.sun4x_56.in @@ -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 diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in index 75614135c3..b669ee3d18 100644 --- a/src/config/Makefile.sun4x_57.in +++ b/src/config/Makefile.sun4x_57.in @@ -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 diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in index 2b4bf10204..fac5d19645 100644 --- a/src/config/Makefile.sun4x_58.in +++ b/src/config/Makefile.sun4x_58.in @@ -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 diff --git a/src/config/Makefile.sunx86_54.in b/src/config/Makefile.sunx86_54.in index b874f4a6c2..7f71a1bf88 100644 --- a/src/config/Makefile.sunx86_54.in +++ b/src/config/Makefile.sunx86_54.in @@ -20,5 +20,4 @@ AR = /usr/ccs/bin/ar LD = /usr/ccs/bin/ld LORDER = /usr/ccs/bin/lorder STRIP= /usr/ccs/bin/strip -WASHTOOL=${DESTDIR}bin/washtool INSTALL=${DESTDIR}bin/install diff --git a/src/dauth/Makefile b/src/dauth/Makefile.in similarity index 96% rename from src/dauth/Makefile rename to src/dauth/Makefile.in index 5e7da387f4..11708a3a1e 100644 --- a/src/dauth/Makefile +++ b/src/dauth/Makefile.in @@ -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 diff --git a/src/des/Makefile b/src/des/Makefile.in similarity index 99% rename from src/des/Makefile rename to src/des/Makefile.in index 178ae5f36b..5a00a7d2c7 100644 --- a/src/des/Makefile +++ b/src/des/Makefile.in @@ -22,6 +22,11 @@ # 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. diff --git a/src/des/test/Makefile b/src/des/test/Makefile.in similarity index 88% rename from src/des/test/Makefile rename to src/des/test/Makefile.in index 79b0d232f1..6356801a95 100644 --- a/src/des/test/Makefile +++ b/src/des/test/Makefile.in @@ -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} diff --git a/src/des_stub/Makefile b/src/des_stub/Makefile.in similarity index 94% rename from src/des_stub/Makefile rename to src/des_stub/Makefile.in index c1ce9904af..0b69de2050 100644 --- a/src/des_stub/Makefile +++ b/src/des_stub/Makefile.in @@ -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} diff --git a/src/dir/Makefile b/src/dir/Makefile.in similarity index 94% rename from src/dir/Makefile rename to src/dir/Makefile.in index e28dad71b5..41f186fcc8 100644 --- a/src/dir/Makefile +++ b/src/dir/Makefile.in @@ -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/ diff --git a/src/dir/test/Makefile b/src/dir/test/Makefile.in similarity index 92% rename from src/dir/test/Makefile rename to src/dir/test/Makefile.in index 83c0d5ccdf..d596972463 100644 --- a/src/dir/test/Makefile +++ b/src/dir/test/Makefile.in @@ -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/ diff --git a/src/export/Makefile b/src/export/Makefile.in similarity index 96% rename from src/export/Makefile rename to src/export/Makefile.in index 98469f2995..f02fe4c811 100644 --- a/src/export/Makefile +++ b/src/export/Makefile.in @@ -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/ diff --git a/src/finale/Makefile b/src/finale/Makefile.in similarity index 77% rename from src/finale/Makefile rename to src/finale/Makefile.in index 67099f61da..4da24c38cf 100644 --- a/src/finale/Makefile +++ b/src/finale/Makefile.in @@ -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 diff --git a/src/fsint/Makefile b/src/fsint/Makefile.in similarity index 97% rename from src/fsint/Makefile rename to src/fsint/Makefile.in index 861d52906f..46f75c972e 100644 --- a/src/fsint/Makefile +++ b/src/fsint/Makefile.in @@ -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/ diff --git a/src/fsprobe/Makefile b/src/fsprobe/Makefile.in similarity index 96% rename from src/fsprobe/Makefile rename to src/fsprobe/Makefile.in index 97ac1db0f3..4f05bb1ba5 100644 --- a/src/fsprobe/Makefile +++ b/src/fsprobe/Makefile.in @@ -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. \ diff --git a/src/ftpd43+/Makefile b/src/ftpd43+/Makefile.in similarity index 96% rename from src/ftpd43+/Makefile rename to src/ftpd43+/Makefile.in index dd15e67c12..11992f031c 100644 --- a/src/ftpd43+/Makefile +++ b/src/ftpd43+/Makefile.in @@ -16,8 +16,12 @@ # # @(#)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} diff --git a/src/gtx/Makefile b/src/gtx/Makefile.in similarity index 98% rename from src/gtx/Makefile rename to src/gtx/Makefile.in index 63c028d3cc..6ff3f8ea92 100644 --- a/src/gtx/Makefile +++ b/src/gtx/Makefile.in @@ -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 diff --git a/src/inetd/Makefile b/src/inetd/Makefile.in similarity index 94% rename from src/inetd/Makefile rename to src/inetd/Makefile.in index 37aea02412..56de9e393d 100644 --- a/src/inetd/Makefile +++ b/src/inetd/Makefile.in @@ -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 diff --git a/src/kauth/Makefile b/src/kauth/Makefile.in similarity index 88% rename from src/kauth/Makefile rename to src/kauth/Makefile.in index b4124f6beb..a909b12dbf 100644 --- a/src/kauth/Makefile +++ b/src/kauth/Makefile.in @@ -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 diff --git a/src/kauth/test/Makefile b/src/kauth/test/Makefile.in similarity index 94% rename from src/kauth/test/Makefile rename to src/kauth/test/Makefile.in index b8361e8557..7300b44b2c 100644 --- a/src/kauth/test/Makefile +++ b/src/kauth/test/Makefile.in @@ -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 diff --git a/src/libacl/Makefile b/src/libacl/Makefile.in similarity index 93% rename from src/libacl/Makefile rename to src/libacl/Makefile.in index 6656f35b43..136fe338a0 100644 --- a/src/libacl/Makefile +++ b/src/libacl/Makefile.in @@ -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.. \ diff --git a/src/libacl/test/Makefile b/src/libacl/test/Makefile.in similarity index 90% rename from src/libacl/test/Makefile rename to src/libacl/test/Makefile.in index a1b4abbbb0..cbe76ec14f 100644 --- a/src/libacl/test/Makefile +++ b/src/libacl/test/Makefile.in @@ -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} diff --git a/src/libadmin/Makefile b/src/libadmin/Makefile.in similarity index 83% rename from src/libadmin/Makefile rename to src/libadmin/Makefile.in index 84fed28025..c84ba62a7a 100644 --- a/src/libadmin/Makefile +++ b/src/libadmin/Makefile.in @@ -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: diff --git a/src/libadmin/adminutil/Makefile b/src/libadmin/adminutil/Makefile.in similarity index 98% rename from src/libadmin/adminutil/Makefile rename to src/libadmin/adminutil/Makefile.in index 14ac506e4f..648cc373da 100644 --- a/src/libadmin/adminutil/Makefile +++ b/src/libadmin/adminutil/Makefile.in @@ -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} diff --git a/src/libadmin/bos/Makefile b/src/libadmin/bos/Makefile.in similarity index 92% rename from src/libadmin/bos/Makefile rename to src/libadmin/bos/Makefile.in index 5114af0513..f045fa4903 100644 --- a/src/libadmin/bos/Makefile +++ b/src/libadmin/bos/Makefile.in @@ -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} diff --git a/src/libadmin/cfg/Makefile b/src/libadmin/cfg/Makefile.in similarity index 93% rename from src/libadmin/cfg/Makefile rename to src/libadmin/cfg/Makefile.in index 54a8021540..34c027bfdc 100644 --- a/src/libadmin/cfg/Makefile +++ b/src/libadmin/cfg/Makefile.in @@ -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} diff --git a/src/libadmin/cfg/test/Makefile b/src/libadmin/cfg/test/Makefile.in similarity index 93% rename from src/libadmin/cfg/test/Makefile rename to src/libadmin/cfg/test/Makefile.in index c236ec2805..ee649ab519 100644 --- a/src/libadmin/cfg/test/Makefile +++ b/src/libadmin/cfg/test/Makefile.in @@ -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} diff --git a/src/libadmin/client/Makefile b/src/libadmin/client/Makefile.in similarity index 91% rename from src/libadmin/client/Makefile rename to src/libadmin/client/Makefile.in index c512c7cc38..a92c2fe267 100644 --- a/src/libadmin/client/Makefile +++ b/src/libadmin/client/Makefile.in @@ -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} diff --git a/src/libadmin/kas/Makefile b/src/libadmin/kas/Makefile.in similarity index 93% rename from src/libadmin/kas/Makefile rename to src/libadmin/kas/Makefile.in index c954d2977f..db18a1693d 100644 --- a/src/libadmin/kas/Makefile +++ b/src/libadmin/kas/Makefile.in @@ -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} diff --git a/src/libadmin/pts/Makefile b/src/libadmin/pts/Makefile.in similarity index 92% rename from src/libadmin/pts/Makefile rename to src/libadmin/pts/Makefile.in index 07b13764b7..875060f700 100644 --- a/src/libadmin/pts/Makefile +++ b/src/libadmin/pts/Makefile.in @@ -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} diff --git a/src/libadmin/samples/Makefile b/src/libadmin/samples/Makefile.in similarity index 97% rename from src/libadmin/samples/Makefile rename to src/libadmin/samples/Makefile.in index b323eda683..5be8f3e60f 100644 --- a/src/libadmin/samples/Makefile +++ b/src/libadmin/samples/Makefile.in @@ -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} diff --git a/src/libadmin/test/Makefile b/src/libadmin/test/Makefile.in similarity index 93% rename from src/libadmin/test/Makefile rename to src/libadmin/test/Makefile.in index cab8766adb..2ad9c9eca4 100644 --- a/src/libadmin/test/Makefile +++ b/src/libadmin/test/Makefile.in @@ -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} diff --git a/src/libadmin/vos/Makefile b/src/libadmin/vos/Makefile.in similarity index 94% rename from src/libadmin/vos/Makefile rename to src/libadmin/vos/Makefile.in index 797ec28d70..05876f92a6 100644 --- a/src/libadmin/vos/Makefile +++ b/src/libadmin/vos/Makefile.in @@ -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} diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common index 2b908c01e3..7147a04ae7 100644 --- a/src/libafs/Makefile.common +++ b/src/libafs/Makefile.common @@ -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 diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index 48d3fff438..be15f5e679 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -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: diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 23c8f54bf2..b3894b9c0c 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -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} diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index c1abece414..b13b232f6f 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -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} diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index 13fcbf7697..ab9033df3f 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -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: diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 89656fec76..57e3ab5ded 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -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; \ diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 286f69fd8d..7602e88f7c 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -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 diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 94850a6ac2..eaf052cbcc 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -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 diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index 505692d09a..2fed3f384e 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -7,6 +7,11 @@ # MakefileProto for Solaris systems # +DESTDIR=@DESTDIR@ +SRCDIR=@SRCDIR@ +TOP_SRCDIR=@TOP_SRCDIR@ +SYS_NAME=@AFS_SYSNAME@ + include ../config/Makefile.${SYS_NAME} # OS specific object files: @@ -95,7 +100,7 @@ ${COMPDIRS}: export ARCH_DEFS ; \ export BITS ; \ cd $$t ; \ - $(MAKE) DESTDIR=${DESTDIR} libafs ; \ + $(MAKE) libafs ; \ cd ../ ;\ done diff --git a/src/libafsauthent/Makefile b/src/libafsauthent/Makefile.in similarity index 98% rename from src/libafsauthent/Makefile rename to src/libafsauthent/Makefile.in index 2fe9f046c4..32e6a8bcd9 100644 --- a/src/libafsauthent/Makefile +++ b/src/libafsauthent/Makefile.in @@ -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} diff --git a/src/libafsrpc/Makefile b/src/libafsrpc/Makefile.in similarity index 94% rename from src/libafsrpc/Makefile rename to src/libafsrpc/Makefile.in index 5140265da4..44cfdf285b 100644 --- a/src/libafsrpc/Makefile +++ b/src/libafsrpc/Makefile.in @@ -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 diff --git a/src/libuafs/MakefileProto.AIX b/src/libuafs/MakefileProto.AIX.in similarity index 96% rename from src/libuafs/MakefileProto.AIX rename to src/libuafs/MakefileProto.AIX.in index 0ee221932e..ad19125c8b 100644 --- a/src/libuafs/MakefileProto.AIX +++ b/src/libuafs/MakefileProto.AIX.in @@ -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 diff --git a/src/libuafs/MakefileProto.DARWIN b/src/libuafs/MakefileProto.DARWIN.in similarity index 96% rename from src/libuafs/MakefileProto.DARWIN rename to src/libuafs/MakefileProto.DARWIN.in index f5072413d3..636a0a88b6 100644 --- a/src/libuafs/MakefileProto.DARWIN +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -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 diff --git a/src/libuafs/MakefileProto.DUX b/src/libuafs/MakefileProto.DUX.in similarity index 96% rename from src/libuafs/MakefileProto.DUX rename to src/libuafs/MakefileProto.DUX.in index 525700cc21..fd0510c53f 100644 --- a/src/libuafs/MakefileProto.DUX +++ b/src/libuafs/MakefileProto.DUX.in @@ -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} diff --git a/src/libuafs/MakefileProto.FBSD b/src/libuafs/MakefileProto.FBSD.in similarity index 96% rename from src/libuafs/MakefileProto.FBSD rename to src/libuafs/MakefileProto.FBSD.in index 5086f2dcc5..924f142b72 100644 --- a/src/libuafs/MakefileProto.FBSD +++ b/src/libuafs/MakefileProto.FBSD.in @@ -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} diff --git a/src/libuafs/MakefileProto.HPUX b/src/libuafs/MakefileProto.HPUX.in similarity index 96% rename from src/libuafs/MakefileProto.HPUX rename to src/libuafs/MakefileProto.HPUX.in index 61aea37a80..0915f814c7 100644 --- a/src/libuafs/MakefileProto.HPUX +++ b/src/libuafs/MakefileProto.HPUX.in @@ -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 diff --git a/src/libuafs/MakefileProto.IRIX b/src/libuafs/MakefileProto.IRIX.in similarity index 96% rename from src/libuafs/MakefileProto.IRIX rename to src/libuafs/MakefileProto.IRIX.in index 039fee9e66..993e67abf2 100644 --- a/src/libuafs/MakefileProto.IRIX +++ b/src/libuafs/MakefileProto.IRIX.in @@ -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 diff --git a/src/libuafs/MakefileProto.LINUX b/src/libuafs/MakefileProto.LINUX.in similarity index 96% rename from src/libuafs/MakefileProto.LINUX rename to src/libuafs/MakefileProto.LINUX.in index 02ac4d7539..c76ba6543f 100644 --- a/src/libuafs/MakefileProto.LINUX +++ b/src/libuafs/MakefileProto.LINUX.in @@ -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 diff --git a/src/libuafs/MakefileProto.SOLARIS b/src/libuafs/MakefileProto.SOLARIS.in similarity index 96% rename from src/libuafs/MakefileProto.SOLARIS rename to src/libuafs/MakefileProto.SOLARIS.in index 0b59c2b85b..f413019600 100644 --- a/src/libuafs/MakefileProto.SOLARIS +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -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 diff --git a/src/log/Makefile b/src/log/Makefile.in similarity index 96% rename from src/log/Makefile rename to src/log/Makefile.in index 270c142a0d..09204ecaf3 100644 --- a/src/log/Makefile +++ b/src/log/Makefile.in @@ -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} diff --git a/src/log/test/Makefile b/src/log/test/Makefile.in similarity index 85% rename from src/log/test/Makefile rename to src/log/test/Makefile.in index 16ec358b85..aa99af00d6 100644 --- a/src/log/test/Makefile +++ b/src/log/test/Makefile.in @@ -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} diff --git a/src/login/Makefile b/src/login/Makefile.in similarity index 97% rename from src/login/Makefile rename to src/login/Makefile.in index c094a519c1..86c39b8fd9 100644 --- a/src/login/Makefile +++ b/src/login/Makefile.in @@ -17,7 +17,12 @@ # @(#)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/ diff --git a/src/lwp/Makefile b/src/lwp/Makefile.in similarity index 95% rename from src/lwp/Makefile rename to src/lwp/Makefile.in index 4e01dd1d81..604cdc4f92 100644 --- a/src/lwp/Makefile +++ b/src/lwp/Makefile.in @@ -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 diff --git a/src/lwp/test/Makefile b/src/lwp/test/Makefile.in similarity index 90% rename from src/lwp/test/Makefile rename to src/lwp/test/Makefile.in index b37982aa8d..fa5d5d2ecc 100644 --- a/src/lwp/test/Makefile +++ b/src/lwp/test/Makefile.in @@ -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 diff --git a/src/mpp/Makefile b/src/mpp/Makefile.in similarity index 86% rename from src/mpp/Makefile rename to src/mpp/Makefile.in index 403dbdddfe..20a8dd5564 100644 --- a/src/mpp/Makefile +++ b/src/mpp/Makefile.in @@ -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 diff --git a/src/ntp/Makefile b/src/ntp/Makefile.in similarity index 98% rename from src/ntp/Makefile rename to src/ntp/Makefile.in index b50463dbfe..282bfbfe81 100644 --- a/src/ntp/Makefile +++ b/src/ntp/Makefile.in @@ -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 diff --git a/src/null/Makefile b/src/null/Makefile.in similarity index 89% rename from src/null/Makefile rename to src/null/Makefile.in index 7ab2cda573..79024d86a0 100644 --- a/src/null/Makefile +++ b/src/null/Makefile.in @@ -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} diff --git a/src/package/Makefile b/src/package/Makefile.in similarity index 96% rename from src/package/Makefile rename to src/package/Makefile.in index 7087c0356c..7b68dee03a 100644 --- a/src/package/Makefile +++ b/src/package/Makefile.in @@ -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 diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index ee906d21b1..5f63cd5b06 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -5,10 +5,13 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html +DESTDIR=@DESTDIR@ +SRCDIR=@SRCDIR@ +TOP_SRCDIR=@TOP_SRCDIR@ +SYS_NAME=@AFS_SYSNAME@ SHELL=/bin/sh KERNELDIR = ../libafs/ -COMPONENT=afs include ../config/Makefile.${SYS_NAME} LIBDIR = ${DESTDIR}lib/ diff --git a/src/pinstall/Makefile b/src/pinstall/Makefile.in similarity index 96% rename from src/pinstall/Makefile rename to src/pinstall/Makefile.in index bd0f457abd..6aaee9877e 100644 --- a/src/pinstall/Makefile +++ b/src/pinstall/Makefile.in @@ -25,8 +25,13 @@ ###################################################################### # 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} diff --git a/src/pinstall/test/Makefile b/src/pinstall/test/Makefile.in similarity index 87% rename from src/pinstall/test/Makefile rename to src/pinstall/test/Makefile.in index b5b2b93872..e4a5bc5fba 100644 --- a/src/pinstall/test/Makefile +++ b/src/pinstall/test/Makefile.in @@ -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 diff --git a/src/procmgmt/Makefile b/src/procmgmt/Makefile.in similarity index 93% rename from src/procmgmt/Makefile rename to src/procmgmt/Makefile.in index 4e2d202d48..def0c21f59 100644 --- a/src/procmgmt/Makefile +++ b/src/procmgmt/Makefile.in @@ -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 diff --git a/src/procmgmt/test/Makefile b/src/procmgmt/test/Makefile.in similarity index 90% rename from src/procmgmt/test/Makefile rename to src/procmgmt/test/Makefile.in index bafe395d14..2db93947cc 100644 --- a/src/procmgmt/test/Makefile +++ b/src/procmgmt/test/Makefile.in @@ -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} diff --git a/src/ptserver/Makefile b/src/ptserver/Makefile.in similarity index 98% rename from src/ptserver/Makefile rename to src/ptserver/Makefile.in index ed79932b11..124e59d823 100644 --- a/src/ptserver/Makefile +++ b/src/ptserver/Makefile.in @@ -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/ diff --git a/src/rcp/Makefile b/src/rcp/Makefile.in similarity index 96% rename from src/rcp/Makefile rename to src/rcp/Makefile.in index 5c7a69aa9b..b48063f0a2 100644 --- a/src/rcp/Makefile +++ b/src/rcp/Makefile.in @@ -16,13 +16,18 @@ # # @(#)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/ diff --git a/src/rlogind/Makefile b/src/rlogind/Makefile.in similarity index 97% rename from src/rlogind/Makefile rename to src/rlogind/Makefile.in index 241442f397..385e57f9c1 100644 --- a/src/rlogind/Makefile +++ b/src/rlogind/Makefile.in @@ -16,9 +16,13 @@ # # @(#)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 diff --git a/src/rsh/Makefile b/src/rsh/Makefile.in similarity index 96% rename from src/rsh/Makefile rename to src/rsh/Makefile.in index 5f9dc3e20e..9c78f32776 100644 --- a/src/rsh/Makefile +++ b/src/rsh/Makefile.in @@ -16,8 +16,13 @@ # # @(#)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/ diff --git a/src/rx/Makefile b/src/rx/Makefile.in similarity index 88% rename from src/rx/Makefile rename to src/rx/Makefile.in index 1d75a840e0..a6babcc7cf 100644 --- a/src/rx/Makefile +++ b/src/rx/Makefile.in @@ -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/' 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) diff --git a/src/rx/bulk.example/Makefile b/src/rx/bulk.example/Makefile.in similarity index 91% rename from src/rx/bulk.example/Makefile rename to src/rx/bulk.example/Makefile.in index 00a59bccf6..1a0f9e7596 100644 --- a/src/rx/bulk.example/Makefile +++ b/src/rx/bulk.example/Makefile.in @@ -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/ diff --git a/src/rx/bulktest/Makefile b/src/rx/bulktest/Makefile.in similarity index 91% rename from src/rx/bulktest/Makefile rename to src/rx/bulktest/Makefile.in index 00a59bccf6..1a0f9e7596 100644 --- a/src/rx/bulktest/Makefile +++ b/src/rx/bulktest/Makefile.in @@ -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/ diff --git a/src/rx/multi.example/Makefile b/src/rx/multi.example/Makefile.in similarity index 91% rename from src/rx/multi.example/Makefile rename to src/rx/multi.example/Makefile.in index fa56eb7c4d..76f06d14ff 100644 --- a/src/rx/multi.example/Makefile +++ b/src/rx/multi.example/Makefile.in @@ -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/ diff --git a/src/rx/simple.example/Makefile b/src/rx/simple.example/Makefile.in similarity index 91% rename from src/rx/simple.example/Makefile rename to src/rx/simple.example/Makefile.in index 2acab6ec30..688d7855fa 100644 --- a/src/rx/simple.example/Makefile +++ b/src/rx/simple.example/Makefile.in @@ -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/ diff --git a/src/rx/test/Makefile b/src/rx/test/Makefile.in similarity index 92% rename from src/rx/test/Makefile rename to src/rx/test/Makefile.in index c46ca9ff50..fb2da46373 100644 --- a/src/rx/test/Makefile +++ b/src/rx/test/Makefile.in @@ -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} diff --git a/src/rxgen/Makefile b/src/rxgen/Makefile.in similarity index 96% rename from src/rxgen/Makefile rename to src/rxgen/Makefile.in index bf186b8694..cb48bf13aa 100644 --- a/src/rxgen/Makefile +++ b/src/rxgen/Makefile.in @@ -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/ diff --git a/src/rxkad/Makefile b/src/rxkad/Makefile.in similarity index 97% rename from src/rxkad/Makefile rename to src/rxkad/Makefile.in index 622ce584ac..9c32f56764 100644 --- a/src/rxkad/Makefile +++ b/src/rxkad/Makefile.in @@ -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/ diff --git a/src/rxkad/test/Makefile b/src/rxkad/test/Makefile.in similarity index 96% rename from src/rxkad/test/Makefile rename to src/rxkad/test/Makefile.in index ebca710902..851df14402 100644 --- a/src/rxkad/test/Makefile +++ b/src/rxkad/test/Makefile.in @@ -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} diff --git a/src/rxstat/Makefile b/src/rxstat/Makefile.in similarity index 95% rename from src/rxstat/Makefile rename to src/rxstat/Makefile.in index 272ecc3ecb..921f879be7 100644 --- a/src/rxstat/Makefile +++ b/src/rxstat/Makefile.in @@ -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 diff --git a/src/scout/Makefile b/src/scout/Makefile.in similarity index 96% rename from src/scout/Makefile rename to src/scout/Makefile.in index 0f567a0d8a..bcd14f5c93 100644 --- a/src/scout/Makefile +++ b/src/scout/Makefile.in @@ -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. \ diff --git a/src/sgistuff/Makefile b/src/sgistuff/Makefile.in similarity index 96% rename from src/sgistuff/Makefile rename to src/sgistuff/Makefile.in index 3497313c6e..0e91ebecb2 100644 --- a/src/sgistuff/Makefile +++ b/src/sgistuff/Makefile.in @@ -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 diff --git a/src/sia/Makefile b/src/sia/Makefile.in similarity index 95% rename from src/sia/Makefile rename to src/sia/Makefile.in index 826bdac6cd..4b9cc45e97 100644 --- a/src/sia/Makefile +++ b/src/sia/Makefile.in @@ -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 = diff --git a/src/sys/Makefile b/src/sys/Makefile.in similarity index 98% rename from src/sys/Makefile rename to src/sys/Makefile.in index d7b5c690ea..b9f9da0fb7 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile.in @@ -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 diff --git a/src/tbutc/Makefile b/src/tbutc/Makefile.in similarity index 99% rename from src/tbutc/Makefile rename to src/tbutc/Makefile.in index e26124c80d..995f79177e 100644 --- a/src/tbutc/Makefile +++ b/src/tbutc/Makefile.in @@ -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} diff --git a/src/tsm41/Makefile b/src/tsm41/Makefile.in similarity index 96% rename from src/tsm41/Makefile rename to src/tsm41/Makefile.in index 9214e07e0c..750bead5cf 100644 --- a/src/tsm41/Makefile +++ b/src/tsm41/Makefile.in @@ -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} diff --git a/src/tviced/Makefile b/src/tviced/Makefile.in similarity index 98% rename from src/tviced/Makefile rename to src/tviced/Makefile.in index 83bab934b9..e7fd31b244 100644 --- a/src/tviced/Makefile +++ b/src/tviced/Makefile.in @@ -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} diff --git a/src/ubik/Makefile b/src/ubik/Makefile.in similarity index 98% rename from src/ubik/Makefile rename to src/ubik/Makefile.in index 60100afdc4..49fd405471 100644 --- a/src/ubik/Makefile +++ b/src/ubik/Makefile.in @@ -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 diff --git a/src/update/Makefile b/src/update/Makefile.in similarity index 94% rename from src/update/Makefile rename to src/update/Makefile.in index b4b45ec3cb..3f18202222 100644 --- a/src/update/Makefile +++ b/src/update/Makefile.in @@ -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 diff --git a/src/usd/Makefile b/src/usd/Makefile.in similarity index 94% rename from src/usd/Makefile rename to src/usd/Makefile.in index a6cdad63f2..e7aadd2643 100644 --- a/src/usd/Makefile +++ b/src/usd/Makefile.in @@ -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 diff --git a/src/usd/test/Makefile b/src/usd/test/Makefile.in similarity index 93% rename from src/usd/test/Makefile rename to src/usd/test/Makefile.in index ffeab39d27..095d34742e 100644 --- a/src/usd/test/Makefile +++ b/src/usd/test/Makefile.in @@ -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 diff --git a/src/uss/Makefile b/src/uss/Makefile.in similarity index 96% rename from src/uss/Makefile rename to src/uss/Makefile.in index 9b044bb1a2..8d4f9b8481 100644 --- a/src/uss/Makefile +++ b/src/uss/Makefile.in @@ -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} # diff --git a/src/util/Makefile b/src/util/Makefile.in similarity index 97% rename from src/util/Makefile rename to src/util/Makefile.in index 8bf9c54fe5..780dacebd8 100644 --- a/src/util/Makefile +++ b/src/util/Makefile.in @@ -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} diff --git a/src/util/test/Makefile b/src/util/test/Makefile.in similarity index 92% rename from src/util/test/Makefile rename to src/util/test/Makefile.in index baf95458bd..4a97d37ce2 100644 --- a/src/util/test/Makefile +++ b/src/util/test/Makefile.in @@ -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 diff --git a/src/venus/Makefile b/src/venus/Makefile.in similarity index 98% rename from src/venus/Makefile rename to src/venus/Makefile.in index 507852f6e7..9407b9b72c 100644 --- a/src/venus/Makefile +++ b/src/venus/Makefile.in @@ -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} diff --git a/src/venus/test/Makefile b/src/venus/test/Makefile.in similarity index 90% rename from src/venus/test/Makefile rename to src/venus/test/Makefile.in index b3e40f7f6e..64e4819db1 100644 --- a/src/venus/test/Makefile +++ b/src/venus/test/Makefile.in @@ -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} diff --git a/src/vfsck/Makefile b/src/vfsck/Makefile.in similarity index 97% rename from src/vfsck/Makefile rename to src/vfsck/Makefile.in index 9598045947..d4d3df10b1 100644 --- a/src/vfsck/Makefile +++ b/src/vfsck/Makefile.in @@ -16,7 +16,12 @@ # # @(#)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} diff --git a/src/viced/Makefile b/src/viced/Makefile.in similarity index 96% rename from src/viced/Makefile rename to src/viced/Makefile.in index 2c5ac08d92..2bd2124798 100644 --- a/src/viced/Makefile +++ b/src/viced/Makefile.in @@ -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 diff --git a/src/vlserver/Makefile b/src/vlserver/Makefile.in similarity index 97% rename from src/vlserver/Makefile rename to src/vlserver/Makefile.in index 62dba44ac4..f942ac6a27 100644 --- a/src/vlserver/Makefile +++ b/src/vlserver/Makefile.in @@ -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 diff --git a/src/vol/Makefile b/src/vol/Makefile.in similarity index 96% rename from src/vol/Makefile rename to src/vol/Makefile.in index 6baabcf9c6..8361bfba86 100644 --- a/src/vol/Makefile +++ b/src/vol/Makefile.in @@ -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 diff --git a/src/vol/test/Makefile b/src/vol/test/Makefile.in similarity index 96% rename from src/vol/test/Makefile rename to src/vol/test/Makefile.in index dbba05d4fb..fb30a0e5bc 100644 --- a/src/vol/test/Makefile +++ b/src/vol/test/Makefile.in @@ -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} diff --git a/src/volser/Makefile b/src/volser/Makefile.in similarity index 97% rename from src/volser/Makefile rename to src/volser/Makefile.in index ddfc16899e..40ad2bc759 100644 --- a/src/volser/Makefile +++ b/src/volser/Makefile.in @@ -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 diff --git a/src/wsadmin.src/Makefile b/src/wsadmin.src/Makefile.in similarity index 97% rename from src/wsadmin.src/Makefile rename to src/wsadmin.src/Makefile.in index e4f4c32eb3..156c9a40b8 100644 --- a/src/wsadmin.src/Makefile +++ b/src/wsadmin.src/Makefile.in @@ -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 \ diff --git a/src/xstat/Makefile b/src/xstat/Makefile.in similarity index 96% rename from src/xstat/Makefile rename to src/xstat/Makefile.in index 73a471688d..138902a098 100644 --- a/src/xstat/Makefile +++ b/src/xstat/Makefile.in @@ -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. \