From 838e1eae1a62cae05df8239a82f20be47b2183b2 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Thu, 1 Nov 2001 04:59:26 +0000 Subject: [PATCH] build-system-specific-makefile-configuration-from-configure-20011031 junk all of Makefile.${SYS_NAME} in favor of a common makefile built by configure, and use it --- Makefile.in | 38 +- acinclude.m4 | 2 + configure-libafs.in | 1 + configure.in | 8 +- src/afs/Makefile.in | 41 +- src/afsd/Makefile.in | 25 +- src/afsmonitor/Makefile.in | 25 +- src/afsweb/Makefile.in | 26 +- src/audit/Makefile.in | 27 +- src/auth/Makefile.in | 27 +- src/auth/test/Makefile.in | 12 +- src/bozo/Makefile.in | 25 +- src/bozo/test/Makefile.in | 23 +- src/bu_utils/Makefile.in | 24 +- src/bubasics/Makefile.in | 26 +- src/bucoord/Makefile.in | 26 +- src/budb/Makefile.in | 26 +- src/butc/Makefile.in | 24 +- src/butm/Makefile.in | 24 +- src/cf/osconf.m4 | 544 +++++++++++++++++++++++++ src/cmd/Makefile.in | 26 +- src/cmd/test/Makefile.in | 9 +- src/comerr/Makefile.in | 27 +- src/comerr/test/Makefile.in | 23 +- src/config/Makefile.alpha_dux40.in | 30 -- src/config/Makefile.alpha_dux50.in | 30 -- src/config/Makefile.alpha_linux_22.in | 45 -- src/config/Makefile.alpha_linux_24.in | 45 -- src/config/Makefile.config.in | 107 +++++ src/config/Makefile.hp_ux102.in | 37 -- src/config/Makefile.hp_ux110.in | 37 -- src/config/Makefile.i386_djgpp | 8 +- src/config/Makefile.i386_fbsd_42.in | 47 --- src/config/Makefile.i386_linux22.in | 51 --- src/config/Makefile.i386_linux24.in | 43 -- src/config/Makefile.i386_obsd29.in | 39 -- src/config/Makefile.in | 31 +- src/config/Makefile.parisc_linux24.in | 43 -- src/config/Makefile.ppc_darwin_12.in | 43 -- src/config/Makefile.ppc_darwin_13.in | 43 -- src/config/Makefile.ppc_linux22.in | 44 -- src/config/Makefile.ppc_linux24.in | 44 -- src/config/Makefile.rs_aix42.in | 39 -- src/config/Makefile.s390_linux22.in | 48 --- src/config/Makefile.s390_linux24.in | 48 --- src/config/Makefile.sgi_62.in | 46 --- src/config/Makefile.sgi_63.in | 41 -- src/config/Makefile.sgi_64.in | 47 --- src/config/Makefile.sgi_65.in | 47 --- src/config/Makefile.sparc64_linux22.in | 47 --- src/config/Makefile.sparc64_linux24.in | 47 --- src/config/Makefile.sparc_linux22.in | 47 --- src/config/Makefile.sun4x_55.in | 47 --- src/config/Makefile.sun4x_56.in | 51 --- src/config/Makefile.sun4x_57.in | 55 --- src/config/Makefile.sun4x_58.in | 48 --- src/config/Makefile.sun4x_59.in | 48 --- src/config/Makefile.sunx86_54.in | 23 -- src/config/Makefile.sunx86_58.in | 52 --- src/dauth/Makefile.in | 27 +- src/des/Makefile.in | 26 +- src/des/test/Makefile.in | 11 +- src/des_stub/Makefile.in | 9 +- src/dir/Makefile.in | 28 +- src/dir/test/Makefile.in | 13 +- src/export/Makefile.in | 30 +- src/finale/Makefile.in | 24 +- src/fsint/Makefile.in | 27 +- src/fsprobe/Makefile.in | 28 +- src/ftpd43+/Makefile.in | 23 +- src/gtx/Makefile.in | 24 +- src/inetd/Makefile.in | 24 +- src/kauth/Makefile.in | 31 +- src/kauth/test/Makefile.in | 8 +- src/libacl/Makefile.in | 28 +- src/libacl/test/Makefile.in | 23 +- src/libadmin/Makefile.in | 22 +- src/libadmin/adminutil/Makefile.in | 24 +- src/libadmin/bos/Makefile.in | 24 +- src/libadmin/cfg/Makefile.in | 24 +- src/libadmin/cfg/test/Makefile.in | 8 +- src/libadmin/client/Makefile.in | 24 +- src/libadmin/kas/Makefile.in | 24 +- src/libadmin/pts/Makefile.in | 24 +- src/libadmin/samples/Makefile.in | 63 ++- src/libadmin/test/Makefile.in | 22 +- src/libadmin/vos/Makefile.in | 23 +- src/libafs/MakefileProto.AIX.in | 23 +- src/libafs/MakefileProto.DARWIN.in | 23 +- src/libafs/MakefileProto.DUX.in | 24 +- src/libafs/MakefileProto.FBSD.in | 23 +- src/libafs/MakefileProto.HPUX.in | 23 +- src/libafs/MakefileProto.IRIX.in | 23 +- src/libafs/MakefileProto.LINUX.in | 30 +- src/libafs/MakefileProto.OBSD.in | 23 +- src/libafs/MakefileProto.SOLARIS.in | 23 +- src/libafsauthent/Makefile.in | 24 +- src/libafsrpc/Makefile.in | 24 +- src/libuafs/MakefileProto.AIX.in | 24 +- src/libuafs/MakefileProto.DARWIN.in | 23 +- src/libuafs/MakefileProto.DUX.in | 24 +- src/libuafs/MakefileProto.FBSD.in | 22 +- src/libuafs/MakefileProto.HPUX.in | 24 +- src/libuafs/MakefileProto.IRIX.in | 24 +- src/libuafs/MakefileProto.LINUX.in | 24 +- src/libuafs/MakefileProto.SOLARIS.in | 24 +- src/log/Makefile.in | 22 +- src/log/test/Makefile.in | 23 +- src/login/Makefile.in | 23 +- src/lwp/Makefile.in | 24 +- src/lwp/test/Makefile.in | 12 +- src/mpp/Makefile.in | 23 +- src/ntp/Makefile.in | 24 +- src/null/Makefile.in | 25 +- src/package/Makefile.in | 24 +- src/pam/Makefile.in | 34 +- src/pinstall/Makefile.in | 25 +- src/pinstall/test/Makefile.in | 22 +- src/procmgmt/Makefile.in | 22 +- src/procmgmt/test/Makefile.in | 7 +- src/ptserver/Makefile.in | 27 +- src/rcp/Makefile.in | 25 +- src/rlogind/Makefile.in | 24 +- src/rsh/Makefile.in | 24 +- src/rx/Makefile.in | 29 +- src/rx/bulk.example/Makefile.in | 7 +- src/rx/bulktest/Makefile.in | 7 +- src/rx/multi.example/Makefile.in | 7 +- src/rx/simple.example/Makefile.in | 7 +- src/rx/test/Makefile.in | 25 +- src/rxdebug/Makefile.in | 29 +- src/rxgen/Makefile.in | 27 +- src/rxkad/Makefile.in | 30 +- src/rxkad/test/Makefile.in | 9 +- src/rxstat/Makefile.in | 27 +- src/scout/Makefile.in | 25 +- src/sgistuff/Makefile.in | 25 +- src/sia/Makefile.in | 27 +- src/sys/Makefile.in | 30 +- src/tbutc/Makefile.in | 25 +- src/tsm41/Makefile.in | 24 +- src/tviced/Makefile.in | 25 +- src/ubik/Makefile.in | 27 +- src/update/Makefile.in | 26 +- src/usd/Makefile.in | 24 +- src/usd/test/Makefile.in | 12 +- src/uss/Makefile.in | 25 +- src/util/Makefile.in | 33 +- src/util/test/Makefile.in | 7 +- src/venus/Makefile.in | 28 +- src/venus/test/Makefile.in | 26 +- src/vfsck/Makefile.in | 23 +- src/viced/Makefile.in | 24 +- src/vlserver/Makefile.in | 29 +- src/vol/Makefile.in | 24 +- src/vol/test/Makefile.in | 24 +- src/volser/Makefile.in | 25 +- src/wsadmin.src/Makefile.in | 7 +- src/xstat/Makefile.in | 24 +- 159 files changed, 857 insertions(+), 4051 deletions(-) create mode 100644 src/cf/osconf.m4 delete mode 100644 src/config/Makefile.alpha_dux40.in delete mode 100644 src/config/Makefile.alpha_dux50.in delete mode 100644 src/config/Makefile.alpha_linux_22.in delete mode 100644 src/config/Makefile.alpha_linux_24.in create mode 100644 src/config/Makefile.config.in delete mode 100644 src/config/Makefile.hp_ux102.in delete mode 100644 src/config/Makefile.hp_ux110.in delete mode 100644 src/config/Makefile.i386_fbsd_42.in delete mode 100644 src/config/Makefile.i386_linux22.in delete mode 100644 src/config/Makefile.i386_linux24.in delete mode 100644 src/config/Makefile.i386_obsd29.in delete mode 100644 src/config/Makefile.parisc_linux24.in delete mode 100644 src/config/Makefile.ppc_darwin_12.in delete mode 100644 src/config/Makefile.ppc_darwin_13.in delete mode 100644 src/config/Makefile.ppc_linux22.in delete mode 100644 src/config/Makefile.ppc_linux24.in delete mode 100644 src/config/Makefile.rs_aix42.in delete mode 100644 src/config/Makefile.s390_linux22.in delete mode 100644 src/config/Makefile.s390_linux24.in delete mode 100644 src/config/Makefile.sgi_62.in delete mode 100644 src/config/Makefile.sgi_63.in delete mode 100644 src/config/Makefile.sgi_64.in delete mode 100644 src/config/Makefile.sgi_65.in delete mode 100644 src/config/Makefile.sparc64_linux22.in delete mode 100644 src/config/Makefile.sparc64_linux24.in delete mode 100644 src/config/Makefile.sparc_linux22.in delete mode 100644 src/config/Makefile.sun4x_55.in delete mode 100644 src/config/Makefile.sun4x_56.in delete mode 100644 src/config/Makefile.sun4x_57.in delete mode 100644 src/config/Makefile.sun4x_58.in delete mode 100644 src/config/Makefile.sun4x_59.in delete mode 100644 src/config/Makefile.sunx86_54.in delete mode 100644 src/config/Makefile.sunx86_58.in diff --git a/Makefile.in b/Makefile.in index 30caac71b0..1643598ad8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,38 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -SHELL=/bin/sh -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afskerneldir=@afskerneldir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ - -# Systype-generic items -SYS_NAME=@AFS_SYSNAME@ -MKAFS_OSTYPE=@MKAFS_OSTYPE@ - -# Systype-specific items -LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ -LINUX_VERSION=@LINUX_VERSION@ -DARWIN_INFOFILE=@DARWIN_INFOFILE@ - -# Other items -LIB_AFSDB=@LIB_AFSDB@ +include @TOP_OBJDIR@/src/config/Makefile.config # Enable build+install of obsolete and insecure packages # Set to anything other than YES, or comment out to disable the build @@ -45,8 +15,6 @@ WITH_INSECURE=@WITH_INSECURE@ ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@ -include src/config/Makefile.${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. @@ -362,7 +330,7 @@ libafs_tree: libafs_setup ${KERNELDIR} ${INSTALL} -c -f $$f libafs_tree/$$f; \ done src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE}.in libafs_tree/Makefile.in ${SYS_NAME} - ${INSTALL} -c src/config/Makefile.${SYS_NAME}.in libafs_tree/config + ${INSTALL} -c src/config/Makefile.config.in libafs_tree/config ${INSTALL} -c src/config/afsconfig.h.in libafs_tree/config ${INSTALL} -c -f -ns configure-libafs libafs_tree/configure case ${SYS_NAME} in \ @@ -619,7 +587,7 @@ distclean: clean src/config/Makefile \ src/config/Makefile.version \ src/config/Makefile.version-NOCML \ - src/config/Makefile.${SYS_NAME} \ + src/config/Makefile.config \ src/dauth/Makefile \ src/des/test/Makefile \ src/des/Makefile \ diff --git a/acinclude.m4 b/acinclude.m4 index 26107cea99..f959bfbe65 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -484,4 +484,6 @@ AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) AC_SUBST(DARWIN_INFOFILE) +OPENAFS_OSCONF + ]) diff --git a/configure-libafs.in b/configure-libafs.in index 684e35f419..b8cf1acda4 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -20,5 +20,6 @@ fi AC_OUTPUT( \ Makefile \ +config/Makefile.config \ config/Makefile.${AFS_SYSNAME} \ ) diff --git a/configure.in b/configure.in index 1c14a87aca..d74bd74214 100644 --- a/configure.in +++ b/configure.in @@ -12,12 +12,6 @@ if test "${DEST}x" = "x"; then DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" fi -# Check for files involved in porting. Report errors, don't make the -# user hunt through the configure log after the build fails! -if test ! -r ${TOP_SRCDIR}/config/Makefile.${AFS_SYSNAME}.in ; then - AC_MSG_ERROR(no source file ${TOP_SRCDIR}/config/Makefile.${AFS_SYSNAME}.in) -fi - AC_OUTPUT( \ Makefile \ src/afs/Makefile \ @@ -40,8 +34,8 @@ src/cmd/Makefile \ src/comerr/test/Makefile \ src/comerr/Makefile \ src/config/Makefile \ +src/config/Makefile.config \ src/config/Makefile.version-NOCML \ -src/config/Makefile.${AFS_SYSNAME} \ src/dauth/Makefile \ src/des/test/Makefile \ src/des/Makefile \ diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index bf58fc66e9..e068a9722c 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL=/bin/sh -KERNELDIR = ../libafs -UKERNELDIR = ../libuafs - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h case ${SYS_NAME} in \ @@ -46,8 +21,8 @@ kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afszcm.cat ${INSTALL} ${srcdir}/*.[csh] ${KERNELDIR}/afs -${INSTALL} *.[csh] ${KERNELDIR}/afs ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${KERNELDIR}/afs - ${INSTALL} ${srcdir}/${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs - -${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs + ${INSTALL} ${srcdir}/${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs + -${INSTALL} ${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs afs_trace.h afs_trace.msf: ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et @@ -85,7 +60,7 @@ install: ${DESTDIR}${includedir}/afs/afs.h ${DESTDIR}${includedir}/afs/osi_in esac case ${SYS_NAME} in \ *linux* ) \ - ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs ;;\ + ${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs ;;\ * ) \ echo No vfs headers to install for ${SYS_NAME};; \ esac @@ -105,13 +80,13 @@ ${TOP_INCDIR}/afs/afs.h: afs.h ${INSTALL} $? $@ -${DEST}/include/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h +${DEST}/include/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h +${DESTDIR}${includedir}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h +${TOP_INCDIR}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h ${INSTALL} $? $@ @@ -161,7 +136,7 @@ dest: ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/includ esac case ${SYS_NAME} in \ *linux* ) \ - ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DEST}/include/afs ;;\ + ${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DEST}/include/afs ;;\ * ) \ echo No vfs headers to install for ${SYS_NAME};; \ esac diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 3682054bfc..5e0d281fd1 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -6,32 +6,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# afsd makefile -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 57dbd51fba..d0af74ddd9 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# Makefile for Afsmonitor, the AFS Performance monitoring tool -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-g -I. \ -I${TOP_OBJDIR}/src/config \ diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 016a010712..11419eaf34 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -5,34 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL=/bin/sh +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs/ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et UKSRCS=nsafs.h nsafs.c securehash.c diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index e5187f6cd5..b55ce93a19 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -12,33 +12,8 @@ # # supported (if not supported, don't show it). # ###################################################################### -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR = ../libuafs/ +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 73352e2a3f..c129b4b785 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -5,34 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 9f8254dcdd..6214dffb7a 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -5,16 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -include ../../config/Makefile.${SYS_NAME} - -SRCDIR= - -OPTIMIZE=-O +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS= -I./ -I${DESTDIR}/include LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L${DESTDIR}/lib/rx diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 037de21e81..ee651643cf 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h bosint.h diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index 1e83978417..512e25b6ee 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -5,29 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -OPTIMIZE=-O +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS=-I${TOP_INCDIR} -I.. LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index c66d657561..40aee4d85a 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-g -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index cf7b774d2d..8a5556b61d 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -5,32 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index ba9b99e594..05bd40b8e1 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -5,32 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config \ -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 21df796d08..0683a3a039 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -6,32 +6,8 @@ # directory or online at http://www.openafs.org/dl/license10.html # */ -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 2e5cf0dc78..2c1780c354 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-g -w ${INCDIRS} ${XCFLAGS} diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index 0bbfa60424..53a9e48131 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -5,29 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh CFLAGS=-g -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} @@ -42,8 +22,6 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/util.a \ ${XLIBS} -include ../config/Makefile.${SYS_NAME} - all: ${TOP_LIBDIR}/libbutm.a install: ${DESTDIR}${libdir}/afs/libbutm.a diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 new file mode 100644 index 0000000000..1270a29835 --- /dev/null +++ b/src/cf/osconf.m4 @@ -0,0 +1,544 @@ + +AC_DEFUN(OPENAFS_OSCONF, [ + +dnl defaults, override in case below as needed +DBG="-g" +OPTMZ="-O2" +XCFLAGS="-O2" +SHLIB_SUFFIX="so" +CC="cc" +MT_CC="cc" +XLIBS="${LIB_AFSDB}" + +dnl standard programs +AC_PROG_RANLIB +AC_CHECK_PROGS(AS, as, [${am_missing_run}as]) +AC_CHECK_PROGS(AR, ar, [${am_missing_run}ar]) +AC_CHECK_PROGS(MV, mv, [${am_missing_run}mv]) +AC_CHECK_PROGS(RM, rm, [${am_missing_run}rm]) +AC_CHECK_PROGS(LD, ld, [${am_missing_run}ld]) +AC_CHECK_PROGS(CP, cp, [${am_missing_run}cp]) +AC_CHECK_PROGS(STRIP, strip, [${am_missing_run}strip]) +AC_CHECK_PROGS(LORDER, lorder, [${am_missing_run}lorder]) + +case $AFS_SYSNAME in + alpha_dux40) + CSTATIC="-non_shared" + LWP_OPTMZ="-O2" + MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-pthread -lpthread -lmach -lexc -lc" + TXLIBS="-lcurses" + XCFLAGS="-D_NO_PROTO -DOSF" + ;; + + alpha_dux50) + CSTATIC="-non_shared" + LWP_OPTMZ="-O2" + MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-pthread -lpthread -lmach -lexc -lc" + TXLIBS="-lcurses" + XCFLAGS="-D_NO_PROTO -DOSF" + ;; + + alpha_linux22) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + alpha_linux24) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + hp_ux102) + AS="/usr/ccs/bin/as" + CC="/opt/ansic/bin/cc -Ae" + DBM="/lib/libndbm.a" + LD="/bin/ld" + LEX="/opt/langtools/bin/lex" + LWP_OPTMZ="-O" + MT_CC="/opt/ansic/bin/cc -Ae" + MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-L/opt/dce/lib -ldce" + MV="/bin/mv" + OPTMZ="-O" + PAM_CFLAGS="+DA1.0 +z -Wl,+k" + PAM_LIBS="/usr/lib/libpam.1" + RANLIB="/usr/bin/ranlib" + RM="/bin/rm" + SHLIB_LDFLAGS="-b -Bsymbolic" + SHLIB_SUFFIX="sl" + TXLIBS="/usr/lib/libHcurses.a" + VFSCK_CFLAGS="-D_FILE64" + XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE" + XCFLAGS64="${XCFLAGS0} +DA2.0W" + XCFLAGS="${XCFLAGS0} +DA1.0" + YACC="/opt/langtools/bin/yacc" + ;; + + hp_ux110) + AS="/usr/ccs/bin/as" + CC="/opt/ansic/bin/cc" + DBM="/lib/libndbm.a" + LD="/bin/ld " + LEX="/opt/langtools/bin/lex" + LWP_OPTMZ="-O" + MT_CC="$CC" + MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread" + MV="/bin/mv" + OPTMZ="-O" + PAM_CFLAGS="+DA1.0 +z -Wl,+k" + PAM_LIBS="/usr/lib/libpam.1" + RANLIB="/usr/bin/ranlib" + RM="/bin/rm" + SHLIB_LDFLAGS="-b -Bsymbolic" + SHLIB_SUFFIX="sl" + TXLIBS="/usr/lib/libHcurses.a" + VFSCK_CFLAGS="-I/usr/old/usr/include -D_FILE64" + XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE" + XCFLAGS64="${XCFLAGS0} +DA2.0W" + XCFLAGS="${XCFLAGS0} +DA1.0" + XLIBELFA="-lelf" + XLIBS="${LIB_AFSDB} -lnsl" + YACC="/opt/langtools/bin/yacc" + ;; + + i386_fbsd_42) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-pthread" + PAM_CFLAGS="-O2 -pipe -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2 -pipe" + XLIBS="${LIB_AFSDB} -lcompat" + YACC="bison -y" + ;; + + i386_linux22) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + i386_linux24) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + ;; + + i386_obsd29) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-pthread" + PAM_CFLAGS="-O2 -pipe -fpic" + SHLIB_CFLAGS="-fpic" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libcurses.a" + XCFLAGS="-O2" + XLIBS="${LIB_AFSDB} -lcompat" + YACC="yacc" + ;; + + parisc_linux24) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + ppc_darwin_12) + KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers' + LEX="lex -l" + LWP_OPTMZ="-g" + OPTMZ="-g" + REGEX_OBJ="regex.o" + XCFLAGS="-traditional-cpp" + ;; + + ppc_darwin_13) + KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers' + LEX="lex -l" + LWP_OPTMZ="-O2" + REGEX_OBJ="regex.o" + XCFLAGS="-no-precomp" + ;; + + ppc_linux22) + INSTALL="install" + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + ppc_linux24) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + rs_aix42) + DBG="" + LEX="lex" + LIBSYS_AIX_EXP="afsl.exp" + LWP_OPTMZ="-O" + MT_CC="xlc_r" + MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthreads" + OPTMZ="-O" + SHLIB_SUFFIX="o" + TXLIBS="-lcurses" + XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void" + XLIBS="${LIB_AFSDB} -ldl" + ;; + + s390_linux22) + CC="gcc" + LD="gcc" + LEX="flex -l" + MT_CC="$CC" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O -g" + YACC="bison -y" + ;; + + s390_linux24) + CC="gcc" + LD="gcc" + LEX="flex -l" + MT_CC="$CC" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O -g" + YACC="bison -y" + ;; + + sgi_62) + FSINCLUDES="-I/usr/include/sys/fs" + LEX="lex" + LWP_OPTMZ="-O" + MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + TXLIBS="-lcurses" + XCFLAGS64="-64 -mips3" + XCFLAGS="-o32" + XLDFLAGS64="-64" + XLDFLAGS="-o32" + ;; + + sgi_63) + FSINCLUDES="-I/usr/include/sys/fs" + LEX="lex" + LWP_OPTMZ="-O" + MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + TXLIBS="-lcurses" + XCFLAGS64="-D_BSD_COMPAT -64 -mips3" + XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32" + XLDFLAGS64="-64" + XLDFLAGS="-o32" + ;; + + sgi_64) + FSINCLUDES="-I/usr/include/sys/fs" + LEX="lex" + LWP_OPTMZ="-O" + MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + TXLIBS="-lcurses" + XCFLAGS64="-D_BSD_COMPAT -64 -mips3" + XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552" + XLDFLAGS64="-64" + XLDFLAGS="-n32" + ;; + + sgi_65) + CC="/usr/bin/cc" + FSINCLUDES="-I/usr/include/sys/fs" + LD="/usr/bin/ld" + LEX="lex" + MT_CC="/usr/bin/cc" + MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread" + OPTMZ="-O" + TXLIBS="-lcurses" + XCFLAGS64="-64 -mips3" + XCFLAGS="-n32 -mips3 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552" + XLDFLAGS64="-64 -mips3" + XLDFLAGS="-n32 -mips3" + ;; + + sparc64_linux22) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + sparc64_linux24) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + sparc_linux22) + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="/usr/lib/libncurses.so" + XCFLAGS="-O2" + YACC="bison -y" + ;; + + sun4x_55) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LWP_OPTMZ="-g" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + SHLIB_CFLAGS="-KPIC" + TXLIBS="-lcurses" + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + LD="/usr/ccs/bin/ld" + ;; + + sun4x_56) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LWP_OPTMZ="-g" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + PAM_CFLAGS="-KPIC" + PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" + SHLIB_CFLAGS="-KPIC" + SHLIB_LDFLAGS="-G -Bsymbolic" + TXLIBS="-L/usr/ccs/lib -lcurses" + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + LD="/usr/ccs/bin/ld" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + ;; + + sun4x_57) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LD="/usr/ccs/bin/ld" + LWP_OPTMZ="-g" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + PAM_CFLAGS="-KPIC" + PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" + SHLIB_CFLAGS="-KPIC" + SHLIB_LDFLAGS="-G -Bsymbolic" + TXLIBS="-lcurses" + XCFLAGS64='${XCFLAGS} -xarch=v9' + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + ;; + + sun4x_58) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LD="/usr/ccs/bin/ld" + LWP_OPTMZ="-g" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + PAM_CFLAGS="-KPIC" + PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" + SHLIB_CFLAGS="-KPIC" + SHLIB_LDFLAGS="-G -Bsymbolic" + TXLIBS="-lcurses" + XCFLAGS64='${XCFLAGS} -xarch=v9' + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + ;; + + sun4x_59) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LWP_OPTMZ="-g" + LD="/usr/ccs/bin/ld" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + PAM_CFLAGS="-KPIC" + PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" + SHLIB_CFLAGS="-KPIC" + SHLIB_LDFLAGS="-G -Bsymbolic" + TXLIBS="-lcurses" + XCFLAGS64='${XCFLAGS} -xarch=v9' + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + ;; + + sunx86_58) + CC="/opt/SUNWspro/bin/cc" + LEX="lex" + LWP_OPTMZ="-g" + LD="/usr/ccs/bin/ld" + MT_CC="/opt/SUNWspro/bin/cc" + MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}' + MT_LIBS="-lpthread -lsocket" + OPTMZ="-O" + PAM_CFLAGS="-KPIC" + PAM_LIBS="-lc -lpam -lsocket -lnsl -lm" + SHLIB_CFLAGS="-KPIC" + SHLIB_LDFLAGS="-G -Bsymbolic" + TXLIBS="-lcurses" + XCFLAGS64='${XCFLAGS} -xarch=v9' + XCFLAGS="-dy -Bdynamic" + XLIBELFA="-lelf" + XLIBKVM="-lkvm" + XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl" + ;; + + +esac + +# +# Special build targets +# +case $AFS_SYSNAME in + sgi_6*) + XFS_SIZE_CHECK="xfs_size_check" + install_XFS_SIZE_CHECK='$(DESTDIR)${afssrvsbindir}/xfs_size_check' + dest_XFS_SIZE_CHECK='$(DEST)/root.server/usr/afs/bin/xfs_size_check' + + AC_SUBST(XFS_SIZE_CHECK) + AC_SUBST(install_XFS_SIZE_CHECK) + AC_SUBST(dest_XFS_SIZE_CHECK) + ;; + + sun4x_*|sunx86_*) + FS_CONV_SOL26="fs_conv_sol26" + install_FS_CONV_SOL26='$(DESTDIR)${afssrvsbindir}/fs_conv_sol26' + dest_FS_CONV_SOL26='$(DEST)/root.server/usr/afs/bin/fs_conv_sol26' + + AC_SUBST(FS_CONV_SOL26) + AC_SUBST(install_FS_CONV_SOL26) + AC_SUBST(dest_FS_CONV_SOL26) + ;; + + alpha_dux*) + FS_CONV_OSF40D="fs_conv_dux40d" + install_FS_CONV_OSF40D='$(DESTDIR)${afssrvsbindir}/fs_conv_dux40d' + dest_FS_CONV_OSF40D='$(DEST)/root.server/usr/afs/bin/fs_conv_sdux40d' + + AC_SUBST(FS_CONV_OSF40D) + AC_SUBST(install_FS_CONV_OSF40D) + AC_SUBST(dest_FS_CONV_OSF40D) + ;; +esac + + +AC_SUBST(AR) +AC_SUBST(AS) +AC_SUBST(CP) +AC_SUBST(DBG) +AC_SUBST(FSINCLUDES) +AC_SUBST(LD) +AC_SUBST(LEX) +AC_SUBST(LWP_OPTMZ) +AC_SUBST(MT_CC) +AC_SUBST(MT_CFLAGS) +AC_SUBST(MT_LIBS) +AC_SUBST(MV) +AC_SUBST(OPTMZ) +AC_SUBST(PAM_CFLAGS) +AC_SUBST(PAM_LIBS) +AC_SUBST(RANLIB) +AC_SUBST(REGEX_OBJ) +AC_SUBST(RM) +AC_SUBST(SHLIB_CFLAGS) +AC_SUBST(SHLIB_LDFLAGS) +AC_SUBST(SHLIB_SUFFIX) +AC_SUBST(TXLIBS) +AC_SUBST(VFSCK_CFLAGS) +AC_SUBST(XCFLAGS) +AC_SUBST(XCFLAGS64) +AC_SUBST(XLDFLAGS) +AC_SUBST(XLDFLAGS64) +AC_SUBST(XLIBELFA) +AC_SUBST(XLIBKVM) +AC_SUBST(XLIBS) +AC_SUBST(YACC) + + +]) diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index b59d090bb0..37ba84639a 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -5,32 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config LIBOBJS=cmd_errors.o cmd.o LIB64OBJS=cmd_errors64.o cmd64.o diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index ce29b96eb6..d85e3dc421 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -5,14 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -OPTIMIZE=-O LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. LIBS=-lcmd -lcom_err -lafsutil diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index c6ed991828..bb97ef7504 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -4,33 +4,8 @@ # Copyright 1987, 1989 MIT Student Information Processing Board # For copyright info, see mit-sipb-cr.h. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs/ +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config -I. -I${srcdir} ${XCFLAGS} diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 8104f6e1c0..98a875f42a 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -1,26 +1,7 @@ -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -OPTIMIZE=-O INCDIRS=-I${TOP_INCDIR} -I.. LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. diff --git a/src/config/Makefile.alpha_dux40.in b/src/config/Makefile.alpha_dux40.in deleted file mode 100644 index 0c22a66b83..0000000000 --- a/src/config/Makefile.alpha_dux40.in +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -AFS_OSTYPE = DUX - -MT_CC=cc -XCFLAGS= -D_NO_PROTO -DOSF -MT_CFLAGS=-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS} -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -XLIBS=@LIB_AFSDB@ -MTLIBS=-pthread -lpthread -lmach -lexc -lc -NON_SHARED=-non_shared -TXLIBS= -lcurses -LWP_OPTMZ=-O2 -OPTMZ=-O2 -DBG=-g3 -CSTATIC=-non_shared -RANLIB=/bin/true -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -CP=cp - -#this is for the vol package -FS_CONV_OSF40D = fs_conv_dux40D -install_FS_CONV_OSF40D = $(DESTDIR)${afssrvsbindir}/fs_conv_dux40D -dest_FS_CONV_OSF40D = $(DEST)/root.server/usr/afs/bin/fs_conv_dux40D diff --git a/src/config/Makefile.alpha_dux50.in b/src/config/Makefile.alpha_dux50.in deleted file mode 100644 index 8bb47aaac8..0000000000 --- a/src/config/Makefile.alpha_dux50.in +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -AFS_OSTYPE = DUX - -MT_CC=cc -XCFLAGS= -D_NO_PROTO -DOSF -MT_CFLAGS=-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS} -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -XLIBS=@LIB_AFSDB@ -MTLIBS=-pthread -lpthread -lmach -lexc -lc -NON_SHARED=-non_shared -TXLIBS= -lcurses -LWP_OPTMZ=-O2 -OPTMZ=-O2 -DBG=-g3 -CP=cp -CSTATIC=-non_shared -RANLIB=/bin/true -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall - -#this is for the vol package -FS_CONV_OSF40D = fs_conv_dux40D -install_FS_CONV_OSF40D = $(DESTDIR)${afssrvsbindir}/fs_conv_dux40D -dest_FS_CONV_OSF40D = $(DEST)/root.server/usr/afs/bin/fs_conv_dux40D diff --git a/src/config/Makefile.alpha_linux_22.in b/src/config/Makefile.alpha_linux_22.in deleted file mode 100644 index 2bfab08ce8..0000000000 --- a/src/config/Makefile.alpha_linux_22.in +++ /dev/null @@ -1,45 +0,0 @@ -# Makefile for Linux 2.2.16 kernel on Alpha with glibc 2.2 -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.16 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.alpha_linux_24.in b/src/config/Makefile.alpha_linux_24.in deleted file mode 100644 index df6073bfaa..0000000000 --- a/src/config/Makefile.alpha_linux_24.in +++ /dev/null @@ -1,45 +0,0 @@ -# Makefile for Linux 2.2.16 kernel on Alpha with glibc 2.2 -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -#LINUX_VERS = 2.2.16 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in new file mode 100644 index 0000000000..1568aaec82 --- /dev/null +++ b/src/config/Makefile.config.in @@ -0,0 +1,107 @@ +# +# Installation vars +# +afsbackupdir=@afsbackupdir@ +afsbosconfigdir=@afsbosconfigdir@ +afsconfdir=@afsconfdir@ +afsdbdir=@afsdbdir@ +afslocaldir=@afslocaldir@ +afslogsdir=@afslogsdir@ +afssrvbindir=@afssrvbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afssrvsbindir=@afssrvsbindir@ +bindir=@bindir@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ +libexecdir=@libexecdir@ +localstatedir=@localstatedir@ +mandir=@mandir@ +prefix=@prefix@ +sbindir=@sbindir@ +sysconfdir=@sysconfdir@ +viceetcdir=@viceetcdir@ + + +# +# Programs and other defines +# +AR = @AR@ +AS = @AS@ +CC = @CC@ +CFLAGS = @CFLAGS@ +CP = @CP@ +DARWIN_INFOFILE=@DARWIN_INFOFILE@ +DBG = @DBG@ +DEST = @DEST@ +FSINCLUDES = @FSINCLUDES@ +LD = @LD@ +LEX = @LEX@ +LIB_AFSDB = @LIB_AFSDB@ +LIBS = @LIBS@ +LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@ +LINUX_VERSION = @LINUX_VERSION@ +LINUX_VERS = @LINUX_VERSION@ +LWP_OPTMZ = @LWP_OPTMZ@ +MKAFS_OSTYPE = @MKAFS_OSTYPE@ +MT_CC = @MT_CC@ +MT_CFLAGS = @MT_CFLAGS@ +MT_LIBS = @MT_LIBS@ +MV = @MV@ +OPTMZ = @OPTMZ@ +PAM_CFLAGS = @PAM_CFLAGS@ +PAM_LIBS = @PAM_LIBS@ +RANLIB = @RANLIB@ +REGEX_OBJ = @REGEX_OBJ@ +RM = @RM@ +SHLIB_CFLAGS = @SHLIB_CFLAGS@ +SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ +SHLIB_SUFFIX = @SHLIB_SUFFIX@ +SYS_NAME = @AFS_SYSNAME@ +TOP_INCDIR = @TOP_INCDIR@ +TOP_LIBDIR = @TOP_LIBDIR@ +TOP_OBJDIR = @TOP_OBJDIR@ +TOP_SRCDIR = @TOP_SRCDIR@ +TXLIBS = @TXLIBS@ +VPATH = ${srcdir} +XCFLAGS = @XCFLAGS@ +XLDFLAGS64 = @XLDFLAGS64@ +XLDFLAGS = @XLDFLAGS@ +XLIBELFA = @XLIBELFA@ +XLIBKVM = @XLIBKVM@ +XLIBS = @XLIBS@ +YACC = @YACC@ + + +# +# Special build targets +# +dest_FS_CONV_OSF40D = @dest_FS_CONV_OSF40D@ +install_FS_CONV_OSF40D = @install_FS_CONV_OSF40D@ +FS_CONV_OSF40D = @FS_CONV_OSF40D@ + +dest_FS_CONV_SOL26 = @dest_FS_CONV_SOL26@ +install_FS_CONV_SOL26 = @install_FS_CONV_SOL26@ +FS_CONV_SOL26 = @FS_CONV_SOL26@ + +dest_XFS_SIZE_CHECK = @dest_XFS_SIZE_CHECK@ +install_XFS_SIZE_CHECK = @install_XFS_SIZE_CHECK@ +XFS_SIZE_CHECK = @XFS_SIZE_CHECK@ + +# +# Paths to build dirs +# +# Could be absolute, but leaving as relative for now +#UKERNELDIR = ${TOP_OBJDIR}/src/libuafs +#KERNELDIR = ${TOP_OBJDIR}/src/libafs +UKERNELDIR = ../libuafs +KERNELDIR = ../libafs + +# +# Build helper apps +# +COMPILE_ET = ${TOP_OBJDIR}/src/comerr/compile_et +INSTALL = ${TOP_OBJDIR}/src/pinstall/pinstall +INSTALLex = ${INSTALL} -m 755 +RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen +SHELL = /bin/sh diff --git a/src/config/Makefile.hp_ux102.in b/src/config/Makefile.hp_ux102.in deleted file mode 100644 index cff9fa450a..0000000000 --- a/src/config/Makefile.hp_ux102.in +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -AFS_OSTYPE = HPUX -CC=/opt/ansic/bin/cc -Ae -MT_CC=/opt/ansic/bin/cc -Ae -XCFLAGS0=-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE -XCFLAGS=${XCFLAGS0} +DA1.0 -XCFLAGS64=${XCFLAGS0} +DA2.0W -VFSCK_CFLAGS=-D_FILE64 -MT_CFLAGS=-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS} -XLIBS=@LIB_AFSDB@ -XLIBELFA= -TXLIBS=/usr/lib/libHcurses.a -MTLIBS=-L/opt/dce/lib -ldce -SHLIB_SUFFIX=sl -LWP_OPTMZ=-O -OPTMZ=-O -DBG=-g -RANLIB=ranlib -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -RM=/bin/rm -CP=/bin/cp -AR=/bin/ar -AS=/usr/ccs/bin/as -MV=/bin/mv -LD=/bin/ld -LEX=/opt/langtools/bin/lex -DBM=/lib/libndbm.a -PAM_CFLAGS=+DA1.0 +z -Wl,+k -SHARE_LDFLAGS=-b -Bsymbolic -PAMLIBS=/usr/lib/libpam.1 -YACC=/opt/langtools/bin/yacc diff --git a/src/config/Makefile.hp_ux110.in b/src/config/Makefile.hp_ux110.in deleted file mode 100644 index ca410c0083..0000000000 --- a/src/config/Makefile.hp_ux110.in +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -AFS_OSTYPE = HPUX -CC=/opt/ansic/bin/cc -MT_CC=/opt/ansic/bin/cc -XCFLAGS0=-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE -XCFLAGS=${XCFLAGS0} +DA1.0 -XCFLAGS64=${XCFLAGS0} +DA2.0W -VFSCK_CFLAGS=-I/usr/old/usr/include -D_FILE64 -MT_CFLAGS=-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS} -XLIBS=@LIB_AFSDB@ -lnsl -XLIBELFA=-lelf -TXLIBS=/usr/lib/libHcurses.a -MTLIBS=-lpthread -SHLIB_SUFFIX=sl -LWP_OPTMZ=-O -OPTMZ=-O -DBG=-g -RANLIB=/usr/bin/ranlib -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -RM=/bin/rm -CP=/bin/cp -AR=/bin/ar -AS=/usr/ccs/bin/as -MV=/bin/mv -LD=/bin/ld -LEX=/opt/langtools/bin/lex -DBM=/lib/libndbm.a -PAM_CFLAGS=+DA1.0 +z -Wl,+k -SHARE_LDFLAGS=-b -Bsymbolic -PAMLIBS=/usr/lib/libpam.1 -YACC=/opt/langtools/bin/yacc diff --git a/src/config/Makefile.i386_djgpp b/src/config/Makefile.i386_djgpp index ddbacc3083..c89cd0c7dd 100644 --- a/src/config/Makefile.i386_djgpp +++ b/src/config/Makefile.i386_djgpp @@ -7,8 +7,8 @@ # Keep macros within each section in sorted order for clean diff displays. # -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = DJGPP +# MKAFS_OSTYPE used to indicate suffixes and os specific subdirectories. +MKAFS_OSTYPE = DJGPP # compilation and link editor flags #DBG=-g @@ -18,12 +18,12 @@ OPTMZ=-O2 XCFLAGS= ${DBG} -Dfds_bits=fd_bits -DAFS_AFSDB_ENV -DAFS_FREELANCE_CLIENT MT_CFLAGS=${XCFLAGS} XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x +SHLIB_LDFLAGS = -shared -Xlinker -x SHLIB_SUFFIX=so SHLIB_CFLAGS= # # libraries -MTLIBS= +MT_LIBS= TXLIBS= XLIBS= # diff --git a/src/config/Makefile.i386_fbsd_42.in b/src/config/Makefile.i386_fbsd_42.in deleted file mode 100644 index 7cb933bbd2..0000000000 --- a/src/config/Makefile.i386_fbsd_42.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = FBSD -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -# LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -# LINUX_VERS = 2.2.5-15 2.2.10 2.2.12 2.2.12-20 2.2.13 2.2.14 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -pipe -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -pipe -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-pthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -lcompat - -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in deleted file mode 100644 index 6f8bd5effa..0000000000 --- a/src/config/Makefile.i386_linux22.in +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = @LINUX_VERSION@ - -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS= @LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in deleted file mode 100644 index b9f4678bec..0000000000 --- a/src/config/Makefile.i386_linux24.in +++ /dev/null @@ -1,43 +0,0 @@ -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = @LINUX_VERSION@ - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS= @LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.i386_obsd29.in b/src/config/Makefile.i386_obsd29.in deleted file mode 100644 index 06010ff04b..0000000000 --- a/src/config/Makefile.i386_obsd29.in +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = OBSD - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -pipe -fpic -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -fpic -# -# libraries -MTLIBS=-pthread -TXLIBS= /usr/lib/libcurses.a -XLIBS=@LIB_AFSDB@ -lcompat - -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -# -# Other OS specific requirements -# -YACC =yacc -LEX =flex -l diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 9f2ec33834..b0a2306306 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -5,32 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -KERNELDIR=../libafs -UKERNELDIR=../libuafs -SHELL=/bin/sh - -include Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-g -I${TOP_INCDIR} ${XCFLAGS} @@ -107,9 +83,6 @@ ${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DEST}/include ${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: ${srcdir}/stds.h $(INST) -${UKERNELDIR}/config/Makefile.${SYS_NAME} ${KERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME} - $(INST) - ${UKERNELDIR}/afs/icl.h ${KERNELDIR}/afs/icl.h ${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: ${srcdir}/icl.h $(INST) @@ -143,7 +116,6 @@ kinstall: \ ${KERNELDIR}/afs/param.h \ ${KERNELDIR}/afs/stds.h \ ${KERNELDIR}/afs/afs_sysnames.h \ - ${KERNELDIR}/config/Makefile.${SYS_NAME} \ ${KERNELDIR}/afs/afs_args.h \ ${KERNELDIR}/afs/icl.h \ ${KERNELDIR}/afs/AFS_component_version_number.c @@ -153,7 +125,6 @@ ukinstall: \ ${UKERNELDIR}/afs/param.h \ ${UKERNELDIR}/afs/stds.h \ ${UKERNELDIR}/afs/afs_sysnames.h \ - ${UKERNELDIR}/config/Makefile.${SYS_NAME} \ ${UKERNELDIR}/afs/afs_args.h \ ${UKERNELDIR}/afs/icl.h \ ${UKERNELDIR}/afs/venus.h \ diff --git a/src/config/Makefile.parisc_linux24.in b/src/config/Makefile.parisc_linux24.in deleted file mode 100644 index b9f4678bec..0000000000 --- a/src/config/Makefile.parisc_linux24.in +++ /dev/null @@ -1,43 +0,0 @@ -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = @LINUX_VERSION@ - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS= @LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.ppc_darwin_12.in b/src/config/Makefile.ppc_darwin_12.in deleted file mode 100644 index 276945a798..0000000000 --- a/src/config/Makefile.ppc_darwin_12.in +++ /dev/null @@ -1,43 +0,0 @@ -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = DARWIN -# -# -# compilation and link editor flags -XCFLAGS=-traditional-cpp -#MT_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV ${XCFLAGS} -#MT_CC=cc -KROOT= -KINCLUDES=-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers -#SHARE_LDFLAGS = -LWP_OPTMZ=-g -OPTMZ=-g -DBG=-g -REGEX_OBJ=regex.o - - -# -# libraries -XLIBS=@LIB_AFSDB@ -TXLIBS= -#MTLIBS= -#XLIBELFA= -#XLIBKVM= -# -SHLIB_SUFFIX= -SHLIB_CFLAGS= -# -# programs -AR=ar -AS=as -CC=cc -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LEX=lex -l -LD= ld -LORDER = lorder -MV=mv -RANLIB=ranlib -RM=rm -STRIP= strip diff --git a/src/config/Makefile.ppc_darwin_13.in b/src/config/Makefile.ppc_darwin_13.in deleted file mode 100644 index 1501410184..0000000000 --- a/src/config/Makefile.ppc_darwin_13.in +++ /dev/null @@ -1,43 +0,0 @@ -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = DARWIN -# -# -# compilation and link editor flags -XCFLAGS=-no-precomp -#MT_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV ${XCFLAGS} -#MT_CC=cc -KROOT= -KINCLUDES=-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers -#SHARE_LDFLAGS = -LWP_OPTMZ=-O2 -OPTMZ=-O2 -DBG=-g -REGEX_OBJ=regex.o - - -# -# libraries -XLIBS=@LIB_AFSDB@ -TXLIBS= -#MTLIBS= -#XLIBELFA= -#XLIBKVM= -# -SHLIB_SUFFIX= -SHLIB_CFLAGS= -# -# programs -AR=ar -AS=as -CC=cc -CP=cp -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -LEX=lex -l -LD= ld -LORDER = lorder -MV=mv -RANLIB=ranlib -RM=rm -STRIP= strip diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in deleted file mode 100644 index 1555905166..0000000000 --- a/src/config/Makefile.ppc_linux22.in +++ /dev/null @@ -1,44 +0,0 @@ -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = $(KSRC) -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = $(KVERS) - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=install -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in deleted file mode 100644 index 89d8905545..0000000000 --- a/src/config/Makefile.ppc_linux24.in +++ /dev/null @@ -1,44 +0,0 @@ -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.4.0-test9 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm - -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in deleted file mode 100644 index fc84085ebb..0000000000 --- a/src/config/Makefile.rs_aix42.in +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = AIX - -# compilation and link editor flags -OPTMZ=-O -LWP_OPTMZ=-O -DBG= -XCFLAGS=-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void -MT_CFLAGS=-DAFS_PTHREAD_ENV ${XCFLAGS} -SHLIB_SUFFIX=o -SHLIB_CFLAGS= -# -# libraries -TXLIBS=-lcurses -MTLIBS=-lpthreads -XLIBS=@LIB_AFSDB@ -ldl -# -# programs -MT_CC=xlc_r -AR=ar -AS=as -CP=cp -LD=ld -LEX=lex -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -LIBSYS_AIX_EXP=afsl.exp diff --git a/src/config/Makefile.s390_linux22.in b/src/config/Makefile.s390_linux22.in deleted file mode 100644 index a4c513cf05..0000000000 --- a/src/config/Makefile.s390_linux22.in +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.16 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O -#PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -PAM_CFLAGS= -O -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O -g -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=gcc -MT_CC=gcc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.s390_linux24.in b/src/config/Makefile.s390_linux24.in deleted file mode 100644 index f832967d26..0000000000 --- a/src/config/Makefile.s390_linux24.in +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.4.3 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O -#PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -PAM_CFLAGS= -O -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O -g -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=gcc -MT_CC=gcc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.sgi_62.in b/src/config/Makefile.sgi_62.in deleted file mode 100644 index dc31b3f833..0000000000 --- a/src/config/Makefile.sgi_62.in +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = IRIX - -# compilation and link editor flags -DBG=-g -FSINCLUDES=-I/usr/include/sys/fs -LWP_OPTMZ=-O -OPTMZ=-O -XCFLAGS=-o32 -# The -mips3 for XCFLAGS64 allows code to run on R4000 as well as R8000+. -XCFLAGS64 =-64 -mips3 -MT_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS} -XLDFLAGS=-o32 -XLDFLAGS64=-64 -# -# libraries -TXLIBS= -lcurses -XLIBS=@LIB_AFSDB@ -MTLIBS=-lpthread -SHLIB_SUFFIX=so -# -# programs -AR=ar -AS=as -CP=cp -MT_CC=cc -LD=ld -LEX=lex -MV=mv -RANLIB=/bin/true -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# This is for the vol package -XFS_SIZE_CHECK = xfs_size_check -install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check -dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_63.in b/src/config/Makefile.sgi_63.in deleted file mode 100644 index 0c01e1e5e6..0000000000 --- a/src/config/Makefile.sgi_63.in +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = IRIX - -# compilation and link editor flags -DBG=-g -FSINCLUDES=-I/usr/include/sys/fs -LWP_OPTMZ=-O -OPTMZ=-O -XCFLAGS=-D_OLD_TERMIOS -D_BSD_COMPAT -o32 -# The -mips3 for XCFLAGS64 allows code to run on R4000 as well as R8000+. -XCFLAGS64 =-D_BSD_COMPAT -64 -mips3 -MT_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS} -XLDFLAGS=-o32 -XLDFLAGS64=-64 -# -# libraries -TXLIBS= -lcurses -XLIBS=@LIB_AFSDB@ -MTLIBS=-lpthread -SHLIB_SUFFIX=so -# -# programs -AR=ar -AS=as -CP=cp -MT_CC=cc -LD=ld -LEX=lex -MV=mv -RANLIB=/bin/true -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall diff --git a/src/config/Makefile.sgi_64.in b/src/config/Makefile.sgi_64.in deleted file mode 100644 index 571a72dc08..0000000000 --- a/src/config/Makefile.sgi_64.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = IRIX - -# compilation and link editor flags -DBG=-g -FSINCLUDES=-I/usr/include/sys/fs -LWP_OPTMZ=-O -OPTMZ=-O -XCFLAGS=-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552 -# The -mips3 for XCFLAGS64 allows code to run on R4000 as well as R8000+. -XCFLAGS64 =-D_BSD_COMPAT -64 -mips3 -XLDFLAGS=-n32 -XLDFLAGS64=-64 -MT_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS} -# -# libraries -TXLIBS= -lcurses -XLIBS=@LIB_AFSDB@ -MTLIBS=-lpthread -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# programs -AR=ar -AS=as -CP=cp -MT_CC=cc -LD=ld -LEX=lex -MV=mv -RANLIB=/bin/true -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# This is for the vol package -XFS_SIZE_CHECK = xfs_size_check -install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check -dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_65.in b/src/config/Makefile.sgi_65.in deleted file mode 100644 index 7b3482a5a4..0000000000 --- a/src/config/Makefile.sgi_65.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = IRIX -# Pointers to destination and source directories - -# compilation and link editor flags -DBG=-g -FSINCLUDES=-I/usr/include/sys/fs -OPTMZ=-O -XCFLAGS=-n32 -mips3 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552 -# The -mips3 for XCFLAGS64 allows code to run on R4000 as well as R8000+. -XCFLAGS64 =-64 -mips3 -XLDFLAGS=-n32 -mips3 -XLDFLAGS64=-64 -mips3 -MT_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS} -# -# libraries -TXLIBS= -lcurses -XLIBS=@LIB_AFSDB@ -MTLIBS=-lpthread -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# programs -AR=ar -AS=as -CP=cp -MT_CC=/usr/bin/cc -LD=/usr/bin/ld -LEX=lex -MV=mv -RANLIB=/bin/true -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# This is for the vol package -XFS_SIZE_CHECK = xfs_size_check -install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check -dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sparc64_linux22.in b/src/config/Makefile.sparc64_linux22.in deleted file mode 100644 index c0fbc7bab3..0000000000 --- a/src/config/Makefile.sparc64_linux22.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.14 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in deleted file mode 100644 index c0fbc7bab3..0000000000 --- a/src/config/Makefile.sparc64_linux24.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.14 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.sparc_linux22.in b/src/config/Makefile.sparc_linux22.in deleted file mode 100644 index c0fbc7bab3..0000000000 --- a/src/config/Makefile.sparc_linux22.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1998 Transarc Corporation -# -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = /usr/src/linux- -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.14 - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS=@LIB_AFSDB@ -# -# programs -AR=ar -AS=as -CP=cp -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l diff --git a/src/config/Makefile.sun4x_55.in b/src/config/Makefile.sun4x_55.in deleted file mode 100644 index 15de03757a..0000000000 --- a/src/config/Makefile.sun4x_55.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS - -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in deleted file mode 100644 index 701aaf08b7..0000000000 --- a/src/config/Makefile.sun4x_56.in +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS -# -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -PAM_CFLAGS = -KPIC -PAMLIBS= -lc -lpam -lsocket -lnsl -lm -SHARE_LDFLAGS = -G -Bsymbolic -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-L/usr/ccs/lib -lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -# -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in deleted file mode 100644 index d1a63f78be..0000000000 --- a/src/config/Makefile.sun4x_57.in +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS -# -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -PAM_CFLAGS = -KPIC -PAMLIBS= -lc -lpam -lsocket -lnsl -lm -SHARE_LDFLAGS = -G -Bsymbolic -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g - -## Compilation flags for 64 bit Solaris -XCFLAGS64 = ${XCFLAGS} -xarch=v9 - -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -# -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in deleted file mode 100644 index 1640703637..0000000000 --- a/src/config/Makefile.sun4x_58.in +++ /dev/null @@ -1,48 +0,0 @@ -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS -# -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -PAM_CFLAGS = -KPIC -PAMLIBS= -lc -lpam -lsocket -lnsl -lm -SHARE_LDFLAGS = -G -Bsymbolic -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g - -## Compilation flags for 64 bit Solaris -XCFLAGS64 = ${XCFLAGS} -xarch=v9 - -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -# -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_59.in b/src/config/Makefile.sun4x_59.in deleted file mode 100644 index 1640703637..0000000000 --- a/src/config/Makefile.sun4x_59.in +++ /dev/null @@ -1,48 +0,0 @@ -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS -# -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -PAM_CFLAGS = -KPIC -PAMLIBS= -lc -lpam -lsocket -lnsl -lm -SHARE_LDFLAGS = -G -Bsymbolic -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g - -## Compilation flags for 64 bit Solaris -XCFLAGS64 = ${XCFLAGS} -xarch=v9 - -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -# -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sunx86_54.in b/src/config/Makefile.sunx86_54.in deleted file mode 100644 index c88923049c..0000000000 --- a/src/config/Makefile.sunx86_54.in +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# Keep macros within each section in sorted order for clean diff displays. -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = NCR - -# compilation and link editor flags -# -# libraries - -XLIBS=@LIB_AFSDB@ -# -# programs -AR = /usr/ccs/bin/ar -LD = /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall diff --git a/src/config/Makefile.sunx86_58.in b/src/config/Makefile.sunx86_58.in deleted file mode 100644 index 945a14282e..0000000000 --- a/src/config/Makefile.sunx86_58.in +++ /dev/null @@ -1,52 +0,0 @@ -# Keep macros within each section in sorted order for clean diff displays. -# -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = SOLARIS -# -# compilation and link editor flags -XCFLAGS=-dy -Bdynamic -MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS} -PAM_CFLAGS = -KPIC -PAMLIBS= -lc -lpam -lsocket -lnsl -lm -SHARE_LDFLAGS = -G -Bsymbolic -LWP_OPTMZ=-g -OPTMZ=-O -DBG=-g - -## Compilation flags for 64 bit Solaris -XCFLAGS64 = ${XCFLAGS} -xarch=v9 - -# -# libraries -XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl -TXLIBS=-lcurses -MTLIBS=-lpthread -lsocket -XLIBELFA=-lelf -XLIBKVM=-lkvm -# -SHLIB_SUFFIX=so -SHLIB_CFLAGS=-KPIC -# -# programs -AR=/usr/ccs/bin/ar -AS=as -CC=/opt/SUNWspro/bin/cc -MT_CC=/opt/SUNWspro/bin/cc -CP=/bin/cp -LEX=lex -LD= /usr/ccs/bin/ld -LORDER = /usr/ccs/bin/lorder -MV=mv -RANLIB=/bin/true -RM=rm -STRIP= /usr/ccs/bin/strip -INSTALL=${TOP_SRCDIR}/pinstall/pinstall -# -# this is for the vol package -FS_CONV_SOL26 = fs_conv_sol26 -install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 -dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 -# -# This is the XBSA make flag and pathname to XBSA header files (xbsa.h) -XBSA_FLAGS=-Dxbsa -XBSADIR=/opt/tivoli/tsm/client/api/bin/xopen diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index c765b07574..41985e8dd6 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -OPTMZ= -g +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} diff --git a/src/des/Makefile.in b/src/des/Makefile.in index 139acfd5d2..073e8a212a 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -22,32 +22,8 @@ # target machine for run-time code (may cross-compile), # override as needed -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs/ +include @TOP_OBJDIR@/src/config/Makefile.config LDFLAGS = ${XLDFLAGS} diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in index 303d576074..9fa38efea1 100644 --- a/src/des/test/Makefile.in +++ b/src/des/test/Makefile.in @@ -1,12 +1,5 @@ - -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} - +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config # Test programs PROGS = \ diff --git a/src/des_stub/Makefile.in b/src/des_stub/Makefile.in index 067e70b128..c9e8232c72 100644 --- a/src/des_stub/Makefile.in +++ b/src/des_stub/Makefile.in @@ -5,13 +5,8 @@ # 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} +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config # # Makefile is a no op, we don't do des stubs any more diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index 51a484258c..4e0fafa610 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -5,34 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs -UKERNELDIR = ../libuafs +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index 5fb3498fd3..050ecd6e19 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -5,17 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -INSTALL = ${SRCDIR}/bin/install +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS= -I${DESTDIR}/include ${XINCLS} LIBS = ${SRCDIR}/lib/afs/libdir.a ${SRCDIR}/lib/afs/util.a diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 9e720e2c02..3ba6a3adde 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -5,37 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# $Locker$ -# -# Makefile for EXPORT kernel extension, and friends -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ DEFS = INCS = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} CFLAGS = ${OPTMZ} ${DEFS} ${INCS} diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index cd96265cbf..d2b0217999 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 6418b35e2c..e1ebeb64ad 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -include ../config/Makefile.${SYS_NAME} - -SHELL = /bin/sh -KERNELDIR = ../libafs -UKERNELDIR = ../libuafs +include @TOP_OBJDIR@/src/config/Makefile.config OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index d6fe57e52c..3eafb098cb 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -5,34 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# Makefile for fsprobe and its test program, all part of the AFS -# navigation and monitoring tool (gator). -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-g -I. \ -I${TOP_OBJDIR}/src/config \ diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index e13a581438..10ce44f5de 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -14,33 +14,12 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#)Makefile 5.8 (Berkeley) 9/22/88 -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config include ../config/Makefile.version -include ../config/Makefile.${SYS_NAME} AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index a04419237b..db94fe6258 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -7,30 +7,8 @@ # Makefile for gtx, a display-independent, object-oriented window toolkit. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \ -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in index ff69ac9c12..774889c517 100644 --- a/src/inetd/Makefile.in +++ b/src/inetd/Makefile.in @@ -1,27 +1,5 @@ - -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config INCLUDES = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} DEFINES = ${INCLUDES} diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 5aeff8b4ec..bff1d295e6 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR = ../libuafs -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} @@ -93,7 +68,6 @@ all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \ ${UKERNELDIR}/afs/authclient.c \ ${UKERNELDIR}/afs/user.c \ ${UKERNELDIR}/afs/kautils.h \ - ${UKERNELDIR}/afs/kaserver.h \ ${UKERNELDIR}/afs/kaaux.c \ ${UKERNELDIR}/afs/token.c \ ${UKERNELDIR}/afs/kalocalcell.c \ @@ -276,9 +250,6 @@ ${UKERNELDIR}/afs/user.c: user.c ${UKERNELDIR}/afs/kautils.h: kautils.h ${INSTALL} $? $@ -${UKERNELDIR}/afs/kaserver.h: kaserver.h - ${INSTALL} $? $@ - ${UKERNELDIR}/afs/kaaux.c: kaaux.c ${INSTALL} $? $@ diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 016a3eefe9..3cb6ac037f 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -5,12 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -OPTIMIZE=-O +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS= -I${DESTDIR}/include -I.. LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 5176725200..f0458d0928 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -5,38 +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 -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS = ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs ${LIBS} ${XCFLAGS} -KERNELDIR = ../libafs -UKERNELDIR = ../libuafs - # # Main targets # diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index d7aaa66c46..1c08fb308c 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -5,29 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -OPTIMIZE=-O +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS=-I${TOP_INCDIR} -I.. LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in index e001679202..022e72ca83 100644 --- a/src/libadmin/Makefile.in +++ b/src/libadmin/Makefile.in @@ -5,29 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} all: ${TOP_INCDIR}/afs/afs_Admin.h diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index e693dd75a3..0b1c4c205a 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -5,34 +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 -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et RXKAD = ../../rxkad AUTH = ../../auth BOZO = ../../bozo diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index 435447d008..91e79a22b7 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index 5bfcd1f227..59ca01b776 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? diff --git a/src/libadmin/cfg/test/Makefile.in b/src/libadmin/cfg/test/Makefile.in index a4a04a9d15..dd99d1c56b 100644 --- a/src/libadmin/cfg/test/Makefile.in +++ b/src/libadmin/cfg/test/Makefile.in @@ -5,12 +5,8 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}/include ${MT_CFLAGS} diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index 2d5194622a..42cd5d69a0 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index 71f592bd8d..3936de4c8d 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \ diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index aa06f8690f..0d08af27a1 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 5f96bfc479..af041bbdf9 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -5,27 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} @@ -66,67 +49,67 @@ SAMPLELIBS =\ ${TOP_LIBDIR}/libafsrpc.a cm_client_config: cm_client_config.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_list_cells: cm_list_cells.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_local_cell: cm_local_cell.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_version: rxdebug_version.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) ####################################################################### all test tests: $(SAMPLEPROGS) diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index 225fdba17f..9307669ac9 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -5,27 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} @@ -55,7 +37,7 @@ AFSCPOBJS =\ afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS) $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \ - -L${TOP_LIBDIR} $(AFSCPLIBS) ${MTLIBS} $(XLIBS) + -L${TOP_LIBDIR} $(AFSCPLIBS) ${MT_LIBS} $(XLIBS) ####################################################################### all test tests: afscp diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index f13855059d..e81eeb954d 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${MT_CFLAGS} diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index 8b765c6e4e..6c892dabce 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for AIX systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index e2bc64eab8..e31d145ff4 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -3,29 +3,8 @@ # # MakefileProto for Digital Unix systems # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ -DARWIN_INFOFILE=../@DARWIN_INFOFILE@ - -include config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config # OS specific object files: diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index df61e30eeb..2cf8b5a20b 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Digital Unix systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ - -include config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config # OS specific object files: diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index 36b80a6c15..1d35739140 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -1,29 +1,8 @@ #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ # -# MakefileProto for FreeBSD systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -# include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 5192f67204..348db3c42e 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for HP systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 1a2d8594de..9cb5612da7 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for IRIX systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index e853746790..be1c6ab5a3 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Linux i386 systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ @@ -109,7 +88,6 @@ DESTDIRS=linux_destdirs include Makefile.common -LINUX_VERS=@LINUX_VERSION@ LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ LINUX_MODULE_NAME= LOCAL_SMP_DEF= @@ -118,7 +96,7 @@ setup: -$(RM) -f h net netinet sys rpc -ln -fs rx rpc for m in ${MPS} ; do \ - KDIR=$(KOBJ)-${LINUX_VERS}${LINUX_MODULE_NAME}-$$m; \ + KDIR=$(KOBJ)-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m; \ mkdir -p $${KDIR}; \ ln -fs ../Makefile $${KDIR}/Makefile ; \ ln -fs ../Makefile.common $${KDIR}/Makefile.common; \ @@ -157,7 +135,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: ln -fs ${LINUX_KERNEL_PATH}/include/asm-ia64 asm for m in ${MPS} ; do \ - KDIR=${KOBJ}-${LINUX_VERS}${LINUX_MODULE_NAME}-$$m ; \ + KDIR=${KOBJ}-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m ; \ echo Building in directory: $${KDIR} ; \ if [ "$$m" = "MP" ] ; then \ SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \ @@ -170,7 +148,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: TARG=libafs ; \ fi ; \ cd $${KDIR} ; \ - $(MAKE) SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \ + $(MAKE) SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} || exit $$?; \ cd ../ ; \ done diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in index d5ba90dddb..063b93fefa 100644 --- a/src/libafs/MakefileProto.OBSD.in +++ b/src/libafs/MakefileProto.OBSD.in @@ -1,29 +1,8 @@ #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ # -# MakefileProto for OpenBSD systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index e67312d717..497b22cb18 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Solaris systems -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afskerneldir=@afskerneldir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include config/Makefile.${SYS_NAME} # OS specific object files: AFS_OS_OBJS = \ diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index f0d084070a..5558d68d2c 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -7,31 +7,9 @@ # This is a pthread safe library containing ubikclient, auth, kauth. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CC=${MT_CC} CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \ diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index ddc84fa754..da0d3ab797 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -7,31 +7,9 @@ # This is a pthread safe library containing rx, rxkad and des. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CC=${MT_CC} INCLUDES=-I. -I${srcdir} -I${TOP_INCDIR} -I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \ diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index 9b4cd603e4..3596b2ebbf 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for AIX systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags DEFINES= -DKERNEL -DUKERNEL diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index 78f6be2d98..f267c9931d 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -5,30 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Solaris systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags CC = cc diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index df1625e2a1..07b9ef9201 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -5,32 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Solaris systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -DBUG=-O -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index f16d116e96..5551bafc8a 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -1,28 +1,8 @@ #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ # -# MakefileProto for Solaris systems -# -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags CC = gcc diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 1fa074c38e..1d31fdc297 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for HP-UX systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags CC = /opt/ansic/bin/cc diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index c2b9a2f31b..32745ca299 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Solaris systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags CC = cc diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 59e08ff009..0c9e80ad9d 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Linux systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags CC = gcc diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index 0b07425c47..7ac522a9ae 100644 --- a/src/libuafs/MakefileProto.SOLARIS.in +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# MakefileProto for Solaris systems -# - -DEST=@DEST@ -TOP_SRCDIR=@TOP_SRCDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} # System specific build commands and flags DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL diff --git a/src/log/Makefile.in b/src/log/Makefile.in index e347062ff4..01cf342861 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -5,29 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index 4fc4e58496..b2c85d0edd 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -5,29 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -OPTIMIZE=-O INCDIRS=-I${TOP_INCDIR} -I.. -I${TOP_INCDIR}/afs LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. diff --git a/src/login/Makefile.in b/src/login/Makefile.in index a494da5c34..8b0eb8957a 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -17,31 +17,10 @@ # @(#)Makefile 5.1 (Berkeley) 10/18/88 # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} - AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index fabe40583c..6bb394d573 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} # this is important code, so let's optimize it. The optimizer aggravates any # subtle bugs that may have been introduced in process.s, be warned! diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in index 64ea31fae6..ac17da9a1f 100644 --- a/src/lwp/test/Makefile.in +++ b/src/lwp/test/Makefile.in @@ -5,20 +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 -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - - - -OPTIMIZE= -g +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config INCDIRS= -I.. -I${DESTDIR}/include LIBS= ../liblwp.a -include ../../config/Makefile.${SYS_NAME} - CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS} system noversion: test diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in index f82550a88e..9b95a23ba9 100644 --- a/src/mpp/Makefile.in +++ b/src/mpp/Makefile.in @@ -1,27 +1,8 @@ # # (C) Copyright 10/17/86 by Carnegie Mellon University # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS= ${OPTMZ} ${XCFLAGS} @@ -30,8 +11,6 @@ LIBS = ${XLIBS} PROGRAM=mpp MANUAL=mpp.1 - -include ../config/Makefile.${SYS_NAME} include ../config/Makefile.version all: ${PROGRAM} diff --git a/src/ntp/Makefile.in b/src/ntp/Makefile.in index 138d7220c4..1c790335e0 100644 --- a/src/ntp/Makefile.in +++ b/src/ntp/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} INCPATH=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} BINDIR=/usr/local/etc diff --git a/src/null/Makefile.in b/src/null/Makefile.in index 763cad6bab..78076dd6c8 100644 --- a/src/null/Makefile.in +++ b/src/null/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# Makefile for the null library. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS = -I. -I${srcdir} ${XCFLAGS} diff --git a/src/package/Makefile.in b/src/package/Makefile.in index d2bbbb2311..b16b34dadd 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -4,31 +4,9 @@ # # Makefile for package, the AFS workstation configuration tool. # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} INCLUDES=-I/usr/include -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} DBGFLAG = -UDEBUG diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index bd6e4cae27..6405be3a1d 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -SHELL=/bin/sh -KERNELDIR = ../libafs/ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} LIBSA = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a AFSLIBS = ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ @@ -38,11 +16,11 @@ AFSLIBS = ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a -LDFLAGS = ${SHARE_LDFLAGS} +LDFLAGS = ${SHLIB_LDFLAGS} LIBS = ${TOP_LIBDIR}/libkauth.a ${LIBSA} ${TOP_LIBDIR}/libauth.a \ - ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@ + ${AFSLIBS} ${PAM_LIBS} @LIB_AFSDB@ KLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${LIBSA} ${TOP_LIBDIR}/libauth.krb.a \ - ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@ + ${AFSLIBS} ${PAM_LIBS} @LIB_AFSDB@ SHOBJS = afs_auth.o afs_account.o afs_session.o afs_password.o \ afs_pam_msg.o afs_message.o afs_util.o AFS_component_version_number.o OBJS = $(SHOBJS) test_pam.o @@ -96,9 +74,9 @@ test_pam: test_pam.o set -x; \ case "$(SYS_NAME)" in \ hp_ux*) \ - $(CC) $(CFLAGS) -o $@ test_pam.o ${PAMLIBS};; \ + $(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \ sun*_5*) \ - $(CC) $(CFLAGS) -o $@ test_pam.o ${PAMLIBS};; \ + $(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \ *linux*) \ $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam -ldl;; \ *fbsd*) \ diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index 53ef925791..47734191fd 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# Make modified install -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} LIBS= ${XLIBS} CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I../config ${XCFLAGS} diff --git a/src/pinstall/test/Makefile.in b/src/pinstall/test/Makefile.in index b22a8b268a..deed0c6c28 100644 --- a/src/pinstall/test/Makefile.in +++ b/src/pinstall/test/Makefile.in @@ -5,27 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + all: diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index 03082fecbd..16e2f635da 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -5,29 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_OBJDIR=@TOP_OBJDIR@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} CFLAGS=$(DBUG) -I${TOP_INCDIR} -I../config ${XCFLAGS} diff --git a/src/procmgmt/test/Makefile.in b/src/procmgmt/test/Makefile.in index 5659cf1caf..3597164a85 100644 --- a/src/procmgmt/test/Makefile.in +++ b/src/procmgmt/test/Makefile.in @@ -5,12 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../../config/Makefile.${SYS_NAME} CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS} diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 67f43ac1fe..5df68fd2aa 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -4,33 +4,8 @@ # 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 -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs/ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} $(DBUG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in index 7546d8a692..d8334f2a34 100644 --- a/src/rcp/Makefile.in +++ b/src/rcp/Makefile.in @@ -14,32 +14,9 @@ # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # -# @(#)Makefile 5.1 (Berkeley) 9/20/88 -# -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh -include ../config/Makefile.${SYS_NAME} LIBC= /lib/libc.a SRCS= rcp.c diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in index 31450ef077..2c2e621040 100644 --- a/src/rlogind/Makefile.in +++ b/src/rlogind/Makefile.in @@ -16,31 +16,9 @@ # # @(#)Makefile 5.3 (Berkeley) 9/20/88 # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} LIBC= /lib/libc.a SRCS= rlogind.c ../rsh/rcmd.c ../rsh/herror.c ../inetd/ta-rauth.c diff --git a/src/rsh/Makefile.in b/src/rsh/Makefile.in index 8e6c4c55d3..2ae9d326a0 100644 --- a/src/rsh/Makefile.in +++ b/src/rsh/Makefile.in @@ -16,31 +16,9 @@ # # @(#)Makefile 5.1 (Berkeley) 9/20/88 # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} CFLAGS= ${DBUG} ${INCLUDES} ${XCFLAGS} diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index ae1b72d47b..ac907adf1f 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -5,35 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -MKAFS_OSTYPE=@MKAFS_OSTYPE@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs -UKERNELDIR = ../libuafs +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS} diff --git a/src/rx/bulk.example/Makefile.in b/src/rx/bulk.example/Makefile.in index 45a0573153..7c690d5e29 100644 --- a/src/rx/bulk.example/Makefile.in +++ b/src/rx/bulk.example/Makefile.in @@ -5,10 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config + SRCDIR=/usr/andy/ LIBRX=${SRCDIR}/lib/librx.a diff --git a/src/rx/bulktest/Makefile.in b/src/rx/bulktest/Makefile.in index 45a0573153..7c690d5e29 100644 --- a/src/rx/bulktest/Makefile.in +++ b/src/rx/bulktest/Makefile.in @@ -5,10 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config + SRCDIR=/usr/andy/ LIBRX=${SRCDIR}/lib/librx.a diff --git a/src/rx/multi.example/Makefile.in b/src/rx/multi.example/Makefile.in index bb7ac9c4ab..8dd14725b8 100644 --- a/src/rx/multi.example/Makefile.in +++ b/src/rx/multi.example/Makefile.in @@ -5,10 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config + SRCDIR=/usr/andy/ LIBRX=${SRCDIR}/lib/librx.a diff --git a/src/rx/simple.example/Makefile.in b/src/rx/simple.example/Makefile.in index 1fab2e59c3..191b70a7ee 100644 --- a/src/rx/simple.example/Makefile.in +++ b/src/rx/simple.example/Makefile.in @@ -5,10 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config + SRCDIR=/usr/andy/ LIBRX=${SRCDIR}/lib/librx.a diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 4647695870..98c31de9e0 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -5,31 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -MKAFS_OSTYPE=@MKAFS_OSTYPE@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../../config/Makefile.${SYS_NAME} -OPTIMIZE=-g INCDIRS= -I${TOP_INCDIR} -I.. -I. -I${srcdir} -I${srcdir}/.. -I${TOP_OBJDIR}/src/config LDIRS= -L.. -L${TOP_LIBDIR} diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index 9283469593..5b18251447 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -5,35 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -MKAFS_OSTYPE=@MKAFS_OSTYPE@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS} diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index fb179e6851..ef70a724b0 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -4,33 +4,8 @@ # Makefile for rpc protocol compiler # Copyright (C) 1987, Sun Microsystems, Inc. # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs/ +include @TOP_OBJDIR@/src/config/Makefile.config SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \ rpc_svcout.c rpc_clntout.c diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index d62b53be08..5999e47819 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -5,36 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# */ - -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index bb7d8bb9eb..ab3ce54f21 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -5,14 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../../config/Makefile.${SYS_NAME} - -OPTIMIZE=-g INCDIRS= -I${DESTDIR}/include -I.. diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index 97f1fda7b9..7825103cb7 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh -include ../config/Makefile.${SYS_NAME} - -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen +include @TOP_OBJDIR@/src/config/Makefile.config KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index eeb7a6d1dc..31179bba52 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -# Makefile for Scout, the AFS navigation and monitoring tool. -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-I. -I${srcdir} ${DBUG} \ -I${TOP_OBJDIR}/src/config \ diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 4983469277..88e95bfc6a 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -5,37 +5,16 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -SHELL=/bin/sh # # This must be built after inetd has built ta-rauth.o and after rsh # XXX want these to end up in /usr/afsws ... # Note that if afskauthlib.so gets installed on a client # machine then that will be used .. # -include ../config/Makefile.${SYS_NAME} -OPTIMIZE=-g CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTIMIZE} ${XLDFLAGS} LIBDIR=${TOP_LIBDIR}/ diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index 162b61c26a..465bcbbd26 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -5,36 +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 -# */ - -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh DEBUG = -#UNRESOLVED = -expect_unresolved \* UNRESOLVED = -include ../config/Makefile.${SYS_NAME} + LIBS1=${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a LIBS2=${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libaudit.a \ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 7acb0fedb7..9565e1896a 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -5,36 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# System calls. - -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -UKERNELDIR=../libuafs -KERNELDIR=../libafs +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} SFLAGS=-P -I${TOP_INCDIR} diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 53e1133352..585f85bee0 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -5,31 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL =/bin/sh -include ../config/Makefile.${SYS_NAME} BUTMOBJS =file_tm.o BUTMLIBS =libbutm.a @@ -97,7 +76,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \ all: butc butc: ${BUTCOBJS} ${BUTCLIBS} - ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MTLIBS} ${XLIBS} -o butc + ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} -o butc libvolser.a: vsprocs.o ${VOLSERLIBOBJ} -$(RM) -f $@ diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index 1c0a7904a7..9fff38a070 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} -OPTIMIZE=-g CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index 0ef038a05a..b87e684436 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -5,31 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh -include ../config/Makefile.${SYS_NAME} CC=${MT_CC} INCLUDES=-I${TOP_OBJDIR}/src/config -I. -I.. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs @@ -198,7 +177,7 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c ${COMPILE} fileserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MTLIBS} ${XLIBS} + ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${DEST}/root.server/usr/afs/bin/fileserver: fileserver ${INSTALL} -ns $? $@ diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 582287ee6b..66d511894c 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -5,32 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS} -UKERNELDIR=../libuafs/ LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ @@ -44,9 +22,6 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et - all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 47c524b593..2f67a1a512 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -5,30 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} +include @TOP_OBJDIR@/src/config/Makefile.config LIBS=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a \ @@ -41,8 +19,6 @@ LIBS=${TOP_LIBDIR}/libauth.a \ CFLAGS=-I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS} -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen - all: upserver upclient # diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in index 2c2b3195db..f9852fed88 100644 --- a/src/usd/Makefile.in +++ b/src/usd/Makefile.in @@ -5,30 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -SHELL = /bin/sh +include @TOP_OBJDIR@/src/config/Makefile.config + -include ../config/Makefile.${SYS_NAME} CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in index 68a7d21c4c..0e176921c5 100644 --- a/src/usd/test/Makefile.in +++ b/src/usd/test/Makefile.in @@ -5,17 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh -include ../../config/Makefile.${SYS_NAME} - -INSTALL=${SRCDIR}/bin/install -RXGEN=${SRCDIR}/bin/rxgen -COMPILE_ET = ${SRCDIR}/bin/compile_et INCDIRS= -I${DESTDIR}/include -I.. CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index b4db6d6f64..d8da98991c 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -5,33 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# uss Makefile - -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh -include ../config/Makefile.${SYS_NAME} all: uss diff --git a/src/util/Makefile.in b/src/util/Makefile.in index a3b8c15cd5..09a38f683a 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -5,40 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -sysconfdir=@sysconfdir@ -localstatedir=@localstatedir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -afsconfdir=@afsconfdir@ -viceetcdir=@viceetcdir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -afsdbdir=@afsdbdir@ -afslogsdir=@afslogsdir@ -afslocaldir=@afslocaldir@ -afsbackupdir=@afsbackupdir@ -afsbosconfigdir=@afsbosconfigdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in index d67e2e0c80..10fb7c8aab 100644 --- a/src/util/test/Makefile.in +++ b/src/util/test/Makefile.in @@ -5,12 +5,9 @@ # 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=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../../config/Makefile.${SYS_NAME} CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} -g diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 2a9d56bff5..be12e9b22e 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -5,36 +5,10 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh -LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ -LINUX_VERSION=@LINUX_VERSION@ - -include ../config/Makefile.${SYS_NAME} - -INSTALLex = ${INSTALL} -m 755 CCXPG2= /usr/xpg2bin/cc # Note - be careful with this line, ubik.h is very picky about getting the right lock.h diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index 672fe8d05b..d1c2c044c9 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -5,33 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../../config/Makefile.${SYS_NAME} - - - -OPTIMIZE=-O INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I.. LDIRS= -L${TOP_LIBDIR} -L.. diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index 32bdc74659..cfa43f3385 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -16,31 +16,10 @@ # # @(#)Makefile 5.12 (Berkeley) 6/26/89 # -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -include ../config/Makefile.${SYS_NAME} - CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ ${XCFLAGS} ${VFSCK_CFLAGS} diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 1f54f29c2a..3820cb02b2 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-DNINTERFACE -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs \ ${XCFLAGS} -DRXDEBUG diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index ac1b0069e1..28df10458e 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -5,33 +5,8 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ - -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} - -KERNELDIR=../libafs/ -UKERNELDIR=../libuafs/ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et +include @TOP_OBJDIR@/src/config/Makefile.config CFLAGS=-I. -I${srcdir} ${DBUG} -I.. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ @@ -56,8 +31,6 @@ LIBS=\ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/util.a - -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h UKSRCS=$(KSRCS) diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 012ddcbbd3..ef295094f6 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} INCDIRS=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} ${FSINCLUDES} LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index 99e046b216..15c55bd73b 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -5,31 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../../config/Makefile.${SYS_NAME} INCDIRS=-I. -I.. -I${TOP_INCDIR} ${FSINCLUDES} INSTALL = ${SRCDIR}/bin/install diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 8d59b7fea9..989f98b6a5 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -5,32 +5,9 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL=/bin/sh - -include ../config/Makefile.${SYS_NAME} - -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen CFLAGS=-I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} diff --git a/src/wsadmin.src/Makefile.in b/src/wsadmin.src/Makefile.in index 0b192d3e71..41fee7f117 100644 --- a/src/wsadmin.src/Makefile.in +++ b/src/wsadmin.src/Makefile.in @@ -7,10 +7,9 @@ # Licensed Materials - Property of Transarc # All Rights Reserved. # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config + CONFIG = \ staff.aix_22 \ diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index c62090d05a..7105845c11 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -8,31 +8,9 @@ # Makefile for the module providing the client side of the File Server # and Cache Manager extended statistics gathering. -DEST=@DEST@ -TOP_INCDIR=@TOP_INCDIR@ -TOP_LIBDIR=@TOP_LIBDIR@ -TOP_OBJDIR=@TOP_OBJDIR@ srcdir=@srcdir@ -VPATH=${srcdir} -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -libdir=@libdir@ -includedir=@includedir@ -mandir=@mandir@ -afssrvbindir=@afssrvbindir@ -afssrvsbindir=@afssrvsbindir@ -afssrvlibexecdir=@afssrvlibexecdir@ -COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et -RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen -TOP_SRCDIR=@TOP_SRCDIR@ -SYS_NAME=@AFS_SYSNAME@ +include @TOP_OBJDIR@/src/config/Makefile.config -SHELL = /bin/sh - -include ../config/Makefile.${SYS_NAME} CFLAGS=-I. -I${srcdir} ${DBUG} \ -I${TOP_OBJDIR}/src/config \