]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
initial-objdir-support-20011017
authorNathan Neulinger <nneul@umr.edu>
Thu, 18 Oct 2001 00:06:58 +0000 (00:06 +0000)
committerDerrick Brashear <shadow@dementia.org>
Thu, 18 Oct 2001 00:06:58 +0000 (00:06 +0000)
first cut at objdir support

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

index cdecbdf9f838e321686f8c66793ce22bc8f7c0df..e7ff46295052462d46194f76401888d25dcafeba 100644 (file)
@@ -10,6 +10,9 @@ 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@
@@ -173,9 +176,10 @@ export2: project fsint
 
 export: fsint
        @case ${SYS_NAME} in \
-       rs_aix*)        \
-           ${COMPILE_PART1} export ${COMPILE_PART2} ;; \
-         * ) echo skipping export for ${SYS_NAME} ;; \
+       rs_aix*) \
+               ${COMPILE_PART1} export ${COMPILE_PART2} ;; \
+       *) \
+               echo skipping export for ${SYS_NAME} ;; \
        esac
 
 afs: export
@@ -184,7 +188,7 @@ afs: export
 des: config
        ${COMPILE_PART1} des ${COMPILE_PART2} 
 
-sys: project des rx rxstat fsint
+sys: project afs des rx rxstat fsint
        ${COMPILE_PART1} sys ${COMPILE_PART2}
 
 rxkad: project des
@@ -236,12 +240,12 @@ vlserver: project vol audit
        ${COMPILE_PART1} vlserver ${COMPILE_PART2}
 
 viced: project vlserver audit
-       ${COMPILE_PART1} viced  ${COMPILE_PART2}
+       ${COMPILE_PART1} viced ${COMPILE_PART2}
 
 tviced: project viced vlserver libafsrpc libafsauthent
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
-               ${COMPILE_PART1} tviced  ${COMPILE_PART2} ;; \
+               ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT viced for ${SYS_NAME} ;; \
        esac
@@ -259,18 +263,18 @@ afsd: project sys kauth
 null: project
        ${COMPILE_PART1} null ${COMPILE_PART2}
 
-gtx: project null auth # kauth rxkad ?
+${TOP_LIBDIR}/libtermlib.a: 
+       $(RM) -f ${TOP_LIBDIR}/libtermlib.a
        case ${SYS_NAME} in \
-         rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \
-               $(RM) -f ${TOP_LIBDIR}/libtermlib.a; \
-               ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a; \
-               ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
-         *) \
-               $(RM) -f ${TOP_LIBDIR}/libtermlib.a; \
-               ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a; \
-               ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
+       rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \
+               ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a ;; \
+       *) \
+               ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \
        esac
 
+gtx: project null auth ${TOP_LIBDIR}/libtermlib.a
+       ${COMPILE_PART1} gtx ${COMPILE_PART2}
+
 fsprobe: project util fsint
        ${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
@@ -435,7 +439,7 @@ tests: rxtests ubiktests
 libafsrpc: rx rxkad des
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
-       ${COMPILE_PART1} libafsrpc  ${COMPILE_PART2} ;; \
+       ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
        esac
@@ -443,7 +447,7 @@ libafsrpc: rx rxkad des
 libafsauthent: ubik auth kauth libafsrpc
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
-       ${COMPILE_PART1} libafsauthent  ${COMPILE_PART2} ;; \
+       ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
        esac
@@ -654,10 +658,12 @@ distclean: clean
        src/libadmin/test/Makefile \
        src/libadmin/vos/Makefile \
        src/libafs/Makefile \
+       src/libafs/Makefile.common \
        src/libafs/MakefileProto.${MKAFS_OSTYPE} \
        src/libafsauthent/Makefile \
        src/libafsrpc/Makefile \
        src/libuafs/Makefile \
+       src/libuafs/Makefile.common \
        src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
        src/log/test/Makefile \
        src/log/Makefile \
index 505148178804c3ed81355d32798ff3985ce1a8fb..b68353ddbd7cdbceb16b7796a63ef469e359cb2b 100644 (file)
@@ -122,8 +122,8 @@ case $system in
                AC_MSG_RESULT(linux)
                if test "x$enable_kernel_module" = "xyes"; then
                 ifdef([OPENAFS_CONFIGURE_LIBAFS],
-                  [LINUX_BUILD_VNODE_FROM_INODE(config,afs)],
-                  [LINUX_BUILD_VNODE_FROM_INODE(src/config,src/afs/LINUX)]
+                  [LINUX_BUILD_VNODE_FROM_INODE(src/config,afs)],
+                  [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
                 )
                 LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
                 LINUX_INODE_SETATTR_RETURN_TYPE
@@ -471,6 +471,7 @@ AC_SUBST(LIB_AFSDB)
 AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)
 AC_SUBST(MKAFS_OSTYPE)
+AC_SUBST(TOP_OBJDIR)
 AC_SUBST(TOP_SRCDIR)
 AC_SUBST(TOP_INCDIR)
 AC_SUBST(TOP_LIBDIR)
index 6b94ae19edc64d04c4e902ed55efddf49e026811..1c14a87acac1f7859198c9dfbedb32e28cd5123f 100644 (file)
@@ -4,7 +4,8 @@ AC_CONFIG_HEADER(src/config/afsconfig.h)
 
 OPENAFS_CONFIGURE_COMMON
 
-TOP_SRCDIR="${SRCDIR_PARENT}/src"
+TOP_SRCDIR="${srcdir}/src"
+TOP_OBJDIR="${SRCDIR_PARENT}"
 TOP_INCDIR="${SRCDIR_PARENT}/include"
 TOP_LIBDIR="${SRCDIR_PARENT}/lib"
 if test "${DEST}x" = "x"; then
@@ -13,8 +14,8 @@ 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 src/config/Makefile.${AFS_SYSNAME}.in ; then
-  AC_MSG_ERROR(no source file src/config/Makefile.${AFS_SYSNAME}.in)
+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(             \
@@ -69,10 +70,12 @@ src/libadmin/pts/Makefile \
 src/libadmin/samples/Makefile \
 src/libadmin/test/Makefile \
 src/libadmin/vos/Makefile \
+src/libafs/Makefile.common \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
 ${DARWIN_PLIST} \
 src/libafsauthent/Makefile \
 src/libafsrpc/Makefile \
+src/libuafs/Makefile.common \
 src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
 src/log/test/Makefile \
 src/log/Makefile \
index 07e4239b0f94490cc2672f5c9ba5f35c1c43eccd..bf58fc66e92c3425634a4e7908a1e959786d6ff8 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,14 +22,14 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 include ../config/Makefile.${SYS_NAME}
 
@@ -38,12 +41,18 @@ all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${
 
 # NOTE: linux case uses --new as well to work around bug in some versions of
 # gencat.
-kinstall: ${KERNELDIR}/afs AFS_component_version_number.c
-       -chmod 666 ${KERNELDIR}afs/*
-       ${COMPILE_ET} -v 2 afs_trace.et
-       ${INSTALL} *.[csh] ${KERNELDIR}afs
-       ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs
-       ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs
+kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afszcm.cat
+       -chmod 666 ${KERNELDIR}/afs/*
+       ${INSTALL} ${srcdir}/*.[csh] ${KERNELDIR}/afs
+       -${INSTALL} *.[csh] ${KERNELDIR}/afs
+       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${KERNELDIR}/afs
+       ${INSTALL} ${srcdir}/${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
+       -${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
+
+afs_trace.h afs_trace.msf:
+       ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et
+
+afszcm.cat: afs_trace.msf
        -$(RM) -f afszcm.cat
        case ${SYS_NAME} in \
                sgi_* ) \
@@ -59,12 +68,12 @@ kinstall: ${KERNELDIR}/afs AFS_component_version_number.c
 ${KERNELDIR}/afs:
        mkdir -p $@
 
-ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c
-       -chmod 666 ${UKERNELDIR}afs/*
-       ${COMPILE_ET} -v 2 afs_trace.et
-       ${INSTALL} *.[csh] ${UKERNELDIR}afs
-       ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs
-       ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs
+ukinstall: ${UKERNELDIR}/afs afs_trace.msf AFS_component_version_number.c
+       -chmod 666 ${UKERNELDIR}/afs/*
+       ${INSTALL} *.[csh] ${UKERNELDIR}/afs
+       ${INSTALL} ${srcdir}/*.[csh] ${UKERNELDIR}/afs
+       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${UKERNELDIR}/afs
+       ${INSTALL} ${srcdir}/UKERNEL/*.[csh] ${UKERNELDIR}/afs
 
 ${UKERNELDIR}/afs:
        mkdir -p $@
index 67bf2fee0a65b349a89e0332ad7af87f380b9113..315200d958cfb927bdeb08604ae6e06bcb4bade2 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,7 +33,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 
 INSTALLex = ${INSTALL} -m 755
@@ -84,46 +87,46 @@ ${DESTDIR}${sbindir}/vsys: vsys
 dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys
        case ${SYS_NAME} in \
                rs_aix*)  \
-                       ${INSTALL} -f rc.afs.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.afs ; \
-                       ${INSTALL} -f rc.dkload.client.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \
-                       ${INSTALL} -f rc.dkload.server.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
+                       ${INSTALL} -f ${srcdir}/rc.afs.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.afs ; \
+                       ${INSTALL} -f ${srcdir}/rc.dkload.client.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \
+                       ${INSTALL} -f ${srcdir}/rc.dkload.server.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
                sgi_65 ) \
-                       ${INSTALL} -f afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
-                       ${INSTALL} -f afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\
                sgi_* ) \
-                       ${INSTALL} -f afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
-                       ${INSTALL} -f afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\
                        case ${SYS_NAME} in \
                                sgi_53 | sgi_61 ) \
-                               ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
+                               ${INSTALL} -f ${srcdir}/afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
                        esac;; \
                sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \
-                       ${INSTALL} -f afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                sun4x_57 ) \
-                       ${INSTALL} -f afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                sun4x_58 ) \
-                       ${INSTALL} -f afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                sun4x_59 ) \
-                       ${INSTALL} -f afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                 sun4x_5? ) \
-                        ${INSTALL} -f afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+                        ${INSTALL} -f ${srcdir}/afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                alpha_osf* ) \
-                       ${INSTALL} -f afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
                hp_ux10? | hp_ux11? ) \
-                       ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
-                       ${INSTALL} -f afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
+                       ${INSTALL} -f ${srcdir}/afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
                alpha_dux* ) \
-                       ${INSTALL} -f afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
                 hp?00_ux10? ) \
-                       ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+                       ${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
                *linux* ) \
-                       ${INSTALLex} -f afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \
-                       ${INSTALL} -f afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \
+                       ${INSTALLex} -f ${srcdir}/afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \
+                       ${INSTALL} -f ${srcdir}/afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \
                ppc_darwin*) \
-                       ${INSTALLex} -f afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \
-                       ${INSTALL} -f afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \
+                       ${INSTALLex} -f ${srcdir}/afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \
+                       ${INSTALL} -f ${srcdir}/afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \
                *fbsd*) \
-                       ${INSTALL} -f afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \
+                       ${INSTALL} -f ${srcdir}/afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \
                * )  \
                        echo No rc scripts installed for ${SYS_NAME} ;; \
        esac
index 213ed29ba8bcd2adcf06890b9dce32db3d9e8c3d..57dbd51fba717d701a324410f97c327d724df32a 100644 (file)
@@ -9,6 +9,9 @@
 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@
@@ -20,8 +23,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,7 +33,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
-       -I${TOP_SRCDIR}/config \
+       -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \
        ${XCFLAGS}
index 494806c94e0cb29cd5ae832f00ea84b54d8fe7d9..016a010712420e9a94cf2ca6b39229826f6c560e 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,7 +32,7 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
 UKSRCS=nsafs.h nsafs.c securehash.c
 
index aeebffc29b94a8aa5d25872541075899141b5d47..e5187f6cd50c049a19d9183290f50fe90af04752 100644 (file)
@@ -15,6 +15,9 @@
 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@
@@ -26,8 +29,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -37,7 +40,7 @@ include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR = ../libuafs/
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 all: ukinstall ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
 
@@ -64,7 +67,7 @@ libaudit.a: audit.o AFS_component_version_number.o
        $(RANLIB) libaudit.a
 
 audit.o: audit.c audit.h 
-       ${CC} ${CFLAGS} -c audit.c
+       ${CC} ${CFLAGS} -c ${srcdir}/audit.c
 
 clean:
        $(RM) -f *.a *.o core AFS_component_version_number.c
index 04d8ba6a883894ab77fdbcf05f1f6d7d6b2daa2e..8794744ef6ecf5ed0580ea601ae52eb511da16a9 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,13 +32,13 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+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 \
     acfg_errors.o ktc_errors.o
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \
       ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \
       ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \
@@ -57,7 +60,7 @@ copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o
 setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
 
 ktc.krb.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/ktc.c -o ktc.krb.o
 
 libauth.a: $(OBJS) AFS_component_version_number.o
        -$(RM) -f libauth.a
@@ -78,12 +81,14 @@ setkey: setkey.o
 acfg_errors.o: acfg_errors.c
 
 acfg_errors.c cellconfig.h: acfg_errors.et cellconfig.p.h
-       $(RM) -f cellconfig.h acfg_errors.c; ${COMPILE_ET} acfg_errors -h cellconfig
+       $(RM) -f cellconfig.h acfg_errors.c
+       ${COMPILE_ET} -p ${srcdir} acfg_errors -h cellconfig
 
 ktc_errors.o: ktc_errors.c
 
 ktc_errors.c auth.h: ktc_errors.et auth.p.h
-       $(RM) -f auth.h ktc_errors.c; ${COMPILE_ET} ktc_errors -h auth
+       $(RM) -f auth.h ktc_errors.c
+       ${COMPILE_ET} -p ${srcdir} ktc_errors -h auth
 
 #
 # Install targets
index cafaed0cce0ec5ce26c21f3c0ef7f5d9b565b667..8e56b70f1498e767a2d6ed47f2d9d4abbe18191b 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,8 +30,8 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+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
 
 INCLS=bnode.h \
@@ -69,10 +72,11 @@ bosint.xdr.o: bosint.xdr.c ${RPCINCLS}
 bosint.cs.o: bosint.cs.c ${RPCINCLS}
 
 bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg
-       ${RXGEN} -x bosint.xg
+       ${RXGEN} -x ${srcdir}/bosint.xg
 
 bnode.h boserr.c: bnode.p.h boserr.et
-       $(RM) -f boserr.c bnode.h; $(COMPILE_ET) boserr -h bnode
+       $(RM) -f boserr.c bnode.h
+       ${COMPILE_ET} -p ${srcdir} boserr -h bnode
 
 bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o
 
index 4350da0e6a998251fcb6d157c83e439a23843c9b..1e83978417aea54b5a8763b34024c3e06796ccb6 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 6fcbc06b0e29bd838a6db2a7c40d994b16f36f6e..c66d657561074c8a4901e6a25c12713113b7c99b 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
+CFLAGS=-g -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
 
 all: fms
index 0420d732a8fadde2f9b592f7dcf81d47ee1e10b7..ad6ef9a46c18b225e03059c511716d54f2533011 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -26,10 +29,10 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
-CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/butm.h ${TOP_INCDIR}/afs/butx.h
 
@@ -41,22 +44,22 @@ libbubasics.a: $(OBJS) AFS_component_version_number.o
        ${RANLIB} libbubasics.a
 
 butc.xdr.c butc.ss.c butc.cs.c butc.h: butc.xg
-       ${RXGEN} butc.xg
+       ${RXGEN} ${srcdir}/butc.xg
 
 bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg
-       ${RXGEN} bumon.xg
+       ${RXGEN} ${srcdir}/bumon.xg
 
 butm_errs.c butm.h: butm_errs.et butm.p.h
        $(RM) -f butm.h butm_errs.c
-       ${COMPILE_ET} butm_errs -h butm
+       ${COMPILE_ET} -p ${srcdir} butm_errs -h butm
 
 butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
        $(RM) -f tcdata.h butc_errs.c
-       ${COMPILE_ET} butc_errs -h tcdata
+       ${COMPILE_ET} -p ${srcdir} butc_errs -h tcdata
 
 butx_errs.c butx.h: butx_errs.et
        $(RM) -f butx.h butx_errs.c
-       ${COMPILE_ET} butx_errs -h butx
+       ${COMPILE_ET} -p ${srcdir} butx_errs -h butx
 
 #
 # Installation targets
index 55e8c96e25e3af2262e286690dd9b0cd182675aa..ba9b99e594b2694e65b8d7fa1a9685114f63080c 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -26,10 +29,10 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
-CFLAGS=${DBUG} -w -I${TOP_SRCDIR}/config \
+CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
 
 LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \
@@ -80,7 +83,7 @@ backup:  $(BACKOBJS) ${LIBS}
 
 bucoord_errs.c bc.h:   bucoord_errs.et bc.p.h
        $(RM) -f bc.h bucoord_errs.c
-       ${COMPILE_ET} bucoord_errs -h bc
+       ${COMPILE_ET} -p ${srcdir} bucoord_errs -h bc
 
 #
 # Install targets
index 701dd619ff7ad51903931b5242b39b87f2d0fb73..68929b202c3244309325024334529e1bb39d0017 100644 (file)
@@ -9,6 +9,9 @@
 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@
@@ -27,10 +30,10 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 INCLS=\
        ${TOP_INCDIR}/lock.h \
@@ -73,10 +76,10 @@ all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_err
 budb_errs.o: budb_errs.c
 
 budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
-       $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client
+       $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client
 
 budb_errs.h: budb_errs.et
-       ${COMPILE_ET} budb_errs
+       ${COMPILE_ET} -p ${srcdir} budb_errs
 
 database.o: database.c budb_errs.h globals.h ${INCLS}
 db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
@@ -93,7 +96,7 @@ budb_server: $(SERVER_OBJS) ${LIBS}
        ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
 
 budb.xdr.c budb.cs.c budb.ss.c budb.h: budb.rg
-       ${RXGEN} budb.rg
+       ${RXGEN} ${srcdir}/budb.rg
 
 libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_number.o
        -$(RM) -f $@
index 536ed1912c22f4da0ffc16761fa70fa4ca20d9ce..5f255b037adba6726cb7f96c4d7342a245850b4f 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,7 +33,7 @@ include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
 
-INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \
+INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs \
        -I${TOP_INCDIR}/rx -I${TOP_INCDIR}
 
 INCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \
@@ -78,7 +81,7 @@ butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS}
        ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test
 
 tdump: tdump.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} tdump.c -o tdump
+       ${CC} ${CFLAGS} ${srcdir}/tdump.c -o tdump
 
 butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
        @case ${SYS_NAME} in \
@@ -98,7 +101,7 @@ dump.o: dump.c ${INCLS}
 tcstatus.o: tcstatus.c ${INCLS}
 
 read_tape: read_tape.c
-       ${CC} ${CFLAGS} -o read_tape read_tape.c \
+       ${CC} ${CFLAGS} -o read_tape ${srcdir}/read_tape.c \
                ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \
                ${TOP_LIBDIR}/libusd.a
 
index 81e322df5331635f520222175d3569986feb4a83..0bbfa604248e1f19b145b201514ff0f929081e71 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,14 +22,14 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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
 
-CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 
index 025b752670354a22d66a2131c2d755d4bf2e35db..fcb583c5924096a45eb425714c605b0ab95974d6 100644 (file)
@@ -162,9 +162,9 @@ install-data-local: install-cat-mans
 
 
 .et.h:
-       $(COMPILE_ET) $<
+       ${COMPILE_ET} $<
 .et.c:
-       $(COMPILE_ET) $<
+       ${COMPILE_ET} $<
 
 if KRB4
 LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
index 8e0753b1115a1bef93ba55375bb0c5dbd72e5b59..99536c1f9b62be1cabb98184f0f7b2a9d546faf2 100644 (file)
@@ -29,13 +29,14 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_address_space_has_page_lock)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-dnl LINUX_BUILD_VNODE_FROM_INODE (configdir, outputdir)
-dnl            defaults: (src/config, src/afs/LINUX)
+dnl LINUX_BUILD_VNODE_FROM_INODE (configdir, outputdir, tmpldir)
+dnl            defaults: (src/config, src/afs/LINUX, src/afs/linux)
 
 AC_DEFUN(LINUX_BUILD_VNODE_FROM_INODE, [
 AC_MSG_CHECKING(whether to build osi_vfs.h)
-configdir=ifelse([$1], ,src/config,$1)
-outputdir=ifelse([$2], ,src/afs/LINUX,$2)
+configdir=ifelse([$1], ,[src/config],$1)
+outputdir=ifelse([$2], ,[src/afs/LINUX],$2)
+tmpldir=ifelse([$3], ,[src/afs/LINUX],$3)
 chmod +x $configdir/make_vnode.pl
-$configdir/make_vnode.pl -i $LINUX_KERNEL_PATH -o $outputdir
+$configdir/make_vnode.pl -i $LINUX_KERNEL_PATH -t ${tmpldir} -o $outputdir
 ])
index f564e1ec9789716915477193abba29505a4af79b..be4660e99eb967035fec97d9db6648af0034b3d4 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,12 +30,12 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
 LIBOBJS=cmd_errors.o cmd.o 
 LIB64OBJS=cmd_errors64.o cmd64.o 
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h
 
@@ -40,17 +43,17 @@ all64: all ${TOP_LIBDIR}/libcmd64.a
 
 cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
        $(RM) -f cmd.h cmd_errors.c
-       ${COMPILE_ET} cmd_errors -h cmd
+       ${COMPILE_ET} -p ${srcdir} cmd_errors -h cmd
 
 cmd_errors.o: cmd_errors.c
 
 cmd.o: cmd.c cmd.h
 
 cmd_errors64.o: cmd_errors.c
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
+       ${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o ${srcdir}/cmd_errors.c
 
 cmd64.o: cmd.c cmd.h
-       ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o cmd.c
+       ${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o ${srcdir}/cmd.c
 
 
 libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
index a7974b0bb3377dfe6c9350f8c802372bd86c4982..c6ed9918284ea77c13a7334bbd08f50aa2e828d9 100644 (file)
@@ -7,6 +7,9 @@
 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@
@@ -18,8 +21,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,13 +32,13 @@ include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
 
-CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config -I. -I${srcdir} ${XCFLAGS}
 
 all: ukinstall compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a
 
 et_lex.lex.c: et_lex.lex.l
        $(RM) -f et_lex.lex.c
-       $(LEX) -t et_lex.lex.l > et_lex.lex.c
+       $(LEX) -t $? > et_lex.lex.c
 
 compile_et:    compile_et.o error_table.o
        case $(SYS_NAME) in \
index 9cbbf641c83b1adc57b90ceea89d88d4ee8ab467..8c42caf29052073aa24e12ffaa9032032f00c3f3 100644 (file)
@@ -113,9 +113,10 @@ static const char msf_warning[] =
 char c_file[MAXPATHLEN];       /* output file */
 char h_file[MAXPATHLEN];       /* output */
 char msf_file[MAXPATHLEN];
+char et_file[MAXPATHLEN];       /* full path to input file */
 
 static void usage () {
-    fprintf (stderr, "%s: usage: %s ERROR_TABLE [-debug] [-language LANG] [-h INCLUDE] [-v version]\n",
+    fprintf (stderr, "%s: usage: %s ERROR_TABLE [-debug] [-language LANG] [-h INCLUDE] [-p prefix] [-v version]\n",
             whoami, whoami);
     exit (1);
 }
@@ -133,6 +134,7 @@ int main (argc, argv) int argc; char **argv; {
     char const * const *cpp;
     int got_language = 0;
     char *got_include = 0;
+    char *got_prefix = ".";
     char lcname[6];
 
 #ifdef AFS_AIX32_ENV
@@ -199,6 +201,11 @@ int main (argc, argv) int argc; char **argv; {
                if (!arg) usage ();
                got_include = arg;
            }
+           else if (strcmp (arg, "p") == 0) {
+               arg = *++argv, argc--;
+               if (!arg) usage ();
+               got_prefix = arg;
+           }
            else if (strcmp (arg, "v") == 0) {
                arg = *++argv, argc--;
                version = atoi(arg);
@@ -261,9 +268,11 @@ int main (argc, argv) int argc; char **argv; {
         filename = p;
     }
 
-    yyin = fopen(filename, "r");
+    sprintf(et_file, "%s/%s", got_prefix, filename);
+
+    yyin = fopen(et_file, "r");
     if (!yyin) {
-       perror(filename);
+       perror(et_file);
        exit(1);
     }
 
@@ -284,7 +293,9 @@ int main (argc, argv) int argc; char **argv; {
        FILE *prolog_hfile;
        int   count, written;
 
-       strcpy (prolog_h_file, got_include);
+       strcpy (prolog_h_file, got_prefix);
+       strcat (prolog_h_file, "/");
+       strcat (prolog_h_file, got_include);
        strcat (prolog_h_file, ".p.h");
        prolog_hfile = fopen(prolog_h_file, "r");
        if (prolog_hfile) {
index 186d63a29440fdb35e6b0da50048c7229d2c5f68..8104f6e1c06172b49d433038fe35157da81667fa 100644 (file)
@@ -1,6 +1,9 @@
 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@
@@ -12,8 +15,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 9884a72e70005687df61db1c88fa55133ed6fc1a..0c22a66b8303ab400b50b47404dcf71bacdb092c 100644 (file)
@@ -21,7 +21,7 @@ OPTMZ=-O2
 DBG=-g3
 CSTATIC=-non_shared
 RANLIB=/bin/true
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 CP=cp
 
 #this is for the vol package
index 9c9546ec108fa45d2fde9d29938d374f3b42c99c..8bb47aaac8cde6f01127e2ba2f8cc3c02466aca2 100644 (file)
@@ -22,7 +22,7 @@ DBG=-g3
 CP=cp
 CSTATIC=-non_shared
 RANLIB=/bin/true
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 
 #this is for the vol package
 FS_CONV_OSF40D         = fs_conv_dux40D
index eb760eef33060b1552f99a3708b7ff720806d3ca..2bfab08ce8ed1dcc19cddb8a70d47aa8a561ba59 100644 (file)
@@ -32,7 +32,7 @@ XLIBS=@LIB_AFSDB@
 AR=ar
 AS=as
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LD=ld   
 MT_CC=cc
 MV=mv
index 83fba93d4d0b28f92a326312d786463d681c0942..df6073bfaa3fc828e62f08244498f4bd7a481278 100644 (file)
@@ -32,7 +32,7 @@ XLIBS=@LIB_AFSDB@
 AR=ar
 AS=as
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LD=ld   
 MT_CC=cc
 MV=mv
index b0b318d5593f474beea188a8173b49348e51c8e0..f136dabf10e13743b6d8ddaee5a0fcb18697303f 100644 (file)
@@ -21,7 +21,7 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=ranlib
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 RM=/bin/rm
 CP=/bin/cp
 AR=/bin/ar
index c07be9a6725cced4408903ffd992340d523e326e..65909197ade22e03e76d5b481914d3265712a893 100644 (file)
@@ -21,7 +21,7 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=/usr/bin/ranlib
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 RM=/bin/rm
 CP=/bin/cp
 AR=/bin/ar
index a8a0001c0be8ed2bdbc99f4424d8a6d1a949d34e..7cb933bbd281d9d9933e66e4aa73d4af50844cac 100644 (file)
@@ -34,7 +34,7 @@ XLIBS=@LIB_AFSDB@ -lcompat
 AR=ar
 AS=as
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LD=ld   
 MT_CC=cc
 MV=mv
index 5c14c95c2254c1524bb566e1e3529750bc4e1343..6f8bd5effabc6890077077bf259e52c2538e198a 100644 (file)
@@ -43,7 +43,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 9635c318eb5b6f7fe38c1a290d67002fe8ab7ba2..b9f4678bec51ee34622d9982fd827690ebaaa7e8 100644 (file)
@@ -35,7 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 1682fe4f5e80137fb177637ce0de23d8a14f0a82..06010ff04be4e391355b3006374e16c6b70be3b0 100644 (file)
@@ -26,7 +26,7 @@ XLIBS=@LIB_AFSDB@ -lcompat
 AR=ar
 AS=as
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LD=ld   
 MT_CC=cc
 MV=mv
index 1cf3b9e70217c4167546944fab38b76f6f20f402..9f2ec338345816bdc83d0e9f9f0abdbc82255e31 100644 (file)
@@ -8,6 +8,8 @@
 DEST=@DEST@
 TOP_INCDIR=@TOP_INCDIR@
 TOP_LIBDIR=@TOP_LIBDIR@
+srcdir=@srcdir@
+VPATH=${srcdir}
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
@@ -19,8 +21,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -43,10 +45,10 @@ all: config mkvers ukinstall kinstall \
        ${TOP_INCDIR}/afs/venus.h \
        ${TOP_INCDIR}/afs/debug.h
 
-Makefile.version: Makefile.version-CML Makefile.version-NOCML
+Makefile.version: ${srcdir}/Makefile.version-CML Makefile.version-NOCML
        $(RM) -f Makefile.version
        if      [ -r SRC/../CML/state ] ; \
-       then    $(CP) Makefile.version-CML Makefile.version ; \
+       then    $(CP) ${srcdir}/Makefile.version-CML Makefile.version ; \
        else    $(CP) Makefile.version-NOCML Makefile.version ; \
        fi
 
@@ -68,11 +70,14 @@ ${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c
 config: config.o mc.o
        $(CC) $(CFLAGS) -o config config.o mc.o
 
-mkvers: mkvers.c
-       $(CC) $(CFLAGS) -o mkvers mkvers.c
+mkvers: ${srcdir}/mkvers.c
+       $(CC) $(CFLAGS) -o mkvers ${srcdir}/mkvers.c
 
-mc.o: mc.c
-config.o: config.c AFS_component_version_number.c
+mc.o: ${srcdir}/mc.c
+       $(CC) $(CFLAGS) -c ${srcdir}/mc.c
+
+config.o: ${srcdir}/config.c AFS_component_version_number.c
+       $(CC) $(CFLAGS) -I. -c ${srcdir}/config.c
 
 #
 # Include installation targets
@@ -93,31 +98,31 @@ UKDIRS = ${UKERNELDIR}/afs \
 $(UKDIRS): 
        mkdir -p $@
 
-${KERNELDIR}/afs/param.h ${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: param.${SYS_NAME}.h
+${KERNELDIR}/afs/param.h ${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: ${srcdir}/param.${SYS_NAME}.h
        -$(INST)
 
-${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${TOP_INCDIR}/afs/afs_sysnames.h: afs_sysnames.h
+${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${TOP_INCDIR}/afs/afs_sysnames.h: ${srcdir}/afs_sysnames.h
        $(INST)
 
-${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: stds.h
+${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: icl.h 
+${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)
 
-${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: afs_args.h 
+${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: ${srcdir}/afs_args.h 
        $(INST)
 
-${UKERNELDIR}/afs/venus.h ${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: venus.h 
+${UKERNELDIR}/afs/venus.h ${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: ${srcdir}/venus.h 
        $(INST)
 
-${DEST}/include/afs/debug.h ${DESTDIR}${includedir}/afs/debug.h ${TOP_INCDIR}/afs/debug.h: debug.h 
+${DEST}/include/afs/debug.h ${DESTDIR}${includedir}/afs/debug.h ${TOP_INCDIR}/afs/debug.h: ${srcdir}/debug.h 
        $(INST)
 
-${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h
+${UKERNELDIR}/afs/param.h: ${srcdir}/param.${SYS_NAME}_usr.h
        $(INST)
 
 # these are needed to compile the kernel.  Config is necessary to
index 9635c318eb5b6f7fe38c1a290d67002fe8ab7ba2..b9f4678bec51ee34622d9982fd827690ebaaa7e8 100644 (file)
@@ -35,7 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index be76178b7271317fbe67e641b980da4e8b69af53..276945a798eadd48916d9e80685124a174581681 100644 (file)
@@ -33,7 +33,7 @@ AR=ar
 AS=as
 CC=cc
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LEX=lex -l
 LD= ld
 LORDER = lorder
index 2559ee45c1ed78713e5dba000f278b53c97ddeb3..150141018426ce2c4dc012bc821c6e8fee269b0f 100644 (file)
@@ -33,7 +33,7 @@ AR=ar
 AS=as
 CC=cc
 CP=cp
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 LEX=lex -l
 LD= ld
 LORDER = lorder
index 423ee5ce220bf341ec66965b911a5aadfb7a60c8..15559051666bdfd839d05cc572752d1d1750c938 100644 (file)
@@ -36,7 +36,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 00762dd0e5baffd03e24dec3c66213bf20efefdc..89d8905545ebacfc5b5b51161cd2307092a42c09 100644 (file)
@@ -36,7 +36,7 @@ MV=mv
 RANLIB=ranlib
 RM=rm
 
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 7ad11f211b8a6b139046307c729a6a7bc27b45cf..fc84085ebb3e373bada7d2d8569c8c925b5845c1 100644 (file)
@@ -34,4 +34,6 @@ LEX=lex
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
+#
+LIBSYS_AIX_EXP=afsl.exp
index 9f7232bffd6132bf3ea8e894867f3ef31b09e7de..a4c513cf051d90fa22a4a14de73a6d4ebd44ffb1 100644 (file)
@@ -40,7 +40,7 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 421f6216aeaaaecf9375b8911ccc87331c6fec32..f832967d26188bd2ed42a19c0c4c8b953c8382b6 100644 (file)
@@ -40,7 +40,7 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index 8a7d9d6ca586bbcbdd44d84f1a4ed31869ad2861..dc31b3f833ee1efb76c65a97e31c1873290f4c0d 100644 (file)
@@ -38,7 +38,7 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # This is for the vol package
 XFS_SIZE_CHECK         = xfs_size_check
index fd33e43b079e9fa207643fecce89820a61a8a17e..0c01e1e5e63f969ff4d0ac85258b4424958931e5 100644 (file)
@@ -38,4 +38,4 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
index f8c75148e54efa31affe49d797c82e776b3f8379..571a72dc089a442ac00314f22e23da7ee495e0c2 100644 (file)
@@ -39,7 +39,7 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # This is for the vol package
 XFS_SIZE_CHECK         = xfs_size_check
index a0a0c87ca0b23006a8e13bb8450c4d5360972d50..7b3482a5a4af77dca533f11fa5b0f9d856cb3328 100644 (file)
@@ -39,7 +39,7 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # This is for the vol package
 XFS_SIZE_CHECK         = xfs_size_check
index b550bd7d90593e3fe344da05a522947e3bc0e8f0..c0fbc7bab327975b9fe1ac08e14bced907d7823c 100644 (file)
@@ -39,7 +39,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index b550bd7d90593e3fe344da05a522947e3bc0e8f0..c0fbc7bab327975b9fe1ac08e14bced907d7823c 100644 (file)
@@ -39,7 +39,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index b550bd7d90593e3fe344da05a522947e3bc0e8f0..c0fbc7bab327975b9fe1ac08e14bced907d7823c 100644 (file)
@@ -39,7 +39,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # Other OS specific requirements
 #
index e7bc37788441eaabc63f34e4f4e14677b5278f3c..15de03757afbf682412e1479de93766598d0b385 100644 (file)
@@ -39,7 +39,7 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # this is for the vol package
 FS_CONV_SOL26         = fs_conv_sol26
index 8055c01a46ca35807e171236f20c0986392c59d1..701aaf08b7ba8f2634c7547072167710c10c2fa7 100644 (file)
@@ -43,7 +43,7 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # this is for the vol package
 FS_CONV_SOL26         = fs_conv_sol26
index 5b8a3ea4218dd4ece8fb9ac9f78a9543e1a4b64d..d1a63f78bebcab54bca356d9881318dfd46c8d5e 100644 (file)
@@ -47,7 +47,7 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # this is for the vol package
 FS_CONV_SOL26         = fs_conv_sol26
index e1fb1301ac2b3917a7a306bfcaff8a3509edb25e..1640703637da43c6de24da75c91e049774ca2cea 100644 (file)
@@ -40,7 +40,7 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # this is for the vol package
 FS_CONV_SOL26         = fs_conv_sol26
index e1fb1301ac2b3917a7a306bfcaff8a3509edb25e..1640703637da43c6de24da75c91e049774ca2cea 100644 (file)
@@ -40,7 +40,7 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
 #
 # this is for the vol package
 FS_CONV_SOL26         = fs_conv_sol26
index 1c60eca7c454cea8fb509cf4acdfe708178839e9..c88923049c4f49bf6548a2539da8fe7d25948c75 100644 (file)
@@ -20,4 +20,4 @@ AR = /usr/ccs/bin/ar
 LD = /usr/ccs/bin/ld
 LORDER = /usr/ccs/bin/lorder
 STRIP= /usr/ccs/bin/strip
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall
index c020861557c1138b392a5f0a3491c51207870422..8fc19a92274838bb3c9c45f51357b3eb2dda4fb3 100644 (file)
@@ -4,9 +4,11 @@
 #
 # Created By:  Derek Atkins <warlord@MIT.EDU>
 #
+use File::Path;
 
 $linux_header_dir="/usr/src/linux";
 $outdir="./src/afs/LINUX";
+$tmpldir="./src/afs/LINUX";
 
 $sepline="/* LINUX VNODE INCLUDED BELOW -- DO NOT MODIFY */\n";
 
@@ -87,12 +89,16 @@ sub testArg {
 while ($_ = shift @ARGV) {
     if (m/^-i/) { $linux_header_dir = testArg(shift @ARGV); next; }
     if (m/^-o/) { $outdir = testArg(shift @ARGV); next; }
+    if (m/^-t/) { $tmpldir = testArg(shift @ARGV); next; }
     usage;
 }
 
 $linux_fs_h="$linux_header_dir/include/linux/fs.h";
 $vfs_h="$outdir/osi_vfs.h";
-$vfs_hin="$outdir/osi_vfs.hin";
+$vfs_hin="$tmpldir/osi_vfs.hin";
+
+# we're running prior to configure finishing, so outdir might not exist yet
+mkpath([$outdir], 0, 0755);
 
 makeVfs ($linux_fs_h, $vfs_hin, "$vfs_h.new");
 
index 5c6810f6fa35673fb87ce5d96341a29c54b58403..c61efcc5a5d32ed955ccc86f6949de972358d713 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,10 +30,10 @@ SHELL =     /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 OPTMZ= -g
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS =      ${OPTMZ} ${XLDFLAGS}
 
 INCLS=${TOP_INCDIR}/ubik.h \
@@ -73,7 +76,7 @@ clean:
 adkint.cs.o:   adkint.cs.c
 adkint.xdr.o:  adkint.xdr.c adkint.h
 adkint.cs.c    adkint.xdr.c adkint.h: adkint.xg
-               ${RXGEN} adkint.xg
+               ${RXGEN} ${srcdir}/adkint.xg
 
 dlog:          dlog.o $(VERS) $(OBJS) $(LIBS)
                $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \
index 6e685cc75a6561935c657de8416f3d5bfa936350..3e7528331132b1ceaba9ef95b10761bbdf94d04a 100644 (file)
@@ -25,6 +25,9 @@
 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@
@@ -36,8 +39,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -71,7 +74,7 @@ all: ukinstall ${TOP_LIBDIR}/libdes.a ${TOP_INCDIR}/des.h ${TOP_INCDIR}/des_conf
 # Build rules
 #
 .c.o:
-       ${CC} -c -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} $<
+       ${CC} -c -I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS} $<
 
 libdes.a: ${OBJS} AFS_component_version_number.o
        $(RM) -f libdes.a
index 43cc42100497428d8d8f3a7d5b85b8eb7ef52237..303d576074be63beeb8f3581736b576cbfc3754d 100644 (file)
@@ -14,7 +14,7 @@ PROGS = \
        testit \
        verify
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. 
+INCDIRS= -I${TOP_OBJDIR}/src/config -I${DESTDIR}/include -I.. 
 LIBS=-L.. -ldes
 CFLAGS = ${INCDIRS} ${XCFLAGS}
 
index cc27fee44944502ddb71a0ace0993c01270fc36e..51a484258cfb7a0d9f7e5bbe30539e1b09551d27 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,41 +31,29 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
-INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS}
+INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XINCLS}
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
 
-OBJS=buffer.o dir.o salvage.o
-include ../config/Makefile.version
-
-noversion: install
-
-cmdall: all test
-
-all: kinstall ukinstall ${TOP_LIBDIR}/libdir.a ${TOP_INCDIR}/afs/dir.h
-
-libdir.a: ${OBJS} AFS_component_version_number.o
+all: \
+       ${TOP_LIBDIR}/libdir.a \
+       ${TOP_INCDIR}/afs/dir.h \
+       ${KERNELDIR}/afs \
+       ${KERNELDIR}/afs/dir.h \
+       ${KERNELDIR}/afs/afs_dir.c \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/afs/dir.h \
+       ${UKERNELDIR}/afs/afs_dir.c
+
+libdir.a: buffer.o dir.o salvage.o AFS_component_version_number.o
        $(RM) -f $@
-       $(AR) crv $@ $(OBJS) AFS_component_version_number.o
+       $(AR) crv $@ buffer.o dir.o salvage.o  AFS_component_version_number.o
        $(RANLIB) $@
 
-kinstall:
-       ${INSTALL} dir.h ${KERNELDIR}/afs
-       ${INSTALL} dir.c ${KERNELDIR}/afs/afs_dir.c
-
-ukinstall webinstall: ${UKERNELDIR}/afs
-       ${INSTALL} dir.h ${UKERNELDIR}/afs
-       ${INSTALL} dir.c ${UKERNELDIR}/afs/afs_dir.c
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-install:    ${DESTDIR}${libdir}/afs/libdir.a ${DESTDIR}${includedir}/afs/dir.h
-
 test: 
-       (cd test; $(MAKE) )
+       cd test; $(MAKE)
 
 buffer.o: buffer.c
 
@@ -70,29 +61,58 @@ dir.o: dir.c dir.h
 
 salvage.o: salvage.c dir.h
 
-clean:
-       $(RM) -f *.o *.a core AFS_component_version_number.c
-${DEST}/lib/afs/libdir.a: libdir.a
+
+#
+# Install targets
+#
+${TOP_INCDIR}/afs/dir.h: dir.h
        ${INSTALL} $? $@
 
-${DESTDIR}${libdir}/afs/libdir.a: libdir.a
+${TOP_LIBDIR}/libdir.a: libdir.a
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs:
+       mkdir -p $@
+
+${UKERNELDIR}/afs:
+       mkdir -p $@
+
+${KERNELDIR}/afs/dir.h: dir.h
        ${INSTALL} $? $@
 
+${KERNELDIR}/afs/afs_dir.c: dir.c
+       ${INSTALL} $? $@
 
-${TOP_LIBDIR}/libdir.a: libdir.a
+${UKERNELDIR}/afs/dir.h: dir.h
        ${INSTALL} $? $@
 
+${UKERNELDIR}/afs/afs_dir.c: dir.c
+       ${INSTALL} $? $@
 
-${DEST}/include/afs/dir.h: dir.h
+install: \
+       ${DESTDIR}${libdir}/afs/libdir.a \
+       ${DESTDIR}${includedir}/afs/dir.h
+
+${DESTDIR}${libdir}/afs/libdir.a: libdir.a
        ${INSTALL} $? $@
 
 ${DESTDIR}${includedir}/afs/dir.h: dir.h
        ${INSTALL} $? $@
 
+dest: \
+       ${DEST}/lib/afs/libdir.a \
+       ${DEST}/include/afs/dir.h
 
-${TOP_INCDIR}/afs/dir.h: dir.h
+${DEST}/lib/afs/libdir.a: libdir.a
        ${INSTALL} $? $@
 
+${DEST}/include/afs/dir.h: dir.h
+       ${INSTALL} $? $@
 
-dest:    ${DEST}/lib/afs/libdir.a ${DEST}/include/afs/dir.h
+#
+# Misc. targets
+#
+include ../config/Makefile.version
 
+clean:
+       $(RM) -f *.o *.a core AFS_component_version_number.c
index 572d22624f781020153eef799da5cdc4b80ba177..9e720e2c026539bc3902d2755212de5a2d6fad47 100644 (file)
@@ -12,6 +12,9 @@
 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@
@@ -23,8 +26,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -34,7 +37,7 @@ include ../config/Makefile.${SYS_NAME}
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
      DEFS =
-     INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+     INCS = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}
    CFLAGS = ${OPTMZ} ${DEFS} ${INCS}
   EXPORTS = -bexport:export.exp
   IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp
index eb1f0e197d0bb83a20efa17b19ddad678fd4a8d7..cd96265cbfe0bfbfe8aee3410bd770f78bb29230 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,15 +22,15 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 INCLS=${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/lwp.h \
index 2869fe181c8114e843705c275f3cbe3d39a3f959..6418b35e2ce50019ebd3d626beff11a63aa0c619 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,30 +22,52 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
-CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
-KDSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h \
-afsint.h
-KSRCS=${KDSRCS} afsaux.c
-UKSRCS=${KSRCS}
-UTILS=${RXGEN}
-
-include ../config/Makefile.version
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
-noversion: install
+KSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c \
+       afscbint.h afsint.h afsaux.c
+UKSRCS=${KSRCS}
 
-all: kinstall ukinstall ${TOP_LIBDIR}/libafsint.a ${TOP_INCDIR}/afs/afsint.h ${TOP_INCDIR}/afs/afscbint.h
+all: \
+       ${TOP_LIBDIR}/libafsint.a \
+       ${TOP_INCDIR}/afs/afsint.h \
+       ${TOP_INCDIR}/afs/afscbint.h \
+       ${KERNELDIR}/afsint \
+       ${KERNELDIR}/afsint/rxgen_consts.h \
+       ${KERNELDIR}/afsint/rx.h \
+       ${KERNELDIR}/afsint/afscbint.h \
+       ${UKERNELDIR}/afsint \
+       ${UKERNELDIR}/afsint/rxgen_consts.h \
+       ${UKERNELDIR}/afsint/rx.h \
+       ${UKERNELDIR}/afsint/afscbint.h \
+       ${KERNELDIR}/afsint/Kcallback.ss.c \
+       ${KERNELDIR}/afsint/Kcallback.h \
+       ${KERNELDIR}/afsint/Kvice.cs.c \
+       ${KERNELDIR}/afsint/Kvice.h \
+       ${KERNELDIR}/afsint/Kvice.xdr.c \
+       ${KERNELDIR}/afsint/afscbint.h \
+       ${KERNELDIR}/afsint/afsint.h \
+       ${KERNELDIR}/afsint/afsaux.c \
+       ${UKERNELDIR}/afsint/Kcallback.ss.c \
+       ${UKERNELDIR}/afsint/Kcallback.h \
+       ${UKERNELDIR}/afsint/Kvice.cs.c \
+       ${UKERNELDIR}/afsint/Kvice.h \
+       ${UKERNELDIR}/afsint/Kvice.xdr.c \
+       ${UKERNELDIR}/afsint/afscbint.h \
+       ${UKERNELDIR}/afsint/afsint.h \
+       ${UKERNELDIR}/afsint/afsaux.c
 
 libafsint.a: ${OBJS} AFS_component_version_number.o
        -$(RM) -f $@
@@ -51,110 +76,173 @@ libafsint.a: ${OBJS} AFS_component_version_number.o
 
 afsaux.o: afsaux.c afsint.h
 
-Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${RXGEN} -x -k -C -o Kcallback.cs.c afscbint.xg
+Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h
+       ${RXGEN} -x -k -C -o Kcallback.cs.c ${srcdir}/afscbint.xg
 
-Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${RXGEN} -x -k -S -o Kcallback.ss.c afscbint.xg
+Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h
+       ${RXGEN} -x -k -S -o Kcallback.ss.c ${srcdir}/afscbint.xg
 
-Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${RXGEN} -x -k -y -c -o Kcallback.xdr.c afscbint.xg
+Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h
+       ${RXGEN} -x -k -y -c -o Kcallback.xdr.c ${srcdir}/afscbint.xg
 
-Kvice.cs.c: common.xg afsint.xg Kvice.h  $(UTILS)
-       ${RXGEN} -x -k -C -o Kvice.cs.c afsint.xg
+Kvice.cs.c: common.xg afsint.xg Kvice.h
+       ${RXGEN} -x -k -C -o Kvice.cs.c ${srcdir}/afsint.xg
 
-Kvice.ss.c: common.xg afsint.xg Kvice.h $(UTILS)
-       ${RXGEN} -x -k -S -o Kvice.ss.c afsint.xg
+Kvice.ss.c: common.xg afsint.xg Kvice.h
+       ${RXGEN} -x -k -S -o Kvice.ss.c ${srcdir}/afsint.xg
 
-Kvice.xdr.c: common.xg afsint.xg $(UTILS)
-       ${RXGEN} -x -k -c -o Kvice.xdr.c afsint.xg
+Kvice.xdr.c: common.xg afsint.xg
+       ${RXGEN} -x -k -c -o Kvice.xdr.c ${srcdir}/afsint.xg
 
-Kvice.h: common.xg afsint.xg $(UTILS)
-       ${RXGEN} -x -k -h -o Kvice.h afsint.xg
+Kvice.h: common.xg afsint.xg
+       ${RXGEN} -x -k -h -o Kvice.h ${srcdir}/afsint.xg
 
-Kcallback.h: common.xg afscbint.xg $(UTILS)
-       ${RXGEN} -x -k -h -o Kcallback.h afscbint.xg
+Kcallback.h: common.xg afscbint.xg
+       ${RXGEN} -x -k -h -o Kcallback.h ${srcdir}/afscbint.xg
 
-afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${RXGEN} -x -C -o afscbint.cs.c afscbint.xg
+afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h 
+       ${RXGEN} -x -C -o afscbint.cs.c ${srcdir}/afscbint.xg
 
-afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${RXGEN} -x -S -o afscbint.ss.c afscbint.xg
+afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h
+       ${RXGEN} -x -S -o afscbint.ss.c ${srcdir}/afscbint.xg
 
-afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${RXGEN} -x -y -c -o afscbint.xdr.c afscbint.xg
+afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h
+       ${RXGEN} -x -y -c -o afscbint.xdr.c ${srcdir}/afscbint.xg
 
-afsint.cs.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${RXGEN} -x -C -o afsint.cs.c afsint.xg
+afsint.cs.c: common.xg afsint.xg afsint.h
+       ${RXGEN} -x -C -o afsint.cs.c ${srcdir}/afsint.xg
 
-afsint.ss.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${RXGEN} -x -S -o afsint.ss.c afsint.xg
+afsint.ss.c: common.xg afsint.xg afsint.h
+       ${RXGEN} -x -S -o afsint.ss.c ${srcdir}/afsint.xg
 
-afsint.xdr.c: common.xg afsint.xg $(UTILS)
-       ${RXGEN} -x -c -o afsint.xdr.c afsint.xg
+afsint.xdr.c: common.xg afsint.xg
+       ${RXGEN} -x -c -o afsint.xdr.c ${srcdir}/afsint.xg
 
-afsint.h: common.xg afsint.xg $(UTILS)
-       ${RXGEN} -x -h -o afsint.h afsint.xg
+afsint.h: common.xg afsint.xg
+       ${RXGEN} -x -h -o afsint.h ${srcdir}/afsint.xg
 
-afscbint.h: common.xg afscbint.xg $(UTILS)
-       ${RXGEN} -x -h -o afscbint.h afscbint.xg
+afscbint.h: common.xg afscbint.xg
+       ${RXGEN} -x -h -o afscbint.h ${srcdir}/afscbint.xg
 
-system: install
+#
+# Installation targets
+#
+${TOP_LIBDIR}/libafsint.a: libafsint.a
+       ${INSTALL} $? $@
 
-kinstall: ${KSRCS} ${KERNELDIR}/afsint
-       ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint
-       ${INSTALL} ${TOP_INCDIR}/afs/rxgen_consts.h ${KERNELDIR}/afsint
-       -${INSTALL} ${KERNELDIR}/rx/rx.h ${KERNELDIR}/afsint/rx.h
-       ${INSTALL} afscbint.h ${KERNELDIR}/afs
+${TOP_INCDIR}/afs/afsint.h: afsint.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/afscbint.h: afscbint.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afsint/rxgen_consts.h: ${TOP_INCDIR}/afs/rxgen_consts.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afsint/rx.h: ${KERNELDIR}/rx/rx.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs/afscbint.h: afscbint.h
+       ${INSTALL} $? $@
 
 ${KERNELDIR}/afsint:
        mkdir -p $@
 
-ukinstall webinstall: ${UKERNELDIR}/afsint ${UKSRCS}
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint
-       ${INSTALL} ${TOP_INCDIR}/afs/rxgen_consts.h ${UKERNELDIR}/afsint
-       -${INSTALL} ${UKERNELDIR}/rx/rx.h ${UKERNELDIR}/afsint/rx.h
-       ${INSTALL} afscbint.h ${UKERNELDIR}/afs
-
 ${UKERNELDIR}/afsint:
        mkdir -p $@
 
-install:    ${DESTDIR}${libdir}/afs/libafsint.a ${DESTDIR}${includedir}/afs/afsint.h ${DESTDIR}${includedir}/afs/afscbint.h
+${UKERNELDIR}/afsint/rxgen_consts.h: ${TOP_INCDIR}/afs/rxgen_consts.h
+       ${INSTALL} $? $@
 
-clean:
-       $(RM) -f *.o *.cs.c *.ss.c *.er.c afsint.h afsint.xdr.c libafsint.a $(KDSRCS) core AFS_component_version_number.c afscbint.xdr.c
-${DEST}/lib/afs/libafsint.a: libafsint.a
+${UKERNELDIR}/afsint/rx.h: ${UKERNELDIR}/rx/rx.h
        ${INSTALL} $? $@
 
-${DESTDIR}${libdir}/afs/libafsint.a: libafsint.a
+${UKERNELDIR}/afs/afscbint.h: afscbint.h
        ${INSTALL} $? $@
 
+${KERNELDIR}/afsint/Kcallback.ss.c: Kcallback.ss.c
+       ${INSTALL} $? $@
 
-${TOP_LIBDIR}/libafsint.a: libafsint.a
+${KERNELDIR}/afsint/Kcallback.h: Kcallback.h
        ${INSTALL} $? $@
 
+${KERNELDIR}/afsint/Kvice.cs.c: Kvice.cs.c
+       ${INSTALL} $? $@
 
-${DEST}/include/afs/afsint.h: afsint.h
+${KERNELDIR}/afsint/Kvice.h: Kvice.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/afsint.h: afsint.h
+${KERNELDIR}/afsint/Kvice.xdr.c: Kvice.xdr.c
        ${INSTALL} $? $@
 
+${KERNELDIR}/afsint/afscbint.h: afscbint.h
+       ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/afsint.h: afsint.h
+${KERNELDIR}/afsint/afsint.h: afsint.h
        ${INSTALL} $? $@
 
+${KERNELDIR}/afsint/afsaux.c: afsaux.c
+       ${INSTALL} $? $@
 
-${DEST}/include/afs/afscbint.h: afscbint.h
+${UKERNELDIR}/afsint/Kcallback.ss.c: Kcallback.ss.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Kcallback.h: Kcallback.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Kvice.cs.c: Kvice.cs.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Kvice.h: Kvice.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Kvice.xdr.c: Kvice.xdr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/afscbint.h: afscbint.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/afsint.h: afsint.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/afsaux.c: afsaux.c
+       ${INSTALL} $? $@
+
+install: \
+       ${DESTDIR}${libdir}/afs/libafsint.a \
+       ${DESTDIR}${includedir}/afs/afsint.h \
+       ${DESTDIR}${includedir}/afs/afscbint.h
+
+${DESTDIR}${libdir}/afs/libafsint.a: libafsint.a
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/afsint.h: afsint.h
        ${INSTALL} $? $@
 
 ${DESTDIR}${includedir}/afs/afscbint.h: afscbint.h
        ${INSTALL} $? $@
 
+dest: \
+       ${DEST}/lib/afs/libafsint.a \
+       ${DEST}/include/afs/afsint.h \
+       ${DEST}/include/afs/afscbint.h
 
-${TOP_INCDIR}/afs/afscbint.h: afscbint.h
+${DEST}/lib/afs/libafsint.a: libafsint.a
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/afscbint.h: afscbint.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/afsint.h: afsint.h
        ${INSTALL} $? $@
 
+#
+# Misc targets
+#
+
+clean:
+       $(RM) -f *.o *.cs.c *.ss.c *.er.c *.a *.xdr.c core \
+               afsint.h afscbint.h AFS_component_version_number.c 
 
-dest:    ${DEST}/lib/afs/libafsint.a ${DEST}/include/afs/afsint.h ${DEST}/include/afs/afscbint.h
+include ../config/Makefile.version
 
index 802f68a8a2ca36d4d2499df6c1c2aa7e5c621214..d6fe57e52cfbfc0cd9c10c16cfcd342ed6217d3b 100644 (file)
@@ -11,6 +11,9 @@
 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@
@@ -22,8 +25,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -32,7 +35,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
-       -I${TOP_SRCDIR}/config \
+       -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \
        -I${SRCDIR} \
index 72ee15a628d1c7d2f415b941a73c31aa87951448..e55d512d1b834e4be8f2ad20885fac0f8a50aa7e 100644 (file)
@@ -19,6 +19,9 @@
 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@
@@ -30,8 +33,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 3f6865f901387f3f8ce4dea6dea4842c9735a829..a04419237bfdb7d97a6e5fd0e1f96f643fb1afba 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,7 +24,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,12 +32,10 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-CFLAGS=${DBUG} -I. -I${TOP_SRCDIR}/config \
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
-#RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h
-RPCINCLS=
+
 INCLS=gtxobjects.h \
        gtxwindows.h \
        gtxcurseswin.h \
@@ -47,7 +48,6 @@ INCLS=gtxobjects.h \
        gtxtextobj.h \
        gtxframe.h \
        gtxobjdict.h \
-       ${RPCINCLS} \
        ${TOP_INCDIR}/afs/keys.h \
        ${TOP_INCDIR}/afs/cellconfig.h \
        ${TOP_INCDIR}/afs/cmd.h
@@ -94,32 +94,30 @@ DICT_OBJS=objdict.o
 CB_SRCS=textcb.c
 CB_OBJS=textcb.o
 
-#ERROBJS=err.o
-ERRSRCS=
-ERROJBS=
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: libgtx.a gtxtest
-       ${INSTALL} gtx*.h ${TOP_INCDIR}/afs
-       ${INSTALL} libgtx.a ${TOP_LIBDIR}
+all: gtxtest \
+       ${TOP_LIBDIR}/libgtx.a \
+       ${TOP_INCDIR}/afs/gtxcurseswin.h \
+       ${TOP_INCDIR}/afs/gtxdumbwin.h \
+       ${TOP_INCDIR}/afs/gtxframe.h \
+       ${TOP_INCDIR}/afs/gtxinput.h \
+       ${TOP_INCDIR}/afs/gtxkeymap.h \
+       ${TOP_INCDIR}/afs/gtxlightobj.h \
+       ${TOP_INCDIR}/afs/gtxobjdict.h \
+       ${TOP_INCDIR}/afs/gtxobjects.h \
+       ${TOP_INCDIR}/afs/gtxtextcb.h \
+       ${TOP_INCDIR}/afs/gtxtextobj.h \
+       ${TOP_INCDIR}/afs/gtxwindows.h \
+       ${TOP_INCDIR}/afs/gtxX11win.h
 
 tests: object_test screen_test curses_test cb_test gtxtest
 
 # All objects in the library
-LIBSRCS = ${KEYMAP_SRCS} ${WINDOW_SRCS} ${OBJECT_SRCS} ${DICT_SRCS} \
-       ${ERRSRCS} ${CB_SRCS}
-LIBOBJS = $(KEYMAP_OBJS) ${WINDOW_OBJS} ${OBJECT_OBJS} ${DICT_OBJS} \
-       ${ERROBJS} ${CB_OBJS}
+LIBSRCS = ${KEYMAP_SRCS} ${WINDOW_SRCS} ${OBJECT_SRCS} ${DICT_SRCS} ${CB_SRCS}
+LIBOBJS = $(KEYMAP_OBJS) ${WINDOW_OBJS} ${OBJECT_OBJS} ${DICT_OBJS} ${CB_OBJS}
 
 ${LIBSRCS}: ${INCLS}
 $(LIBOBJS): ${INCLS}
 
-err.c: err.et
-       $(RM) -f err.h err.c; $(COMPILE_ET) err -h err
-
 keymap.o: keymap.c ${INCLS}
 
 frame.o: frame.c $(INCLS)
@@ -169,21 +167,168 @@ object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS}
        ${CC} ${CFLAGS} -o object_test object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
 
 #
-# Misc others
+# Installation targets
 #
 libgtx.a: ${LIBOBJS} AFS_component_version_number.o
        -$(RM) -f $@
        $(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
        ${RANLIB} $@
 
-install: libgtx.a
-       ${INSTALL} gtx*.h ${DESTDIR}${includedir}/afs
-       ${INSTALL} libgtx.a ${DESTDIR}${libdir}/afs
+install: \
+       ${DESTDIR}${libdir}/afs/libgtx.a \
+       ${DESTDIR}${includedir}/afs/gtxcurseswin.h \
+       ${DESTDIR}${includedir}/afs/gtxdumbwin.h \
+       ${DESTDIR}${includedir}/afs/gtxframe.h \
+       ${DESTDIR}${includedir}/afs/gtxinput.h \
+       ${DESTDIR}${includedir}/afs/gtxkeymap.h \
+       ${DESTDIR}${includedir}/afs/gtxlightobj.h \
+       ${DESTDIR}${includedir}/afs/gtxobjdict.h \
+       ${DESTDIR}${includedir}/afs/gtxobjects.h \
+       ${DESTDIR}${includedir}/afs/gtxtextcb.h \
+       ${DESTDIR}${includedir}/afs/gtxtextobj.h \
+       ${DESTDIR}${includedir}/afs/gtxwindows.h \
+       ${DESTDIR}${includedir}/afs/gtxX11win.h
+
+${DESTDIR}${libdir}/afs/libgtx.a: libgtx.a
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxcurseswin.h: gtxcurseswin.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxdumbwin.h: gtxdumbwin.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxframe.h: gtxframe.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxinput.h: gtxinput.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxkeymap.h: gtxkeymap.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxlightobj.h: gtxlightobj.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxobjdict.h: gtxobjdict.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxobjects.h: gtxobjects.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxtextcb.h: gtxtextcb.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxtextobj.h: gtxtextobj.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxwindows.h: gtxwindows.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/gtxX11win.h: gtxX11win.h
+       ${INSTALL} $? $@
+
+dest: \
+       ${DEST}/lib/afs/libgtx.a \
+       ${DEST}/include/afs/gtxcurseswin.h \
+       ${DEST}/include/afs/gtxdumbwin.h \
+       ${DEST}/include/afs/gtxframe.h \
+       ${DEST}/include/afs/gtxinput.h \
+       ${DEST}/include/afs/gtxkeymap.h \
+       ${DEST}/include/afs/gtxlightobj.h \
+       ${DEST}/include/afs/gtxobjdict.h \
+       ${DEST}/include/afs/gtxobjects.h \
+       ${DEST}/include/afs/gtxtextcb.h \
+       ${DEST}/include/afs/gtxtextobj.h \
+       ${DEST}/include/afs/gtxwindows.h \
+       ${DEST}/include/afs/gtxX11win.h
+
+${DEST}/lib/afs/libgtx.a: libgtx.a
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxcurseswin.h: gtxcurseswin.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxdumbwin.h: gtxdumbwin.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxframe.h: gtxframe.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxinput.h: gtxinput.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxkeymap.h: gtxkeymap.h
+       ${INSTALL} $? $@
 
+${DEST}/include/afs/gtxlightobj.h: gtxlightobj.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxobjdict.h: gtxobjdict.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxobjects.h: gtxobjects.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxtextcb.h: gtxtextcb.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxtextobj.h: gtxtextobj.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxwindows.h: gtxwindows.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/gtxX11win.h: gtxX11win.h
+       ${INSTALL} $? $@
+
+
+${TOP_LIBDIR}/libgtx.a: libgtx.a
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxcurseswin.h: gtxcurseswin.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxdumbwin.h: gtxdumbwin.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxframe.h: gtxframe.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxinput.h: gtxinput.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxkeymap.h: gtxkeymap.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxlightobj.h: gtxlightobj.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxobjdict.h: gtxobjdict.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxobjects.h: gtxobjects.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxtextcb.h: gtxtextcb.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxtextobj.h: gtxtextobj.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxwindows.h: gtxwindows.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/gtxX11win.h: gtxX11win.h
+       ${INSTALL} $? $@
+
+
+#
+# Misc targets
+#
 clean:
-       $(RM) -f  *.o *.a *.ln object_test screen_test curses_test err.c core cb_test gtxtest AFS_component_version_number.c
+       $(RM) -f  *.o *.a *.ln object_test screen_test curses_test core cb_test gtxtest AFS_component_version_number.c
+
+include ../config/Makefile.version
 
-dest: libgtx.a
-       ${INSTALL} gtx*.h ${DEST}/include/afs
-       ${INSTALL} libgtx.a ${DEST}/lib/afs
 
index b1d3f963f93ca0ef747ef09eb3277b3d0f5ee793..ff69ac9c125e679ff82c7780f633b0ca3475b11a 100644 (file)
@@ -2,6 +2,9 @@
 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@
@@ -20,7 +23,7 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES = -I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+INCLUDES = -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}
 DEFINES = ${INCLUDES}
 AFSLIBS =  ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a\
                   ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \
index d30fc494ff40794e3ee0493f17a421154b215b0f..b496226c3b0faf0eab95f872f4640a83ba405241 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,10 +30,10 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR = ../libuafs/
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+UKERNELDIR = ../libuafs
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = ${OPTMZ} ${XLDFLAGS}
 INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/lwp.h \
@@ -75,18 +78,31 @@ KLIBS=${TOP_LIBDIR}/libubik.a \
 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
 
-include ../config/Makefile.version
-
-noversion: install
 
-all: ukinstall kaserver kas kpwvalid klog klog.krb knfs kpasswd ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libkauth.krb.a rebuild kdb ${TOP_INCDIR}/afs/kautils.h ${TOP_INCDIR}/afs/kauth.h ${TOP_INCDIR}/afs/kaport.h
+all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \
+       ${TOP_LIBDIR}/libkauth.a \
+       ${TOP_LIBDIR}/libkauth.krb.a \
+       ${TOP_INCDIR}/afs/kautils.h \
+       ${TOP_INCDIR}/afs/kauth.h \
+       ${TOP_INCDIR}/afs/kaport.h \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/afsint \
+       ${UKERNELDIR}/afsint/kauth.h \
+       ${UKERNELDIR}/afsint/kauth.cs.c \
+       ${UKERNELDIR}/afsint/kauth.xdr.c \
+       ${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 \
+       ${UKERNELDIR}/afs/client.c \
+       ${UKERNELDIR}/afs/kaerrors.c
 
 test tests: all
        cd test; $(MAKE)
 
-clean:
-       $(RM) -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c
-
 kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
        ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
 
@@ -97,51 +113,47 @@ kautils.o: kautils.c ${INCLS}
 kalocalcell.o: kalocalcell.c ${INCLS}
 
 kadatabase.o: kadatabase.c ${INCLS}
-       ${CC} ${CFLAGS} -c kadatabase.c 
+       ${CC} ${CFLAGS} -c ${srcdir}/kadatabase.c 
 
 kaprocs.o: kaprocs.c ${INCLS} kaport.h
-       ${CC} ${CFLAGS} -c kaprocs.c 
+       ${CC} ${CFLAGS} -c ${srcdir}/kaprocs.c 
 
 authclient.o: authclient.c ${INCLS}
 
-
-#authserver.o: authserver.c ${INCLS}
-
 kaerrors.o: kaerrors.c
 
 kaerrors.c kautils.h: kaerrors.et kautils.p.h
-       $(RM) -f kautils.h kaerrors.c; ${COMPILE_ET} kaerrors -h kautils
+       $(RM) -f kautils.h kaerrors.c
+       ${COMPILE_ET} -p ${srcdir} kaerrors -h kautils
 
 kauth.ss.o: kauth.ss.c
 kauth.cs.o: kauth.cs.c
 kauth.xdr.o: kauth.xdr.c kauth.h
 
 kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg
-       ${RXGEN} -x kauth.rg
+       ${RXGEN} -x ${srcdir}/kauth.rg
 
 Kkauth.cs.c: kauth.rg Kkauth.h
-       ${RXGEN} -x -k -C -o Kkauth.cs.c kauth.rg
+       ${RXGEN} -x -k -C -o Kkauth.cs.c ${srcdir}/kauth.rg
 
 Kkauth.xdr.c: kauth.rg
-       ${RXGEN} -x -k -c -o Kkauth.xdr.c kauth.rg
+       ${RXGEN} -x -k -c -o Kkauth.xdr.c ${srcdir}/kauth.rg
 
 Kkauth.h: kauth.rg
-       ${RXGEN} -x -k -h -o Kkauth.h kauth.rg
+       ${RXGEN} -x -k -h -o Kkauth.h ${srcdir}/kauth.rg
 
 libkauth.a: $(OBJS) AFS_component_version_number.o
        -$(RM) -f $@
        $(AR) crv $@ $(OBJS) AFS_component_version_number.o
        $(RANLIB) $@
 
-
 libkauth.krb.a: $(KOBJS) AFS_component_version_number.o
        -$(RM) -f $@
        $(AR) crv $@ $(KOBJS) AFS_component_version_number.o
        $(RANLIB) $@
 
-
 read_passwd.o: read_passwd.c
-       echo These changes to read_password.c need to be mailed to the Kerberos people; ${CC} ${CFLAGS} -c read_passwd.c
+       ${CC} ${CFLAGS} -c read_passwd.c
 
 token.o: token.c ${INCLS}
 
@@ -170,10 +182,11 @@ klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o
 
 knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o
        ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS}
+
 knfs.o: knfs.c AFS_component_version_number.o
 
 klogin.o: klogin.c ${INCLS} AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c klogin.c -DKAUTH
+       ${CC} ${CFLAGS} -c ${srcdir}/klogin.c -DKAUTH
 
 klogin: libkauth.a $(LIBS) klogin.o
        ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS}
@@ -182,26 +195,26 @@ klogin.krb: libkauth.a $(KLIBS) klogin.o
        ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS}
 
 kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c kpasswd.c 
+       ${CC} ${CFLAGS} -c ${srcdir}/kpasswd.c 
 
 kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
-       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a \
-       ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS}
 
 kpwvalid.o: kpwvalid.c AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c kpwvalid.c
+       ${CC} ${CFLAGS} -c ${srcdir}/kpwvalid.c
 
 kpwvalid: kpwvalid.o $(LIBS)
        ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS}
 
 user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c user.c -o user.krb.o
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/user.c -o user.krb.o
 
 user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
-       ${CC} ${CFLAGS} -c user.c
+       ${CC} ${CFLAGS} -c ${srcdir}/user.c
 
 kdb: kdb.o ${INCLS}
        ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
+
 kdb.o: kdb.c AFS_component_version_number.o
 
 krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o
@@ -215,50 +228,65 @@ rebuild: rebuild.o kautils.o ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${T
        ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \
                ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libdes.a ${XLIBS} ${TOP_LIBDIR}/libcmd.a
 
-${DEST}/root.server/usr/afs/bin/kaserver: kaserver
-       ${INSTALL} -s $? $@
+#
+# Install targets
+#
+${TOP_LIBDIR}/libkauth.a: libkauth.a
+       ${INSTALL} $? $@
 
-${DEST}/etc/kas ${DEST}/root.server/usr/afs/bin/kas: kas 
-       ${INSTALL} -s $? $@
+${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a
+       ${INSTALL} $? $@
 
-${DEST}/bin/kpwvalid ${DEST}/etc/kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid: kpwvalid 
+${TOP_INCDIR}/afs/kautils.h: kautils.h
        ${INSTALL} $? $@
 
-${DEST}/bin/klog ${DEST}/root.server/usr/afs/bin/klog: klog 
-       ${INSTALL} -s $? $@
+${TOP_INCDIR}/afs/kauth.h: kauth.h
+       ${INSTALL} $? $@
 
-${DEST}/bin/klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb: klog.krb 
-       ${INSTALL} -s $? $@
+${TOP_INCDIR}/afs/kaport.h: kaport.h
+       ${INSTALL} $? $@
 
-${DEST}/bin/knfs: knfs 
-       ${INSTALL} -s $? $@
+${UKERNELDIR}/afs:
+       mkdir -p $@
 
-${DEST}/bin/kpasswd: kpasswd 
-       ${INSTALL} -s $? $@
+${UKERNELDIR}/afsint:
+       mkdir -p $@
 
-${DEST}/lib/afs/libkauth.a: libkauth.a 
+${UKERNELDIR}/afs/authclient.c: authclient.c
        ${INSTALL} $? $@
 
-${DEST}/lib/afs/libkauth.krb.a: libkauth.krb.a 
+${UKERNELDIR}/afs/user.c: user.c
        ${INSTALL} $? $@
 
-${DEST}/etc/kadb_check: rebuild
-       ${INSTALL} -f $? $@
+${UKERNELDIR}/afs/kautils.h: kautils.h
+       ${INSTALL} $? $@
 
-${DEST}/etc/kdb: kdb 
-       ${INSTALL} -s $? $@
+${UKERNELDIR}/afs/kaserver.h: kaserver.h
+       ${INSTALL} $? $@
 
-ukinstall webinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h
-       ${INSTALL} Kkauth.h ${UKERNELDIR}/afsint/kauth.h
-       ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}/afsint/kauth.xdr.c
-       ${INSTALL} Kkauth.cs.c ${UKERNELDIR}/afsint/kauth.cs.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
+${UKERNELDIR}/afs/kaaux.c: kaaux.c
+       ${INSTALL} $? $@
 
-${UKERNELDIR}/afs:
-       mkdir -p $@
+${UKERNELDIR}/afs/token.c: token.c
+       ${INSTALL} $? $@
 
-${UKERNELDIR}/afsint:
-       mkdir -p $@
+${UKERNELDIR}/afs/kalocalcell.c: kalocalcell.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/client.c: client.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/kaerrors.c: kaerrors.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/kauth.h: Kkauth.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/kauth.xdr.c: Kkauth.xdr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/kauth.cs.c: Kkauth.cs.c
+       ${INSTALL} $? $@
 
 install: \
        ${DESTDIR}${afssrvlibexecdir}/kaserver \
@@ -320,54 +348,24 @@ ${DESTDIR}${bindir}/kpwvalid: kpwvalid
 ${DESTDIR}${libdir}/afs/libkauth.a: libkauth.a
        ${INSTALL} $? $@
 
-${TOP_LIBDIR}/libkauth.a: libkauth.a
-       ${INSTALL} $? $@
-
 ${DESTDIR}${libdir}/afs/libkauth.krb.a: libkauth.krb.a
        ${INSTALL} $? $@
 
-${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a
-       ${INSTALL} $? $@
-
 ${DESTDIR}${afssrvsbindir}/kadb_check: rebuild
        ${INSTALL} -f $? $@
 
 ${DESTDIR}${afssrvsbindir}/kdb: kdb
        ${INSTALL} -s $? $@
 
-${DEST}/include/afs/kautils.h: kautils.h
-       ${INSTALL} $? $@
-
 ${DESTDIR}${includedir}/afs/kautils.h: kautils.h
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/kautils.h: kautils.h
-       ${INSTALL} $? $@
-
-
-${DEST}/include/afs/kauth.h: kauth.h
-       ${INSTALL} $? $@
-
 ${DESTDIR}${includedir}/afs/kauth.h: kauth.h
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/kauth.h: kauth.h
-       ${INSTALL} $? $@
-
-
-${DEST}/include/afs/kaport.h: kaport.h
-       ${INSTALL} $? $@
-
 ${DESTDIR}${includedir}/afs/kaport.h: kaport.h
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/kaport.h: kaport.h
-       ${INSTALL} $? $@
-
-
 dest: \
        ${DEST}/root.server/usr/afs/bin/kaserver \
        ${DEST}/etc/kas \
@@ -389,3 +387,56 @@ dest: \
        ${DEST}/include/afs/kauth.h \
        ${DEST}/include/afs/kaport.h
 
+${DEST}/root.server/usr/afs/bin/kaserver: kaserver
+       ${INSTALL} -s $? $@
+
+${DEST}/etc/kas ${DEST}/root.server/usr/afs/bin/kas: kas 
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/kpwvalid ${DEST}/etc/kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid: kpwvalid 
+       ${INSTALL} $? $@
+
+${DEST}/bin/klog ${DEST}/root.server/usr/afs/bin/klog: klog 
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb: klog.krb 
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/knfs: knfs 
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/kpasswd: kpasswd 
+       ${INSTALL} -s $? $@
+
+${DEST}/lib/afs/libkauth.a: libkauth.a 
+       ${INSTALL} $? $@
+
+${DEST}/lib/afs/libkauth.krb.a: libkauth.krb.a 
+       ${INSTALL} $? $@
+
+${DEST}/etc/kadb_check: rebuild
+       ${INSTALL} -f $? $@
+
+${DEST}/etc/kdb: kdb 
+       ${INSTALL} -s $? $@
+
+${DEST}/include/afs/kautils.h: kautils.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/kauth.h: kauth.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/kaport.h: kaport.h
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+include ../config/Makefile.version
+
+clean:
+       $(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core \
+               kaserver kas klog multiklog kpasswd klogin rebuild \
+               kauth.h kautils.h kaerrors.c kpwvalid AFS_component_version_number.c \
+               klog.krb knfs klogin.krb kdb Kkauth.h
+
index 08371f660ab503cb8601688835ae5b0e10b05cf5..2f3651a229f06e25d0e44571a009925d83ed8bf3 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \
+INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I.. \
        -I${BACKDIR}/include -I${TOP_INCDIR}/afs
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
@@ -56,10 +59,10 @@ clean:
 system: install
 
 kinstall:
-       ${INSTALL} prs_fs.h ${KERNELDIR}/afs/prs_fs.h
+       ${INSTALL} ${srcdir}/prs_fs.h ${KERNELDIR}/afs/prs_fs.h
 
 ukinstall webinstall:
-       ${INSTALL} prs_fs.h ${UKERNELDIR}/afs/prs_fs.h
+       ${INSTALL} ${srcdir}/prs_fs.h ${UKERNELDIR}/afs/prs_fs.h
 
 install:    ${DESTDIR}${libdir}/afs/libacl.a ${DESTDIR}${includedir}/afs/acl.h ${DESTDIR}${includedir}/afs/prs_fs.h
 
index f2f33a0a954de9aaa5bfc91f0619f0149ccc4ec9..d7aaa66c46d8505c1e631bfe3a73ce9c42533bb7 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 76fd89ebbace8843916d6c827d7b0e5f804d1bb5..e001679202acfb4ba92cc137f21f3fde15bfa495 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 8f9dc886d5dd67c98c0465b264637a8c6eb039f7..e693dd75a3e8f4b0fd1872954f9b0a8aec20bb4d 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,9 +30,9 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 RXKAD = ../../rxkad
 AUTH = ../../auth
 BOZO = ../../bozo
@@ -43,49 +46,49 @@ VOLSER = ../../volser
 all: ${TOP_LIBDIR}/libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h
 
 afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et
-       ${INSTALL} afs_AdminErrors.h ${TOP_INCDIR}/afs
+       ${INSTALL} ${srcdir}/afs_AdminErrors.h ${TOP_INCDIR}/afs
        $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h
-       ${COMPILE_ET} afs_AdminBosErrors.et -h afs_AdminBosErrors
+       ${COMPILE_ET} -p ${srcdir} afs_AdminBosErrors.et -h afs_AdminBosErrors
        cp afs_AdminBosErrors.h ${TOP_INCDIR}/afs/afs_AdminBosErrors.h
 
 afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.et
-       $(RM) -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h
-       ${COMPILE_ET} afs_AdminCfgErrors.et -h afs_AdminCfgErrors
+       $(RM) -f ${srcdir}/afs_AdminCfgErrors.c afs_AdminCfgErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminCfgErrors.et -h afs_AdminCfgErrors
        cp afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h
  
 afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et
-       $(RM) -f afs_AdminClientErrors.c afs_AdminClientErrors.h
-       ${COMPILE_ET} afs_AdminClientErrors.et -h afs_AdminClientErrors
+       $(RM) -f ${srcdir}/afs_AdminClientErrors.c afs_AdminClientErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminClientErrors.et -h afs_AdminClientErrors
        cp afs_AdminClientErrors.h ${TOP_INCDIR}/afs/afs_AdminClientErrors.h
  
 afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et
-       $(RM) -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h
-       ${COMPILE_ET} afs_AdminMiscErrors.et -h afs_AdminMiscErrors
+       $(RM) -f ${srcdir}/afs_AdminMiscErrors.c afs_AdminMiscErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminMiscErrors.et -h afs_AdminMiscErrors
        cp afs_AdminMiscErrors.h ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h
  
 afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et
-       $(RM) -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h
-       ${COMPILE_ET} afs_AdminCommonErrors.et -h afs_AdminCommonErrors
+       $(RM) -f ${srcdir}/afs_AdminCommonErrors.c afs_AdminCommonErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminCommonErrors.et -h afs_AdminCommonErrors
        cp afs_AdminCommonErrors.h ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h
  
 afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et
-       $(RM) -f afs_AdminKasErrors.c afs_AdminKasErrors.h
-       ${COMPILE_ET} afs_AdminKasErrors.et -h afs_AdminKasErrors
+       $(RM) -f ${srcdir}/afs_AdminKasErrors.c afs_AdminKasErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminKasErrors.et -h afs_AdminKasErrors
        cp afs_AdminKasErrors.h ${TOP_INCDIR}/afs/afs_AdminKasErrors.h
  
 afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et
-       $(RM) -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h
-       ${COMPILE_ET} afs_AdminPtsErrors.et -h afs_AdminPtsErrors
+       $(RM) -f ${srcdir}/afs_AdminPtsErrors.c afs_AdminPtsErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminPtsErrors.et -h afs_AdminPtsErrors
        cp afs_AdminPtsErrors.h ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h
  
 afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et
-       $(RM) -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h
-       ${COMPILE_ET} afs_AdminUtilErrors.et -h afs_AdminUtilErrors
+       $(RM) -f ${srcdir}/afs_AdminUtilErrors.c afs_AdminUtilErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminUtilErrors.et -h afs_AdminUtilErrors
        cp afs_AdminUtilErrors.h ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h
  
 afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et
-       $(RM) -f afs_AdminVosErrors.c afs_AdminVosErrors.h
-       ${COMPILE_ET} afs_AdminVosErrors.et -h afs_AdminVosErrors
+       $(RM) -f ${srcdir}/afs_AdminVosErrors.c afs_AdminVosErrors.h
+       ${COMPILE_ET} -p ${srcdir} afs_AdminVosErrors.et -h afs_AdminVosErrors
        cp afs_AdminVosErrors.h ${TOP_INCDIR}/afs/afs_AdminVosErrors.h
 
 ERROROBJS = \
index 38e9cce31e3688ebc644fcda1fa2ed194eb47eff..435447d008d492f56bee3073ae1939a5727bff46 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 BOZO = ../../bozo/
index adbd6af2176f09adc87b0c8d7b52d08a07d707bf..5bfcd1f2273c5729a2885c4fb1224f5ec1830012 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,15 +22,15 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 UBIKOBJS=\
index bd0865a1b77a815135a26cbaade30d0f2a3471ef..2d5194622a23fc9211db4d13fcc8f0591276b472 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 
 ADMINOBJS = afs_clientAdmin.o
 
index 7bb794b1bd2f25564ee5d788561975092674cc02..71f592bd8d55093ebb3ed908e346bda192bbed77 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,10 +31,11 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \
+       -I../../kauth -I${srcdir}/../../kauth
 CCRULE = ${CC} ${CFLAGS} -c $?
 
-KAUTH= ../../kauth/
+KAUTH= ${srcdir}/../../kauth/
 
 ADMINOBJS = afs_kasAdmin.o
 
@@ -73,10 +77,10 @@ libkasadmin.a: ${LIBOBJS}
 
 afs_kasAdmin.o: afs_kasAdmin.h
 
-kauth.cs.o: ${KAUTH}/kauth.cs.c
+kauth.cs.o: ../../kauth/kauth.cs.c
        ${CCRULE}
 
-kauth.xdr.o: ${KAUTH}/kauth.xdr.c
+kauth.xdr.o: ../../kauth/kauth.xdr.c
        ${CCRULE}
 
 kaaux.o: ${KAUTH}/kaaux.c
index 256b0c4e36658f4bfaac39e0e42de3b11f31a1c1..aa06f8690ff35dc111a37c2d405a13ae0d883c5f 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 PTSERVER = ../../ptserver/
index 53b83f662698b7db7154a58cb76185ba159e8d66..5f96bfc47969c61bf05ce41d0bf1a5b38c212083 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -25,7 +28,7 @@ SYS_NAME=@AFS_SYSNAME@
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 
 
 ########################################################################
index c87db45ff0894742e617e35784d7406787ba9cce..225fdba17fedf0503f03af6198f8421735b9ccd7 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -25,7 +28,7 @@ SYS_NAME=@AFS_SYSNAME@
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS}
 
 
 ########################################################################
index 5e0bdad76a8db60f44e9372a4f4becec3b3eeba0..f13855059d2ad7b920be8b1431d75bad884ceb1a 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 CC = ${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 VLSERVER = ../../vlserver/
diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
deleted file mode 100644 (file)
index 9f1afd2..0000000
+++ /dev/null
@@ -1,339 +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
-
-# Common elements for Makefiles for all system types.
-#
-SHELL=/bin/sh
-INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
-AFS    =../afs
-RX     =../rx
-AFSINT =../afsint
-
-# Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
-.c.i:
-       $(CC) $(CFLAGS) -P -c $<
-
-.c.o:
-       $(CC) $(CFLAGS) -c $<
-CRULE1=        $(CC) $(CFLAGS) -c $?
-CRULE2=        $(CC) $(OPTF) $(CFLAGS) -c $?
-CRULE3=        $(CC) $(OPTF2) $(CFLAGS) -c $?
-CRULE4=        $(CC) $(DBG) $(CFLAGS) -c $?
-
-system:        all
-
-kinstall:      install
-install:       all $(INSTDIRS)
-dest:          all $(DESTDIRS)
-
-all:   setup $(COMPDIRS)
-
-single_compdir single_instdir single_destdir:
-       cd $(KOBJ) ; \
-       echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \
-       $(MAKE) DESTDIR=${DESTDIR}  $@_libafs;
-
-single_compdir_libafs: libafs
-single_instdir_libafs: install_libafs
-single_destdir_libafs: dest_libafs
-
-AFSAOBJS = \
-       afs_atomlist.o \
-       afs_lhash.o \
-       afs_analyze.o \
-       afs_axscache.o  \
-       afs_buffer.o    \
-       afs_callback.o  \
-       afs_cbqueue.o    \
-       afs_cell.o \
-       afs_chunk.o             \
-       afs_conn.o \
-       afs_daemons.o   \
-       afs_dcache.o \
-       afs_dir.o               \
-       afs_dynroot.o           \
-       afs_init.o \
-       afs_lock.o      \
-       afs_mariner.o \
-       afs_memcache.o  \
-       afs_osi.o               \
-       afs_osidnlc.o   \
-       afs_osi_alloc.o \
-       afs_osi_pag.o \
-       afs_osi_uio.o \
-       afs_osi_vget.o \
-       afs_segments.o \
-       afs_server.o \
-       afs_stat.o \
-       afs_user.o \
-       afs_util.o \
-       afs_vcache.o \
-       afs_vnop_access.o \
-       afs_vnop_attrs.o \
-       afs_vnop_create.o \
-       afs_vnop_dirops.o \
-       afs_vnop_fid.o \
-       afs_vnop_flock.o \
-       afs_vnop_link.o \
-       afs_vnop_lookup.o \
-       afs_vnop_open.o \
-       afs_vnop_read.o \
-       afs_vnop_readdir.o \
-       afs_vnop_remove.o \
-       afs_vnop_rename.o \
-       afs_vnop_strategy.o \
-       afs_vnop_symlink.o \
-       afs_vnop_write.o \
-       afs_volume.o \
-       afsaux.o                \
-       Kvice.xdr.o     \
-       xdr_arrayn.o    \
-       Kvice.cs.o      \
-       fcrypt.o                \
-       rx.o            \
-       rx_rdwr.o       \
-       rx_clock.o      \
-       rx_event.o      \
-       rx_globals.o    \
-       rx_knet.o       \
-       rx_kcommon.o    \
-       rx_misc.o       \
-       rx_null.o       \
-       rx_getaddr.o    \
-       rx_packet.o     \
-       xdr_rx.o        \
-       Kvldbint.cs.o   \
-       Kvldbint.xdr.o  \
-       Kcallback.ss.o  \
-       Krxstat.ss.o    \
-       Krxstat.xdr.o   \
-       rxstat.o        \
-       crypt_conn.o    \
-       AFS_component_version_number.o\
-       afs_exporter.o  \
-       rxkad_client.o  \
-       rxkad_common.o  \
-       xdr_afsuuid.o   \
-       afs_uuid.o $(AFS_OS_OBJS)
-
-# These next two allow nfs and nonfs builds to occur in the same directory.
-AFSNFSOBJS = \
-       afs_nfsclnt.o   \
-       afs_nfsdisp.o   \
-       afs_nfsdisp_v3.o \
-       afs_call_nfs.o \
-       afs_pioctl_nfs.o \
-       $(AFS_OS_NFSOBJS)
-
-AFSNONFSOBJS = \
-       afs_call.o \
-       afs_pioctl.o \
-       $(AFS_OS_NONFSOBJS)
-
-
-# Compilation rules
-# These files are to be optimized
-afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE2);
-afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE2);
-afs_analyze.o: $(AFS)/afs_analyze.c
-       $(CRULE2);
-afs_axscache.o: $(AFS)/afs_axscache.c
-       $(CRULE2);
-afs_buffer.o: $(AFS)/afs_buffer.c
-       $(CRULE2);
-afs_cell.o: $(AFS)/afs_cell.c
-       $(CRULE2);
-afs_conn.o: $(AFS)/afs_conn.c
-       $(CRULE2);
-afs_dcache.o: $(AFS)/afs_dcache.c
-       $(CRULE2);
-afs_dynroot.o:         $(AFS)/afs_dynroot.c
-       $(CRULE2);
-afs_init.o: $(AFS)/afs_init.c
-       $(CRULE2);
-afs_mariner.o: $(AFS)/afs_mariner.c
-       $(CRULE2);
-afs_osidnlc.o: $(AFS)/afs_osidnlc.c
-       $(CRULE2);
-afs_osi.o:     $(AFS)/afs_osi.c
-       $(CRULE2);
-afs_osi_alloc.o: $(AFS)/afs_osi_alloc.c
-       $(CRULE2);
-afs_osi_pag.o: $(AFS)/afs_osi_pag.c
-       $(CRULE2);
-afs_osi_sleep.o: $(AFS)/afs_osi_sleep.c
-       $(CRULE2);
-afs_osi_vnhold.o: $(AFS)/afs_osi_vnhold.c
-       $(CRULE2);
-afs_osi_uio.o: $(AFS)/afs_osi_uio.c
-       $(CRULE2);
-afs_osi_vget.o: $(AFS)/afs_osi_vget.c
-       $(CRULE1)
-afs_segments.o: $(AFS)/afs_segments.c
-       $(CRULE2);
-afs_server.o: $(AFS)/afs_server.c
-       $(CRULE2);
-afs_user.o: $(AFS)/afs_user.c
-       $(CRULE2);
-afs_util.o: $(AFS)/afs_util.c
-       $(CRULE2);
-afs_vcache.o: $(AFS)/afs_vcache.c
-       $(CRULE2);
-afs_vnop_access.o: $(AFS)/afs_vnop_access.c
-       $(CRULE1);
-afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
-       $(CRULE1);
-afs_vnop_create.o: $(AFS)/afs_vnop_create.c
-       $(CRULE1);
-afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
-       $(CRULE1);
-afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
-       $(CRULE1);
-afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
-       $(CRULE1);
-afs_vnop_link.o: $(AFS)/afs_vnop_link.c
-       $(CRULE1);
-afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
-       $(CRULE1);
-afs_vnop_open.o: $(AFS)/afs_vnop_open.c
-       $(CRULE1);
-afs_vnop_read.o: $(AFS)/afs_vnop_read.c
-       $(CRULE1);
-afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
-       $(CRULE1);
-afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
-       $(CRULE1);
-afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
-       $(CRULE1);
-afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
-       $(CRULE1);
-afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
-       $(CRULE1);
-afs_vnop_write.o: $(AFS)/afs_vnop_write.c
-       $(CRULE1);
-afs_volume.o: $(AFS)/afs_volume.c
-       $(CRULE2);
-rx_rdwr.o: $(RX)/rx_rdwr.c
-       $(CRULE2);
-afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE2);
-xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
-       $(CRULE2);
-
-# these files are not to be optimized - subject to change.
-afs_cbqueue.o: $(AFS)/afs_cbqueue.c
-       $(CRULE1);
-afs_callback.o: $(AFS)/afs_callback.c
-       $(CRULE1);
-afs_chunk.o: $(AFS)/afs_chunk.c
-       $(CRULE1);
-afs_daemons.o: $(AFS)/afs_daemons.c
-       $(CRULE1);
-afs_dir.o:     $(AFS)/afs_dir.c
-       $(CRULE1);
-AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
-       $(CRULE1);
-afs_lock.o: $(AFS)/afs_lock.c
-       $(CRULE1);
-afs_memcache.o: $(AFS)/afs_memcache.c
-       $(CRULE1);
-afs_stat.o: $(AFS)/afs_stat.c
-       $(CRULE1);
-fcrypt.o:      $(AFS)/fcrypt.c
-       $(CRULE1);
-crypt_conn.o: $(AFS)/crypt_conn.c
-       $(CRULE1);
-rxkad_client.o: $(AFS)/rxkad_client.c
-       $(CRULE1);
-rxkad_common.o: $(AFS)/rxkad_common.c
-       $(CRULE1);
-afs_exporter.o: $(AFS)/afs_exporter.c
-       $(CRULE1);
-afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
-       $(CRULE1);
-afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
-       $(CRULE1);
-afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
-       $(CRULE1);
-rx.o: $(RX)/rx.c
-       $(CRULE1);
-rx_clock.o: $(RX)/rx_clock.c
-       $(CRULE1);
-rx_event.o: $(RX)/rx_event.c
-       $(CRULE1);
-rx_globals.o: $(RX)/rx_globals.c
-       $(CRULE1);
-rx_misc.o: $(RX)/rx_misc.c
-       $(CRULE1);
-rx_null.o: $(RX)/rx_null.c
-       $(CRULE1);
-rx_getaddr.o: $(RX)/rx_getaddr.c
-       $(CRULE1);
-rx_packet.o: $(RX)/rx_packet.c
-       $(CRULE1);
-xdr_rx.o: $(RX)/xdr_rx.c
-       $(CRULE1);
-afs_ncrops.o: $(AFS)/afs_ncrops.c
-       $(CRULE1);
-afs_aixops.o: $(AFS)/afs_aixops.c
-       $(CRULE1);
-afs_aix_subr.o: $(AFS)/afs_aix_subr.c
-       $(CRULE1);
-afs_hp_subr.o: $(AFS)/afs_hp_subr.c
-       $(CRULE1);
-afs_gfsops.o: $(AFS)/afs_gfsops.c
-       $(CRULE1);
-afs_gfs_subr.o: $(AFS)/afs_gfs_subr.c
-       $(CRULE1);
-Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
-       $(CRULE1);
-rxstat.o: $(AFSINT)/rxstat.c
-       $(CRULE1);
-Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
-       $(CRULE1);
-Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
-       $(CRULE1);
-Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
-       $(CRULE1);
-Kvice.cs.o: $(AFSINT)/Kvice.cs.c
-       $(CRULE1);
-afsaux.o: $(AFSINT)/afsaux.c
-       $(CRULE1);
-xdr_arrayn.o: $(RX)/xdr_arrayn.c
-       $(CRULE1);
-Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
-       $(CRULE1);
-Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
-       $(CRULE1) -DAFS_UUID_XG;
-afs_main.o: $(AFS)/afs_main.c
-       $(CRULE1);
-rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE1);
-rx_kcommon.o: $(RX)/rx_kcommon.c
-       $(CRULE1);
-
-# Files which do not contain NFS translator code.
-afs_call.o: $(AFS)/afs_call.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-afs_pioctl.o: $(AFS)/afs_pioctl.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-
-# NFS Translator versions of the above code.
-afs_call_nfs.o:        $(AFS)/afs_call.c
-       $(CRULE1) -o afs_call_nfs.o;
-afs_pioctl_nfs.o:      $(AFS)/afs_pioctl.c
-       $(CRULE1) -o afs_pioctl_nfs.o;
-
-
-
-clean:
-       -$(RM) -rf STATIC* MODLOAD*
-       -$(RM) -rf  h net netinet rpc ufs machine inet nfs sys afs afsint asm asm-generic config rx linux
-
-
diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
new file mode 100644 (file)
index 0000000..f56c303
--- /dev/null
@@ -0,0 +1,339 @@
+# 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
+
+# Common elements for Makefiles for all system types.
+#
+SHELL=/bin/sh
+INCLUDE= -I.  -I/usr/include -I${TOP_OBJDIR}/src/config
+AFS    =../afs
+RX     =../rx
+AFSINT =../afsint
+
+# Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
+.c.i:
+       $(CC) $(CFLAGS) -P -c $<
+
+.c.o:
+       $(CC) $(CFLAGS) -c $<
+CRULE1=        $(CC) $(CFLAGS) -c $?
+CRULE2=        $(CC) $(OPTF) $(CFLAGS) -c $?
+CRULE3=        $(CC) $(OPTF2) $(CFLAGS) -c $?
+CRULE4=        $(CC) $(DBG) $(CFLAGS) -c $?
+
+system:        all
+
+kinstall:      install
+install:       all $(INSTDIRS)
+dest:          all $(DESTDIRS)
+
+all:   setup $(COMPDIRS)
+
+single_compdir single_instdir single_destdir:
+       cd $(KOBJ) ; \
+       echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \
+       $(MAKE) DESTDIR=${DESTDIR}  $@_libafs
+
+single_compdir_libafs: libafs
+single_instdir_libafs: install_libafs
+single_destdir_libafs: dest_libafs
+
+AFSAOBJS = \
+       afs_atomlist.o \
+       afs_lhash.o \
+       afs_analyze.o \
+       afs_axscache.o  \
+       afs_buffer.o    \
+       afs_callback.o  \
+       afs_cbqueue.o    \
+       afs_cell.o \
+       afs_chunk.o             \
+       afs_conn.o \
+       afs_daemons.o   \
+       afs_dcache.o \
+       afs_dir.o               \
+       afs_dynroot.o           \
+       afs_init.o \
+       afs_lock.o      \
+       afs_mariner.o \
+       afs_memcache.o  \
+       afs_osi.o               \
+       afs_osidnlc.o   \
+       afs_osi_alloc.o \
+       afs_osi_pag.o \
+       afs_osi_uio.o \
+       afs_osi_vget.o \
+       afs_segments.o \
+       afs_server.o \
+       afs_stat.o \
+       afs_user.o \
+       afs_util.o \
+       afs_vcache.o \
+       afs_vnop_access.o \
+       afs_vnop_attrs.o \
+       afs_vnop_create.o \
+       afs_vnop_dirops.o \
+       afs_vnop_fid.o \
+       afs_vnop_flock.o \
+       afs_vnop_link.o \
+       afs_vnop_lookup.o \
+       afs_vnop_open.o \
+       afs_vnop_read.o \
+       afs_vnop_readdir.o \
+       afs_vnop_remove.o \
+       afs_vnop_rename.o \
+       afs_vnop_strategy.o \
+       afs_vnop_symlink.o \
+       afs_vnop_write.o \
+       afs_volume.o \
+       afsaux.o                \
+       Kvice.xdr.o     \
+       xdr_arrayn.o    \
+       Kvice.cs.o      \
+       fcrypt.o                \
+       rx.o            \
+       rx_rdwr.o       \
+       rx_clock.o      \
+       rx_event.o      \
+       rx_globals.o    \
+       rx_knet.o       \
+       rx_kcommon.o    \
+       rx_misc.o       \
+       rx_null.o       \
+       rx_getaddr.o    \
+       rx_packet.o     \
+       xdr_rx.o        \
+       Kvldbint.cs.o   \
+       Kvldbint.xdr.o  \
+       Kcallback.ss.o  \
+       Krxstat.ss.o    \
+       Krxstat.xdr.o   \
+       rxstat.o        \
+       crypt_conn.o    \
+       AFS_component_version_number.o\
+       afs_exporter.o  \
+       rxkad_client.o  \
+       rxkad_common.o  \
+       xdr_afsuuid.o   \
+       afs_uuid.o $(AFS_OS_OBJS)
+
+# These next two allow nfs and nonfs builds to occur in the same directory.
+AFSNFSOBJS = \
+       afs_nfsclnt.o   \
+       afs_nfsdisp.o   \
+       afs_nfsdisp_v3.o \
+       afs_call_nfs.o \
+       afs_pioctl_nfs.o \
+       $(AFS_OS_NFSOBJS)
+
+AFSNONFSOBJS = \
+       afs_call.o \
+       afs_pioctl.o \
+       $(AFS_OS_NONFSOBJS)
+
+
+# Compilation rules
+# These files are to be optimized
+afs_atomlist.o: $(AFS)/afs_atomlist.c
+       $(CRULE2)
+afs_lhash.o: $(AFS)/afs_lhash.c
+       $(CRULE2)
+afs_analyze.o: $(AFS)/afs_analyze.c
+       $(CRULE2)
+afs_axscache.o: $(AFS)/afs_axscache.c
+       $(CRULE2)
+afs_buffer.o: $(AFS)/afs_buffer.c
+       $(CRULE2)
+afs_cell.o: $(AFS)/afs_cell.c
+       $(CRULE2)
+afs_conn.o: $(AFS)/afs_conn.c
+       $(CRULE2)
+afs_dcache.o: $(AFS)/afs_dcache.c
+       $(CRULE2)
+afs_dynroot.o:         $(AFS)/afs_dynroot.c
+       $(CRULE2)
+afs_init.o: $(AFS)/afs_init.c
+       $(CRULE2)
+afs_mariner.o: $(AFS)/afs_mariner.c
+       $(CRULE2)
+afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+       $(CRULE2)
+afs_osi.o:     $(AFS)/afs_osi.c
+       $(CRULE2)
+afs_osi_alloc.o: $(AFS)/afs_osi_alloc.c
+       $(CRULE2)
+afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+       $(CRULE2)
+afs_osi_sleep.o: $(AFS)/afs_osi_sleep.c
+       $(CRULE2)
+afs_osi_vnhold.o: $(AFS)/afs_osi_vnhold.c
+       $(CRULE2)
+afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+       $(CRULE2)
+afs_osi_vget.o: $(AFS)/afs_osi_vget.c
+       $(CRULE1)
+afs_segments.o: $(AFS)/afs_segments.c
+       $(CRULE2)
+afs_server.o: $(AFS)/afs_server.c
+       $(CRULE2)
+afs_user.o: $(AFS)/afs_user.c
+       $(CRULE2)
+afs_util.o: $(AFS)/afs_util.c
+       $(CRULE2)
+afs_vcache.o: $(AFS)/afs_vcache.c
+       $(CRULE2)
+afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+       $(CRULE1)
+afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+       $(CRULE1)
+afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+       $(CRULE1)
+afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+       $(CRULE1)
+afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+       $(CRULE1)
+afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+       $(CRULE1)
+afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+       $(CRULE1)
+afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+       $(CRULE1)
+afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+       $(CRULE1)
+afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+       $(CRULE1)
+afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+       $(CRULE1)
+afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+       $(CRULE1)
+afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+       $(CRULE1)
+afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+       $(CRULE1)
+afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+       $(CRULE1)
+afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+       $(CRULE1)
+afs_volume.o: $(AFS)/afs_volume.c
+       $(CRULE2)
+rx_rdwr.o: $(RX)/rx_rdwr.c
+       $(CRULE2)
+afs_uuid.o: $(AFS)/afs_uuid.c
+       $(CRULE2)
+xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
+       $(CRULE2)
+
+# these files are not to be optimized - subject to change.
+afs_cbqueue.o: $(AFS)/afs_cbqueue.c
+       $(CRULE1)
+afs_callback.o: $(AFS)/afs_callback.c
+       $(CRULE1)
+afs_chunk.o: $(AFS)/afs_chunk.c
+       $(CRULE1)
+afs_daemons.o: $(AFS)/afs_daemons.c
+       $(CRULE1)
+afs_dir.o:     $(AFS)/afs_dir.c
+       $(CRULE1)
+AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+       $(CRULE1)
+afs_lock.o: $(AFS)/afs_lock.c
+       $(CRULE1)
+afs_memcache.o: $(AFS)/afs_memcache.c
+       $(CRULE1)
+afs_stat.o: $(AFS)/afs_stat.c
+       $(CRULE1)
+fcrypt.o:      $(AFS)/fcrypt.c
+       $(CRULE1)
+crypt_conn.o: $(AFS)/crypt_conn.c
+       $(CRULE1)
+rxkad_client.o: $(AFS)/rxkad_client.c
+       $(CRULE1)
+rxkad_common.o: $(AFS)/rxkad_common.c
+       $(CRULE1)
+afs_exporter.o: $(AFS)/afs_exporter.c
+       $(CRULE1)
+afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+       $(CRULE1)
+afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+       $(CRULE1)
+afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
+       $(CRULE1)
+rx.o: $(RX)/rx.c
+       $(CRULE1)
+rx_clock.o: $(RX)/rx_clock.c
+       $(CRULE1)
+rx_event.o: $(RX)/rx_event.c
+       $(CRULE1)
+rx_globals.o: $(RX)/rx_globals.c
+       $(CRULE1)
+rx_misc.o: $(RX)/rx_misc.c
+       $(CRULE1)
+rx_null.o: $(RX)/rx_null.c
+       $(CRULE1)
+rx_getaddr.o: $(RX)/rx_getaddr.c
+       $(CRULE1)
+rx_packet.o: $(RX)/rx_packet.c
+       $(CRULE1)
+xdr_rx.o: $(RX)/xdr_rx.c
+       $(CRULE1)
+afs_ncrops.o: $(AFS)/afs_ncrops.c
+       $(CRULE1)
+afs_aixops.o: $(AFS)/afs_aixops.c
+       $(CRULE1)
+afs_aix_subr.o: $(AFS)/afs_aix_subr.c
+       $(CRULE1)
+afs_hp_subr.o: $(AFS)/afs_hp_subr.c
+       $(CRULE1)
+afs_gfsops.o: $(AFS)/afs_gfsops.c
+       $(CRULE1)
+afs_gfs_subr.o: $(AFS)/afs_gfs_subr.c
+       $(CRULE1)
+Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+       $(CRULE1)
+rxstat.o: $(AFSINT)/rxstat.c
+       $(CRULE1)
+Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+       $(CRULE1)
+Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+       $(CRULE1)
+Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+       $(CRULE1)
+Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+       $(CRULE1)
+afsaux.o: $(AFSINT)/afsaux.c
+       $(CRULE1)
+xdr_arrayn.o: $(RX)/xdr_arrayn.c
+       $(CRULE1)
+Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
+       $(CRULE1)
+Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+       $(CRULE1) -DAFS_UUID_XG
+afs_main.o: $(AFS)/afs_main.c
+       $(CRULE1)
+rx_knet.o: $(RX)/rx_knet.c
+       $(CRULE1)
+rx_kcommon.o: $(RX)/rx_kcommon.c
+       $(CRULE1)
+
+# Files which do not contain NFS translator code.
+afs_call.o: $(AFS)/afs_call.c
+       $(CRULE1) -DAFS_NONFSTRANS
+afs_pioctl.o: $(AFS)/afs_pioctl.c
+       $(CRULE1) -DAFS_NONFSTRANS
+
+# NFS Translator versions of the above code.
+afs_call_nfs.o:        $(AFS)/afs_call.c
+       $(CRULE1) -o afs_call_nfs.o
+afs_pioctl_nfs.o:      $(AFS)/afs_pioctl.c
+       $(CRULE1) -o afs_pioctl_nfs.o
+
+
+
+clean:
+       -$(RM) -rf STATIC* MODLOAD*
+       -$(RM) -rf  h net netinet rpc ufs machine inet nfs sys afs afsint asm asm-generic config rx linux
+
+
index 0d7c3ab4e8b48357cdd03ee14674a2d053d78bd2..96701c6cc9630a694a5cc182dde5e4442f680685 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -76,7 +79,7 @@ LDSTUFF= -b"binder:/usr/lib/bind glink:/usr/lib/glink.o" -bnoentry -b h:4 \
 LDFLAGS = -m -eafs_config -bexport:${TOP_LIBDIR}/afs.exp ${IMPORTS} \
         -lsys -lcsys 
 
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ = MODLOAD
index 4d4a949042446d2731f988697c82fdafb836b0d1..d2a39758e8ad69a789712b361acdfaec58ea1e61 100644 (file)
@@ -7,6 +7,9 @@ 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@
@@ -52,7 +55,7 @@ DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_US
 KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
 #CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 #CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
 
 
 # Name of directory to hold object files and libraries.
index cf848daa0888dde093a4d05ff08b425ee8497a84..951ac055b281861b7facf22220d9e2eb7a8d4b5f 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -56,7 +59,7 @@ DBUG = -O2 -g3
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.
index ef84b2263657274b421cd949d747d98dba1e8649..86488321c70095395fb7f58bad7351ecb9d02766 100644 (file)
@@ -6,6 +6,9 @@ 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@
@@ -51,7 +54,7 @@ DBUG = -O2
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.
index ab50ceb3c97e64cc0b37211c1ddd5644e33112d7..df9ae606908d81c8f2f0570752a4e540a0e993ce 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -77,7 +80,7 @@ KDEFS_64 = +DA2.0W +DS2.0 +M2 +W 478,530
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT -DHPONCPLUS
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I../h -I../nfs -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I../h -I../nfs -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ=STATIC
index 758385e71b03db9c4d08c01826238155d7449d75..5200f16b4363ab7af942567168ebde232ff19dab 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -212,7 +215,7 @@ LDFLAGS_32 = -n32
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) -G 0 $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) -G 0 $(KDEFS) $(KOPTS) ${DBUG}
 
 # This tells Makefile.common to use it's single directory build target.
 #COMPDIRS = single_compdir
index 8ee1512b1df8280ac83c27792b0d4947d1239bc8..12682e777a8c41ec7fd39f8fc8badec478a6b905 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -91,7 +94,7 @@ CCFLAGS =   -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe \
        -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE
 <all>
-INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config
+INCLUDES = -I. -I../ -I${TOP_OBJDIR}/src/config
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
 
index 31e172c9e0e265ee71898d1a2a0bbeca797ae51e..a21f51c762cb06ad889040dcc45488c313729a65 100644 (file)
@@ -6,6 +6,9 @@ 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@
@@ -51,7 +54,7 @@ DBUG = -O2
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF=${OPT} 
 OPTF2=${OPT2} 
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 
 # Name of directory to hold object files and libraries.
index afc4dbb5951bb5a1c3ba2ef4acc682c601439134..471e39844d4683dc5dc6a9dacc41ee5eadb9ca16 100644 (file)
@@ -11,6 +11,9 @@ 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@
@@ -57,7 +60,7 @@ KDEFS_32 =
 KDEFS_64 = -xarch=v9
 
 <all>
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
 <all -sun4x_57 -sun4x_58 -sun4x_59>
index e5d547f3983de19ebaeb7e605ed0cd8c0ce0846b..f0d084070a037671091bff3ad5bc1d5ff6c5b381 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -31,7 +34,8 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} ${DBG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${MT_CFLAGS} \
+       -I../auth -I../kauth -I../ptserver -I../sys
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 AUDIT= ../audit
index d894f06582c5b5c5448530758dd3121328b9e330..efd9a67ebd2b2058a43ee579f89cc7501c938ab6 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -31,8 +34,9 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-INCLUDES=-I${TOP_INCDIR} -I.. -I../rx
-CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
+INCLUDES=-I. -I${srcdir} -I${TOP_INCDIR} -I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \
+       -I../rxkad -I${srcdir}/../rxkad -I../rxstat -I../fsint
+CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_OBJDIR}/src/config
 SFLAGS=-P -I${TOP_INCDIR}
 RX = ../rx
 CCRULE = ${CC} ${CFLAGS} -c $?
@@ -42,7 +46,7 @@ FSINT = ../fsint
 DES = ../des
 COMERR = ../comerr
 UTIL = ../util
-SYS = ../sys
+SYS = ${srcdir}/../sys
 
 SYSOBJS =\
        syscall.o
diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common
deleted file mode 100644 (file)
index 00a9303..0000000
+++ /dev/null
@@ -1,953 +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
-
-# Common elements for Makefiles for all system types.
-#
-
-SHELL=/bin/sh
-INCLUDE=  -I. -I/usr/include -I${TOP_SRCDIR}/config
-UOBJ   =../UAFS
-WEBOBJ =../AFSWEB
-AFS    =../afs
-RX     =../rx
-AFSINT =../afsint
-DES    =../des
-LIB    =../lib
-NS_INCL =SRC/../afsweb/netscape_includes
-
-# Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
-
-all: ${TOP_LIBDIR}/$(LIBUAFS) linktest
-
-webinstall: all \
-       ${TOP_LIBDIR}/$(LIBAFSWEB) \
-       ${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
-
-linktest: UAFS/$(LIBUAFS) des/libdes.a
-       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest linktest.c -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -I. UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS)
-
-ukinstall: install
-
-install: \
-       ${DESTDIR}${libdir}/$(LIBUAFS)
-
-dest: \
-       ${DEST}/root.perf/include/afs/param.h \
-       ${DEST}/root.perf/include/afs/stds.h \
-       ${DEST}/root.perf/include/afs/afs_sysnames.h \
-       ${DEST}/root.perf/include/afs/afs_stats.h \
-       ${DEST}/root.perf/include/afs/sysincludes.h \
-       ${DEST}/root.perf/include/afs/afs_usrops.h \
-       ${DEST}/root.perf/lib/libdes.a \
-       ${DEST}/root.perf/lib/$(LIBUAFS)
-
-
-CRULE1=        $(CC) $(OPTF) -DKERNEL $(CFLAGS) -c $?
-CRULE2=        $(CC) $(OPTF) $(WEBOPTS) -DKERNEL $(CFLAGS) -c $?
-
-UAFSOBJ = \
-       $(UOBJ)/afs_atomlist.o \
-       $(UOBJ)/afs_lhash.o \
-       $(UOBJ)/afs_analyze.o \
-       $(UOBJ)/afs_axscache.o  \
-       $(UOBJ)/afs_buffer.o    \
-       $(UOBJ)/afs_callback.o  \
-       $(UOBJ)/afs_cbqueue.o    \
-       $(UOBJ)/afs_cell.o \
-       $(UOBJ)/afs_chunk.o             \
-       $(UOBJ)/afs_conn.o \
-       $(UOBJ)/afs_daemons.o   \
-       $(UOBJ)/afs_dcache.o \
-       $(UOBJ)/afs_dir.o               \
-       $(UOBJ)/afs_dynroot.o \
-       $(UOBJ)/afs_init.o \
-       $(UOBJ)/afs_lock.o      \
-       $(UOBJ)/afs_mariner.o \
-       $(UOBJ)/afs_memcache.o  \
-       $(UOBJ)/afs_osidnlc.o   \
-       $(UOBJ)/afs_osi_pag.o \
-       $(UOBJ)/afs_segments.o \
-       $(UOBJ)/afs_server.o \
-       $(UOBJ)/afs_stat.o \
-       $(UOBJ)/afs_user.o \
-       $(UOBJ)/afs_util.o \
-       $(UOBJ)/afs_vcache.o \
-       $(UOBJ)/afs_osi_uio.o \
-       $(UOBJ)/afs_vnop_access.o \
-       $(UOBJ)/afs_vnop_attrs.o \
-       $(UOBJ)/afs_vnop_create.o \
-       $(UOBJ)/afs_vnop_dirops.o \
-       $(UOBJ)/afs_vnop_fid.o \
-       $(UOBJ)/afs_vnop_flock.o \
-       $(UOBJ)/afs_vnop_link.o \
-       $(UOBJ)/afs_vnop_lookup.o \
-       $(UOBJ)/afs_vnop_open.o \
-       $(UOBJ)/afs_vnop_read.o \
-       $(UOBJ)/afs_vnop_readdir.o \
-       $(UOBJ)/afs_vnop_remove.o \
-       $(UOBJ)/afs_vnop_rename.o \
-       $(UOBJ)/afs_vnop_strategy.o \
-       $(UOBJ)/afs_vnop_symlink.o \
-       $(UOBJ)/afs_vnop_write.o \
-       $(UOBJ)/afs_volume.o \
-       $(UOBJ)/afs_call.o \
-       $(UOBJ)/afs_pioctl.o \
-       $(UOBJ)/osi_vfsops.o \
-       $(UOBJ)/afs_usrops.o \
-       $(UOBJ)/xdr_afsuuid.o \
-       $(UOBJ)/afs_uuid.o \
-       $(UOBJ)/osi_vnodeops.o \
-       $(UOBJ)/osi_vm.o \
-       $(UOBJ)/osi_groups.o \
-       $(UOBJ)/afsaux.o \
-       $(UOBJ)/Kvice.xdr.o \
-       $(UOBJ)/xdr_arrayn.o \
-       $(UOBJ)/Kvice.cs.o \
-       $(UOBJ)/fcrypt.o \
-       $(UOBJ)/rx.o \
-       $(UOBJ)/rx_rdwr.o \
-       $(UOBJ)/rx_clock.o \
-       $(UOBJ)/rx_event.o \
-       $(UOBJ)/rx_globals.o \
-       $(UOBJ)/rx_knet.o \
-       $(UOBJ)/rx_kcommon.o \
-       $(UOBJ)/rx_misc.o \
-       $(UOBJ)/rx_null.o \
-       $(UOBJ)/rx_getaddr.o \
-       $(UOBJ)/rx_packet.o \
-       $(UOBJ)/rx_conncache.o \
-       $(UOBJ)/xdr_rx.o \
-       $(UOBJ)/Kvldbint.cs.o \
-       $(UOBJ)/Kvldbint.xdr.o \
-       $(UOBJ)/Kcallback.ss.o \
-       $(UOBJ)/crypt_conn.o \
-       $(UOBJ)/AFS_component_version_number.o \
-       $(UOBJ)/afs_exporter.o \
-       $(UOBJ)/rxkad_client.o \
-       $(UOBJ)/rxkad_common.o \
-       $(UOBJ)/casestrcpy.o \
-       $(UOBJ)/dirpath.o \
-       $(UOBJ)/fileutil.o \
-       $(UOBJ)/netutils.o \
-       $(UOBJ)/et_name.o \
-       $(UOBJ)/com_err.o \
-       $(UOBJ)/error_msg.o \
-       $(UOBJ)/uerrors.o \
-       $(UOBJ)/kaerrors.o \
-       $(UOBJ)/ktc_errors.o \
-       $(UOBJ)/rxkad_errs.o \
-       $(UOBJ)/authclient.o \
-       $(UOBJ)/authcon.o \
-       $(UOBJ)/cellconfig.o \
-       $(UOBJ)/client.o \
-       $(UOBJ)/acfg_errors.o \
-       $(UOBJ)/kaaux.o \
-       $(UOBJ)/kalocalcell.o \
-       $(UOBJ)/kauth.cs.o \
-       $(UOBJ)/kauth.xdr.o \
-       $(UOBJ)/ktc.o \
-       $(UOBJ)/ptint.cs.o \
-       $(UOBJ)/ptint.xdr.o \
-       $(UOBJ)/ptuser.o \
-       $(UOBJ)/pterror.o \
-       $(UOBJ)/ticket.o \
-       $(UOBJ)/token.o \
-       $(UOBJ)/ubik_int.cs.o \
-       $(UOBJ)/ubik_int.xdr.o \
-       $(UOBJ)/ubikclient.o \
-       $(UOBJ)/user.o \
-       $(UOBJ)/hostparse.o \
-       $(UOBJ)/Krxstat.ss.o \
-       $(UOBJ)/Krxstat.xdr.o \
-       $(UOBJ)/rxstat.o \
-       $(UOBJ)/xdr_int64.o
-
-AFSWEBOBJ = \
-       $(WEBOBJ)/afs_atomlist.o \
-       $(WEBOBJ)/afs_lhash.o \
-       $(WEBOBJ)/afs_analyze.o \
-       $(WEBOBJ)/afs_axscache.o \
-       $(WEBOBJ)/afs_buffer.o \
-       $(WEBOBJ)/afs_callback.o \
-       $(WEBOBJ)/afs_cbqueue.o \
-       $(WEBOBJ)/afs_cell.o \
-       $(WEBOBJ)/afs_chunk.o \
-       $(WEBOBJ)/afs_conn.o \
-       $(WEBOBJ)/afs_daemons.o \
-       $(WEBOBJ)/afs_dcache.o \
-       $(WEBOBJ)/afs_dir.o \
-       $(WEBOBJ)/afs_dynroot.o \
-       $(WEBOBJ)/afs_init.o \
-       $(WEBOBJ)/afs_lock.o \
-       $(WEBOBJ)/afs_mariner.o \
-       $(WEBOBJ)/afs_memcache.o \
-       $(WEBOBJ)/afs_osidnlc.o \
-       $(WEBOBJ)/afs_osi_pag.o \
-       $(WEBOBJ)/afs_segments.o \
-       $(WEBOBJ)/afs_server.o \
-       $(WEBOBJ)/afs_stat.o \
-       $(WEBOBJ)/afs_user.o \
-       $(WEBOBJ)/afs_util.o \
-       $(WEBOBJ)/afs_vcache.o \
-       $(WEBOBJ)/afs_osi_uio.o \
-       $(WEBOBJ)/afs_vnop_access.o \
-       $(WEBOBJ)/afs_vnop_attrs.o \
-       $(WEBOBJ)/afs_vnop_create.o \
-       $(WEBOBJ)/afs_vnop_dirops.o \
-       $(WEBOBJ)/afs_vnop_fid.o \
-       $(WEBOBJ)/afs_vnop_flock.o \
-       $(WEBOBJ)/afs_vnop_link.o \
-       $(WEBOBJ)/afs_vnop_lookup.o \
-       $(WEBOBJ)/afs_vnop_open.o \
-       $(WEBOBJ)/afs_vnop_read.o \
-       $(WEBOBJ)/afs_vnop_readdir.o \
-       $(WEBOBJ)/afs_vnop_remove.o \
-       $(WEBOBJ)/afs_vnop_rename.o \
-       $(WEBOBJ)/afs_vnop_strategy.o \
-       $(WEBOBJ)/afs_vnop_symlink.o \
-       $(WEBOBJ)/afs_vnop_write.o \
-       $(WEBOBJ)/afs_volume.o \
-       $(WEBOBJ)/afs_call.o \
-       $(WEBOBJ)/afs_pioctl.o \
-       $(WEBOBJ)/osi_vfsops.o \
-       $(WEBOBJ)/afs_usrops.o \
-       $(WEBOBJ)/xdr_afsuuid.o \
-       $(WEBOBJ)/afs_uuid.o \
-       $(WEBOBJ)/osi_vnodeops.o \
-       $(WEBOBJ)/osi_vm.o \
-       $(WEBOBJ)/osi_groups.o \
-       $(WEBOBJ)/afsaux.o \
-       $(WEBOBJ)/Kvice.xdr.o \
-       $(WEBOBJ)/xdr_arrayn.o \
-       $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
-       $(WEBOBJ)/rx.o \
-       $(WEBOBJ)/rx_rdwr.o \
-       $(WEBOBJ)/rx_clock.o \
-       $(WEBOBJ)/rx_event.o \
-       $(WEBOBJ)/rx_globals.o \
-       $(WEBOBJ)/rx_knet.o \
-       $(WEBOBJ)/rx_kcommon.o \
-       $(WEBOBJ)/rx_misc.o \
-       $(WEBOBJ)/rx_null.o \
-       $(WEBOBJ)/rx_getaddr.o \
-       $(WEBOBJ)/rx_packet.o \
-       $(WEBOBJ)/rx_conncache.o \
-       $(WEBOBJ)/xdr_rx.o \
-       $(WEBOBJ)/Kvldbint.cs.o \
-       $(WEBOBJ)/Kvldbint.xdr.o \
-       $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
-       $(WEBOBJ)/AFS_component_version_number.o \
-       $(WEBOBJ)/afs_exporter.o \
-       $(WEBOBJ)/rxkad_client.o \
-       $(WEBOBJ)/rxkad_common.o \
-       $(WEBOBJ)/casestrcpy.o \
-       $(WEBOBJ)/dirpath.o \
-       $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netutils.o \
-       $(WEBOBJ)/et_name.o \
-       $(WEBOBJ)/com_err.o \
-       $(WEBOBJ)/error_msg.o \
-       $(WEBOBJ)/uerrors.o \
-       $(WEBOBJ)/kaerrors.o \
-       $(WEBOBJ)/ktc_errors.o \
-       $(WEBOBJ)/rxkad_errs.o \
-       $(WEBOBJ)/authclient.o \
-       $(WEBOBJ)/authcon.o \
-       $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/client.o \
-       $(WEBOBJ)/acfg_errors.o \
-       $(WEBOBJ)/kaaux.o \
-       $(WEBOBJ)/kalocalcell.o \
-       $(WEBOBJ)/kauth.cs.o \
-       $(WEBOBJ)/kauth.xdr.o \
-       $(WEBOBJ)/ktc.o \
-       $(WEBOBJ)/ptint.cs.o \
-       $(WEBOBJ)/ptint.xdr.o \
-       $(WEBOBJ)/ptuser.o \
-       $(WEBOBJ)/pterror.o \
-       $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/token.o \
-       $(WEBOBJ)/ubik_int.cs.o \
-       $(WEBOBJ)/ubik_int.xdr.o \
-       $(WEBOBJ)/ubikclient.o \
-       $(WEBOBJ)/user.o \
-       $(WEBOBJ)/hostparse.o \
-       $(WEBOBJ)/nsafs.o \
-       $(WEBOBJ)/Krxstat.ss.o \
-       $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o
-
-
-AFSWEBOBJKRB = \
-       $(WEBOBJ)/afs_atomlist.o \
-       $(WEBOBJ)/afs_lhash.o \
-       $(WEBOBJ)/afs_analyze.o \
-       $(WEBOBJ)/afs_axscache.o \
-       $(WEBOBJ)/afs_buffer.o \
-       $(WEBOBJ)/afs_callback.o \
-       $(WEBOBJ)/afs_cbqueue.o \
-       $(WEBOBJ)/afs_cell.o \
-       $(WEBOBJ)/afs_chunk.o \
-       $(WEBOBJ)/afs_conn.o \
-       $(WEBOBJ)/afs_daemons.o \
-       $(WEBOBJ)/afs_dcache.o \
-       $(WEBOBJ)/afs_dir.o \
-       $(WEBOBJ)/afs_dynroot.o \
-       $(WEBOBJ)/afs_init.o \
-       $(WEBOBJ)/afs_lock.o \
-       $(WEBOBJ)/afs_mariner.o \
-       $(WEBOBJ)/afs_memcache.o \
-       $(WEBOBJ)/afs_osidnlc.o \
-       $(WEBOBJ)/afs_osi_pag.o \
-       $(WEBOBJ)/afs_segments.o \
-       $(WEBOBJ)/afs_server.o \
-       $(WEBOBJ)/afs_stat.o \
-       $(WEBOBJ)/afs_user.o \
-       $(WEBOBJ)/afs_util.o \
-       $(WEBOBJ)/afs_vcache.o \
-       $(WEBOBJ)/afs_osi_uio.o \
-       $(WEBOBJ)/afs_vnop_access.o \
-       $(WEBOBJ)/afs_vnop_attrs.o \
-       $(WEBOBJ)/afs_vnop_create.o \
-       $(WEBOBJ)/afs_vnop_dirops.o \
-       $(WEBOBJ)/afs_vnop_fid.o \
-       $(WEBOBJ)/afs_vnop_flock.o \
-       $(WEBOBJ)/afs_vnop_link.o \
-       $(WEBOBJ)/afs_vnop_lookup.o \
-       $(WEBOBJ)/afs_vnop_open.o \
-       $(WEBOBJ)/afs_vnop_read.o \
-       $(WEBOBJ)/afs_vnop_readdir.o \
-       $(WEBOBJ)/afs_vnop_remove.o \
-       $(WEBOBJ)/afs_vnop_rename.o \
-       $(WEBOBJ)/afs_vnop_strategy.o \
-       $(WEBOBJ)/afs_vnop_symlink.o \
-       $(WEBOBJ)/afs_vnop_write.o \
-       $(WEBOBJ)/afs_volume.o \
-       $(WEBOBJ)/afs_call.o \
-       $(WEBOBJ)/afs_pioctl.o \
-       $(WEBOBJ)/osi_vfsops.o \
-       $(WEBOBJ)/afs_usrops.o \
-       $(WEBOBJ)/osi_vnodeops.o \
-       $(WEBOBJ)/osi_vm.o \
-       $(WEBOBJ)/osi_groups.o \
-       $(WEBOBJ)/afsaux.o \
-       $(WEBOBJ)/Kvice.xdr.o \
-       $(WEBOBJ)/xdr_arrayn.o \
-       $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
-       $(WEBOBJ)/rx.o \
-       $(WEBOBJ)/rx_rdwr.o \
-       $(WEBOBJ)/rx_clock.o \
-       $(WEBOBJ)/rx_event.o \
-       $(WEBOBJ)/rx_globals.o \
-       $(WEBOBJ)/rx_knet.o \
-       $(WEBOBJ)/rx_kcommon.o \
-       $(WEBOBJ)/rx_misc.o \
-       $(WEBOBJ)/rx_null.o \
-       $(WEBOBJ)/rx_getaddr.o \
-       $(WEBOBJ)/rx_packet.o \
-       $(WEBOBJ)/rx_conncache.o \
-       $(WEBOBJ)/xdr_rx.o \
-       $(WEBOBJ)/Kvldbint.cs.o \
-       $(WEBOBJ)/Kvldbint.xdr.o \
-       $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
-       $(WEBOBJ)/AFS_component_version_number.o \
-       $(WEBOBJ)/afs_exporter.o \
-       $(WEBOBJ)/rxkad_client.o \
-       $(WEBOBJ)/rxkad_common.o \
-       $(WEBOBJ)/casestrcpy.o \
-       $(WEBOBJ)/dirpath.o \
-       $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netutils.o \
-       $(WEBOBJ)/et_name.o \
-       $(WEBOBJ)/com_err.o \
-       $(WEBOBJ)/error_msg.o \
-       $(WEBOBJ)/uerrors.o \
-       $(WEBOBJ)/kaerrors.o \
-       $(WEBOBJ)/ktc_errors.o \
-       $(WEBOBJ)/rxkad_errs.o \
-       $(WEBOBJ)/authclient.o \
-       $(WEBOBJ)/authcon.o \
-       $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/client.o \
-       $(WEBOBJ)/acfg_errors.o \
-       $(WEBOBJ)/kaaux.o \
-       $(WEBOBJ)/kalocalcell.o \
-       $(WEBOBJ)/kauth.cs.o \
-       $(WEBOBJ)/kauth.xdr.o \
-       $(WEBOBJ)/ktc.krb.o \
-       $(WEBOBJ)/ptint.cs.o \
-       $(WEBOBJ)/ptint.xdr.o \
-       $(WEBOBJ)/ptuser.o \
-       $(WEBOBJ)/pterror.o \
-       $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/token.o \
-       $(WEBOBJ)/ubik_int.cs.o \
-       $(WEBOBJ)/ubik_int.xdr.o \
-       $(WEBOBJ)/ubikclient.o \
-       $(WEBOBJ)/user.o \
-       $(WEBOBJ)/nsafs.o \
-       $(WEBOBJ)/Krxstat.ss.o \
-       $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o
-
-# Compilation rules
-
-# These files are for the user space library
-
-$(UOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE1);
-$(UOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE1);
-$(UOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
-       $(CRULE1);
-$(UOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
-       $(CRULE1);
-$(UOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
-       $(CRULE1);
-$(UOBJ)/afs_cell.o: $(AFS)/afs_cell.c
-       $(CRULE1);
-$(UOBJ)/afs_conn.o: $(AFS)/afs_conn.c
-       $(CRULE1);
-$(UOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
-       $(CRULE1);
-$(UOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
-       $(CRULE1);
-$(UOBJ)/afs_init.o: $(AFS)/afs_init.c
-       $(CRULE1);
-$(UOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
-       $(CRULE1);
-$(UOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
-       $(CRULE1);
-$(UOBJ)/afs_osi.o:     $(AFS)/afs_osi.c
-       $(CRULE1);
-$(UOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
-       $(CRULE1);
-$(UOBJ)/afs_segments.o: $(AFS)/afs_segments.c
-       $(CRULE1);
-$(UOBJ)/afs_server.o: $(AFS)/afs_server.c
-       $(CRULE1);
-$(UOBJ)/afs_user.o: $(AFS)/afs_user.c
-       $(CRULE1);
-$(UOBJ)/afs_util.o: $(AFS)/afs_util.c
-       $(CRULE1);
-$(UOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
-       $(CRULE1);
-$(UOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
-       $(CRULE1);
-$(UOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
-       $(CRULE1);
-$(UOBJ)/afs_volume.o: $(AFS)/afs_volume.c
-       $(CRULE1);
-$(UOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
-       $(CRULE1);
-$(UOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
-       $(CRULE1);
-$(UOBJ)/afs_callback.o: $(AFS)/afs_callback.c
-       $(CRULE1);
-$(UOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
-       $(CRULE1);
-$(UOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
-       $(CRULE1);
-$(UOBJ)/afs_dir.o:     $(AFS)/afs_dir.c
-       $(CRULE1);
-$(UOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
-       $(CRULE1);
-$(UOBJ)/afs_lock.o: $(AFS)/afs_lock.c
-       $(CRULE1);
-$(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
-       $(CRULE1);
-$(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c
-       $(CRULE1);
-$(UOBJ)/fcrypt.o:      $(AFS)/fcrypt.c
-       $(CRULE1);
-$(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
-       $(CRULE1);
-$(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
-       $(CRULE1);
-$(UOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
-       $(CRULE1);
-$(UOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
-       $(CRULE1);
-$(UOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
-       $(CRULE1);
-$(UOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
-       $(CRULE1);
-$(UOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
-       $(CRULE1);
-$(UOBJ)/rx.o: $(RX)/rx.c
-       $(CRULE1);
-$(UOBJ)/rx_clock.o: $(RX)/rx_clock.c
-       $(CRULE1);
-$(UOBJ)/rx_event.o: $(RX)/rx_event.c
-       $(CRULE1);
-$(UOBJ)/rx_globals.o: $(RX)/rx_globals.c
-       $(CRULE1);
-$(UOBJ)/rx_misc.o: $(RX)/rx_misc.c
-       $(CRULE1);
-$(UOBJ)/rx_null.o: $(RX)/rx_null.c
-       $(CRULE1);
-$(UOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
-       $(CRULE1);
-$(UOBJ)/rx_packet.o: $(RX)/rx_packet.c
-       $(CRULE1);
-$(UOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
-       $(CRULE1);
-$(UOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
-       $(CRULE1);
-$(UOBJ)/xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
-$(UOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
-       $(CRULE1);
-$(UOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE1);
-$(UOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
-       $(CRULE1);
-$(UOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
-$(UOBJ)/osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
-$(UOBJ)/osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
-$(UOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
-       $(CRULE1);
-$(UOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
-       $(CRULE1);
-$(UOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
-       $(CRULE1);
-$(UOBJ)/afsaux.o: $(AFSINT)/afsaux.c
-       $(CRULE1);
-$(UOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
-       $(CRULE1);
-$(UOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
-       $(CRULE1);
-$(UOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
-       $(CRULE1);
-$(UOBJ)/afs_main.o: $(AFS)/afs_main.c
-       $(CRULE1);
-$(UOBJ)/rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE1);
-$(UOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
-       $(CRULE1);
-$(UOBJ)/afs_call.o: $(AFS)/afs_call.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(UOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(UOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS;
-$(UOBJ)/ktc.o:         $(AFS)/ktc.c
-       $(CRULE1);
-$(UOBJ)/ticket.o: $(AFS)/ticket.c
-       $(CRULE1);
-$(UOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
-       $(CRULE1);
-$(UOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
-       $(CRULE1);
-$(UOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
-       $(CRULE1);
-$(UOBJ)/ptuser.o: $(AFS)/ptuser.c
-       $(CRULE1);
-$(UOBJ)/pterror.o: $(AFS)/pterror.c
-       $(CRULE1);
-$(UOBJ)/ubikclient.o: $(AFS)/ubikclient.c
-       $(CRULE1);
-$(UOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
-       $(CRULE1);
-$(UOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
-       $(CRULE1);
-$(UOBJ)/authclient.o: $(AFS)/authclient.c
-       $(CRULE1);
-$(UOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
-       $(CRULE1);
-$(UOBJ)/client.o: $(AFS)/client.c
-       $(CRULE1);
-$(UOBJ)/user.o: $(AFS)/user.c
-       $(CRULE1);
-$(UOBJ)/hostparse.o: $(AFS)/hostparse.c
-       $(CRULE1);
-$(UOBJ)/token.o: $(AFS)/token.c
-       $(CRULE1);
-$(UOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
-       $(CRULE1);
-$(UOBJ)/kaaux.o: $(AFS)/kaaux.c
-       $(CRULE1);
-$(UOBJ)/authcon.o: $(AFS)/authcon.c
-       $(CRULE1);
-$(UOBJ)/cellconfig.o: $(AFS)/cellconfig.c
-       $(CRULE1);
-$(UOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
-       $(CRULE1);
-$(UOBJ)/dirpath.o: $(AFS)/dirpath.c
-       $(CRULE1);
-$(UOBJ)/fileutil.o: $(AFS)/fileutil.c
-       $(CRULE1);
-$(UOBJ)/netutils.o: $(AFS)/netutils.c
-       $(CRULE1);
-$(UOBJ)/et_name.o: $(AFS)/et_name.c
-       $(CRULE1);
-$(UOBJ)/com_err.o: $(AFS)/com_err.c
-       $(CRULE1);
-$(UOBJ)/error_msg.o: $(AFS)/error_msg.c
-       $(CRULE1);
-$(UOBJ)/uerrors.o: $(AFS)/uerrors.c
-       $(CRULE1);
-$(UOBJ)/kaerrors.o: $(AFS)/kaerrors.c
-       $(CRULE1);
-$(UOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
-       $(CRULE1);
-$(UOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
-       $(CRULE1);
-$(UOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
-       $(CRULE1);
-$(UOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
-       $(CRULE1);
-$(UOBJ)/rxstat.o: $(AFSINT)/rxstat.c
-       $(CRULE1);
-$(UOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
-       $(CRULE1);
-$(UOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
-       $(CRULE1);
-
-# These files are for the netscape plugin
-
-$(WEBOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
-       $(CRULE2);
-$(WEBOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
-       $(CRULE2);
-$(WEBOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
-       $(CRULE2);
-$(WEBOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
-       $(CRULE2);
-$(WEBOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
-       $(CRULE2);
-$(WEBOBJ)/afs_cell.o: $(AFS)/afs_cell.c
-       $(CRULE2);
-$(WEBOBJ)/afs_conn.o: $(AFS)/afs_conn.c
-       $(CRULE2);
-$(WEBOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
-       $(CRULE2);
-$(WEBOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
-       $(CRULE2);
-$(WEBOBJ)/afs_init.o: $(AFS)/afs_init.c
-       $(CRULE2);
-$(WEBOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
-       $(CRULE2);
-$(WEBOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
-       $(CRULE2);
-$(WEBOBJ)/afs_osi.o:   $(AFS)/afs_osi.c
-       $(CRULE2);
-$(WEBOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
-       $(CRULE2);
-$(WEBOBJ)/afs_segments.o: $(AFS)/afs_segments.c
-       $(CRULE2);
-$(WEBOBJ)/afs_server.o: $(AFS)/afs_server.c
-       $(CRULE2);
-$(WEBOBJ)/afs_user.o: $(AFS)/afs_user.c
-       $(CRULE2);
-$(WEBOBJ)/afs_util.o: $(AFS)/afs_util.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
-       $(CRULE2);
-$(WEBOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
-       $(CRULE2);
-$(WEBOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
-       $(CRULE2);
-$(WEBOBJ)/afs_volume.o: $(AFS)/afs_volume.c
-       $(CRULE2);
-$(WEBOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
-       $(CRULE2);
-$(WEBOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
-       $(CRULE2);
-$(WEBOBJ)/afs_callback.o: $(AFS)/afs_callback.c
-       $(CRULE2);
-$(WEBOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
-       $(CRULE2);
-$(WEBOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
-       $(CRULE2);
-$(WEBOBJ)/afs_dir.o:   $(AFS)/afs_dir.c
-       $(CRULE2);
-$(WEBOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
-       $(CRULE2);
-$(WEBOBJ)/afs_lock.o: $(AFS)/afs_lock.c
-       $(CRULE2);
-$(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
-       $(CRULE2);
-$(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c
-       $(CRULE2);
-$(WEBOBJ)/fcrypt.o:    $(AFS)/fcrypt.c
-       $(CRULE2);
-$(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
-       $(CRULE2);
-$(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
-       $(CRULE2);
-$(WEBOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
-       $(CRULE2);
-$(WEBOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
-       $(CRULE2);
-$(WEBOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
-       $(CRULE2);
-$(WEBOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
-       $(CRULE2);
-$(WEBOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
-       $(CRULE2);
-$(WEBOBJ)/rx.o: $(RX)/rx.c
-       $(CRULE2);
-$(WEBOBJ)/rx_clock.o: $(RX)/rx_clock.c
-       $(CRULE2);
-$(WEBOBJ)/rx_event.o: $(RX)/rx_event.c
-       $(CRULE2);
-$(WEBOBJ)/rx_globals.o: $(RX)/rx_globals.c
-       $(CRULE2);
-$(WEBOBJ)/rx_misc.o: $(RX)/rx_misc.c
-       $(CRULE2);
-$(WEBOBJ)/rx_null.o: $(RX)/rx_null.c
-       $(CRULE2);
-$(WEBOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
-       $(CRULE2);
-$(WEBOBJ)/rx_packet.o: $(RX)/rx_packet.c
-       $(CRULE2);
-$(WEBOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
-       $(CRULE2);
-$(WEBOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
-       $(CRULE2);
-$(WEBOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
-       $(CRULE2);
-$(WEBOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
-       $(CRULE2);
-$(WEBOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
-       $(CRULE2);
-$(WEBOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE2);
-$(WEBOBJ)/osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE2);
-$(WEBOBJ)/osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE2);
-$(WEBOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
-       $(CRULE2);
-$(WEBOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
-       $(CRULE2);
-$(WEBOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
-       $(CRULE2);
-$(WEBOBJ)/afsaux.o: $(AFSINT)/afsaux.c
-       $(CRULE2);
-$(WEBOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
-       $(CRULE2);
-$(WEBOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
-       $(CRULE2);
-$(WEBOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
-       $(CRULE2);
-$(WEBOBJ)/afs_main.o: $(AFS)/afs_main.c
-       $(CRULE2);
-$(WEBOBJ)/rx_knet.o: $(RX)/rx_knet.c
-       $(CRULE2);
-$(WEBOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
-       $(CRULE2);
-$(WEBOBJ)/afs_call.o: $(AFS)/afs_call.c
-       $(CRULE2) -DAFS_NONFSTRANS;
-$(WEBOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
-       $(CRULE2) -DAFS_NONFSTRANS;
-$(WEBOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE2) -DAFS_NONFSTRANS;
-$(WEBOBJ)/ktc.o:       $(AFS)/ktc.c
-       $(CRULE2);
-$(WEBOBJ)/ktc.krb.o:   $(AFS)/ktc.c
-       $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC ;
-       mv ktc.o ktc.krb.o;
-$(WEBOBJ)/securehash.o: $(AFS)/securehash.c
-       $(CRULE2);
-$(WEBOBJ)/nsafs.o: $(AFS)/nsafs.c
-       $(CRULE2);
-$(WEBOBJ)/ticket.o: $(AFS)/ticket.c
-       $(CRULE2);
-$(WEBOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
-       $(CRULE2);
-$(WEBOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
-       $(CRULE2);
-$(WEBOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
-       $(CRULE2);
-$(WEBOBJ)/ptuser.o: $(AFS)/ptuser.c
-       $(CRULE2);
-$(WEBOBJ)/pterror.o: $(AFS)/pterror.c
-       $(CRULE2);
-$(WEBOBJ)/ubikclient.o: $(AFS)/ubikclient.c
-       $(CRULE2);
-$(WEBOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
-       $(CRULE2);
-$(WEBOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
-       $(CRULE2);
-$(WEBOBJ)/authclient.o: $(AFS)/authclient.c
-       $(CRULE2);
-$(WEBOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
-       $(CRULE2);
-$(WEBOBJ)/client.o: $(AFS)/client.c
-       $(CRULE2);
-$(WEBOBJ)/user.o: $(AFS)/user.c
-       $(CRULE2);
-$(WEBOBJ)/hostparse.o: $(AFS)/hostparse.c
-       $(CRULE2);
-$(WEBOBJ)/token.o: $(AFS)/token.c
-       $(CRULE2);
-$(WEBOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
-       $(CRULE2);
-$(WEBOBJ)/kaaux.o: $(AFS)/kaaux.c
-       $(CRULE2);
-$(WEBOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
-       $(CRULE2);
-$(WEBOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
-       $(CRULE2);
-$(WEBOBJ)/authcon.o: $(AFS)/authcon.c
-       $(CRULE2);
-$(WEBOBJ)/cellconfig.o: $(AFS)/cellconfig.c
-       $(CRULE2);
-$(WEBOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
-       $(CRULE1);
-$(WEBOBJ)/dirpath.o: $(AFS)/dirpath.c
-       $(CRULE1);
-$(WEBOBJ)/fileutil.o: $(AFS)/fileutil.c
-       $(CRULE1);
-$(WEBOBJ)/netutils.o: $(AFS)/netutils.c
-       $(CRULE1);
-$(WEBOBJ)/et_name.o: $(AFS)/et_name.c
-       $(CRULE2);
-$(WEBOBJ)/com_err.o: $(AFS)/com_err.c
-       $(CRULE2);
-$(WEBOBJ)/error_msg.o: $(AFS)/error_msg.c
-       $(CRULE2);
-$(WEBOBJ)/uerrors.o: $(AFS)/uerrors.c
-       $(CRULE2);
-$(WEBOBJ)/kaerrors.o: $(AFS)/kaerrors.c
-       $(CRULE2);
-$(WEBOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
-       $(CRULE2);
-$(WEBOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
-       $(CRULE2);
-$(WEBOBJ)/rxstat.o: $(AFSINT)/rxstat.c
-       $(CRULE2);
-$(WEBOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
-       $(CRULE2);
-$(WEBOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
-       $(CRULE2);
-
-clean:
-       -$(RM) -rf UAFS* AFSWEB* nsapi des afs afsint config rx
-       -$(RM) -f  h net netinet rpc ufs machine inet nfs sys des linktest
-
-
-${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS)
-       ${INSTALL} $? $@
-
-
-${DESTDIR}${libdir}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-       ${INSTALL} $? $@
-
-${DESTDIR}${libdir}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-       ${INSTALL} $? $@
-
-${DESTDIR}${libdir}/$(LIBUAFS): UAFS/$(LIBUAFS)
-       ${INSTALL} $? $@
-
-
-${DEST}/root.afsweb/usr/lib/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-       ${INSTALL} $? $@
-
-${DEST}/root.afsweb/usr/lib/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/param.h: afs/param.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/stds.h: afs/stds.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_sysnames.h: afs/afs_sysnames.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_stats.h: afs/afs_stats.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/sysincludes.h: afs/sysincludes.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_usrops.h: afs/afs_usrops.h
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/lib/libdes.a: des/libdes.a
-       ${INSTALL} $? $@
-
-${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS)
-       ${INSTALL} $? $@
diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
new file mode 100644 (file)
index 0000000..bf1043f
--- /dev/null
@@ -0,0 +1,953 @@
+# 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
+
+# Common elements for Makefiles for all system types.
+#
+
+SHELL=/bin/sh
+INCLUDE=  -I. -I/usr/include -I${TOP_OBJDIR}/src/config
+UOBJ   =../UAFS
+WEBOBJ =../AFSWEB
+AFS    =../afs
+RX     =../rx
+AFSINT =../afsint
+DES    =../des
+LIB    =../lib
+NS_INCL =SRC/../afsweb/netscape_includes
+
+# Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
+
+all: ${TOP_LIBDIR}/$(LIBUAFS) linktest
+
+webinstall: all \
+       ${TOP_LIBDIR}/$(LIBAFSWEB) \
+       ${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
+
+linktest: UAFS/$(LIBUAFS) des/libdes.a
+       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -I. UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS)
+
+ukinstall: install
+
+install: \
+       ${DESTDIR}${libdir}/$(LIBUAFS)
+
+dest: \
+       ${DEST}/root.perf/include/afs/param.h \
+       ${DEST}/root.perf/include/afs/stds.h \
+       ${DEST}/root.perf/include/afs/afs_sysnames.h \
+       ${DEST}/root.perf/include/afs/afs_stats.h \
+       ${DEST}/root.perf/include/afs/sysincludes.h \
+       ${DEST}/root.perf/include/afs/afs_usrops.h \
+       ${DEST}/root.perf/lib/libdes.a \
+       ${DEST}/root.perf/lib/$(LIBUAFS)
+
+
+CRULE1=        $(CC) $(OPTF) -DKERNEL $(CFLAGS) -c $?
+CRULE2=        $(CC) $(OPTF) $(WEBOPTS) -DKERNEL $(CFLAGS) -c $?
+
+UAFSOBJ = \
+       $(UOBJ)/afs_atomlist.o \
+       $(UOBJ)/afs_lhash.o \
+       $(UOBJ)/afs_analyze.o \
+       $(UOBJ)/afs_axscache.o  \
+       $(UOBJ)/afs_buffer.o    \
+       $(UOBJ)/afs_callback.o  \
+       $(UOBJ)/afs_cbqueue.o    \
+       $(UOBJ)/afs_cell.o \
+       $(UOBJ)/afs_chunk.o             \
+       $(UOBJ)/afs_conn.o \
+       $(UOBJ)/afs_daemons.o   \
+       $(UOBJ)/afs_dcache.o \
+       $(UOBJ)/afs_dir.o               \
+       $(UOBJ)/afs_dynroot.o \
+       $(UOBJ)/afs_init.o \
+       $(UOBJ)/afs_lock.o      \
+       $(UOBJ)/afs_mariner.o \
+       $(UOBJ)/afs_memcache.o  \
+       $(UOBJ)/afs_osidnlc.o   \
+       $(UOBJ)/afs_osi_pag.o \
+       $(UOBJ)/afs_segments.o \
+       $(UOBJ)/afs_server.o \
+       $(UOBJ)/afs_stat.o \
+       $(UOBJ)/afs_user.o \
+       $(UOBJ)/afs_util.o \
+       $(UOBJ)/afs_vcache.o \
+       $(UOBJ)/afs_osi_uio.o \
+       $(UOBJ)/afs_vnop_access.o \
+       $(UOBJ)/afs_vnop_attrs.o \
+       $(UOBJ)/afs_vnop_create.o \
+       $(UOBJ)/afs_vnop_dirops.o \
+       $(UOBJ)/afs_vnop_fid.o \
+       $(UOBJ)/afs_vnop_flock.o \
+       $(UOBJ)/afs_vnop_link.o \
+       $(UOBJ)/afs_vnop_lookup.o \
+       $(UOBJ)/afs_vnop_open.o \
+       $(UOBJ)/afs_vnop_read.o \
+       $(UOBJ)/afs_vnop_readdir.o \
+       $(UOBJ)/afs_vnop_remove.o \
+       $(UOBJ)/afs_vnop_rename.o \
+       $(UOBJ)/afs_vnop_strategy.o \
+       $(UOBJ)/afs_vnop_symlink.o \
+       $(UOBJ)/afs_vnop_write.o \
+       $(UOBJ)/afs_volume.o \
+       $(UOBJ)/afs_call.o \
+       $(UOBJ)/afs_pioctl.o \
+       $(UOBJ)/osi_vfsops.o \
+       $(UOBJ)/afs_usrops.o \
+       $(UOBJ)/xdr_afsuuid.o \
+       $(UOBJ)/afs_uuid.o \
+       $(UOBJ)/osi_vnodeops.o \
+       $(UOBJ)/osi_vm.o \
+       $(UOBJ)/osi_groups.o \
+       $(UOBJ)/afsaux.o \
+       $(UOBJ)/Kvice.xdr.o \
+       $(UOBJ)/xdr_arrayn.o \
+       $(UOBJ)/Kvice.cs.o \
+       $(UOBJ)/fcrypt.o \
+       $(UOBJ)/rx.o \
+       $(UOBJ)/rx_rdwr.o \
+       $(UOBJ)/rx_clock.o \
+       $(UOBJ)/rx_event.o \
+       $(UOBJ)/rx_globals.o \
+       $(UOBJ)/rx_knet.o \
+       $(UOBJ)/rx_kcommon.o \
+       $(UOBJ)/rx_misc.o \
+       $(UOBJ)/rx_null.o \
+       $(UOBJ)/rx_getaddr.o \
+       $(UOBJ)/rx_packet.o \
+       $(UOBJ)/rx_conncache.o \
+       $(UOBJ)/xdr_rx.o \
+       $(UOBJ)/Kvldbint.cs.o \
+       $(UOBJ)/Kvldbint.xdr.o \
+       $(UOBJ)/Kcallback.ss.o \
+       $(UOBJ)/crypt_conn.o \
+       $(UOBJ)/AFS_component_version_number.o \
+       $(UOBJ)/afs_exporter.o \
+       $(UOBJ)/rxkad_client.o \
+       $(UOBJ)/rxkad_common.o \
+       $(UOBJ)/casestrcpy.o \
+       $(UOBJ)/dirpath.o \
+       $(UOBJ)/fileutil.o \
+       $(UOBJ)/netutils.o \
+       $(UOBJ)/et_name.o \
+       $(UOBJ)/com_err.o \
+       $(UOBJ)/error_msg.o \
+       $(UOBJ)/uerrors.o \
+       $(UOBJ)/kaerrors.o \
+       $(UOBJ)/ktc_errors.o \
+       $(UOBJ)/rxkad_errs.o \
+       $(UOBJ)/authclient.o \
+       $(UOBJ)/authcon.o \
+       $(UOBJ)/cellconfig.o \
+       $(UOBJ)/client.o \
+       $(UOBJ)/acfg_errors.o \
+       $(UOBJ)/kaaux.o \
+       $(UOBJ)/kalocalcell.o \
+       $(UOBJ)/kauth.cs.o \
+       $(UOBJ)/kauth.xdr.o \
+       $(UOBJ)/ktc.o \
+       $(UOBJ)/ptint.cs.o \
+       $(UOBJ)/ptint.xdr.o \
+       $(UOBJ)/ptuser.o \
+       $(UOBJ)/pterror.o \
+       $(UOBJ)/ticket.o \
+       $(UOBJ)/token.o \
+       $(UOBJ)/ubik_int.cs.o \
+       $(UOBJ)/ubik_int.xdr.o \
+       $(UOBJ)/ubikclient.o \
+       $(UOBJ)/user.o \
+       $(UOBJ)/hostparse.o \
+       $(UOBJ)/Krxstat.ss.o \
+       $(UOBJ)/Krxstat.xdr.o \
+       $(UOBJ)/rxstat.o \
+       $(UOBJ)/xdr_int64.o
+
+AFSWEBOBJ = \
+       $(WEBOBJ)/afs_atomlist.o \
+       $(WEBOBJ)/afs_lhash.o \
+       $(WEBOBJ)/afs_analyze.o \
+       $(WEBOBJ)/afs_axscache.o \
+       $(WEBOBJ)/afs_buffer.o \
+       $(WEBOBJ)/afs_callback.o \
+       $(WEBOBJ)/afs_cbqueue.o \
+       $(WEBOBJ)/afs_cell.o \
+       $(WEBOBJ)/afs_chunk.o \
+       $(WEBOBJ)/afs_conn.o \
+       $(WEBOBJ)/afs_daemons.o \
+       $(WEBOBJ)/afs_dcache.o \
+       $(WEBOBJ)/afs_dir.o \
+       $(WEBOBJ)/afs_dynroot.o \
+       $(WEBOBJ)/afs_init.o \
+       $(WEBOBJ)/afs_lock.o \
+       $(WEBOBJ)/afs_mariner.o \
+       $(WEBOBJ)/afs_memcache.o \
+       $(WEBOBJ)/afs_osidnlc.o \
+       $(WEBOBJ)/afs_osi_pag.o \
+       $(WEBOBJ)/afs_segments.o \
+       $(WEBOBJ)/afs_server.o \
+       $(WEBOBJ)/afs_stat.o \
+       $(WEBOBJ)/afs_user.o \
+       $(WEBOBJ)/afs_util.o \
+       $(WEBOBJ)/afs_vcache.o \
+       $(WEBOBJ)/afs_osi_uio.o \
+       $(WEBOBJ)/afs_vnop_access.o \
+       $(WEBOBJ)/afs_vnop_attrs.o \
+       $(WEBOBJ)/afs_vnop_create.o \
+       $(WEBOBJ)/afs_vnop_dirops.o \
+       $(WEBOBJ)/afs_vnop_fid.o \
+       $(WEBOBJ)/afs_vnop_flock.o \
+       $(WEBOBJ)/afs_vnop_link.o \
+       $(WEBOBJ)/afs_vnop_lookup.o \
+       $(WEBOBJ)/afs_vnop_open.o \
+       $(WEBOBJ)/afs_vnop_read.o \
+       $(WEBOBJ)/afs_vnop_readdir.o \
+       $(WEBOBJ)/afs_vnop_remove.o \
+       $(WEBOBJ)/afs_vnop_rename.o \
+       $(WEBOBJ)/afs_vnop_strategy.o \
+       $(WEBOBJ)/afs_vnop_symlink.o \
+       $(WEBOBJ)/afs_vnop_write.o \
+       $(WEBOBJ)/afs_volume.o \
+       $(WEBOBJ)/afs_call.o \
+       $(WEBOBJ)/afs_pioctl.o \
+       $(WEBOBJ)/osi_vfsops.o \
+       $(WEBOBJ)/afs_usrops.o \
+       $(WEBOBJ)/xdr_afsuuid.o \
+       $(WEBOBJ)/afs_uuid.o \
+       $(WEBOBJ)/osi_vnodeops.o \
+       $(WEBOBJ)/osi_vm.o \
+       $(WEBOBJ)/osi_groups.o \
+       $(WEBOBJ)/afsaux.o \
+       $(WEBOBJ)/Kvice.xdr.o \
+       $(WEBOBJ)/xdr_arrayn.o \
+       $(WEBOBJ)/Kvice.cs.o \
+       $(WEBOBJ)/fcrypt.o \
+       $(WEBOBJ)/rx.o \
+       $(WEBOBJ)/rx_rdwr.o \
+       $(WEBOBJ)/rx_clock.o \
+       $(WEBOBJ)/rx_event.o \
+       $(WEBOBJ)/rx_globals.o \
+       $(WEBOBJ)/rx_knet.o \
+       $(WEBOBJ)/rx_kcommon.o \
+       $(WEBOBJ)/rx_misc.o \
+       $(WEBOBJ)/rx_null.o \
+       $(WEBOBJ)/rx_getaddr.o \
+       $(WEBOBJ)/rx_packet.o \
+       $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/xdr_rx.o \
+       $(WEBOBJ)/Kvldbint.cs.o \
+       $(WEBOBJ)/Kvldbint.xdr.o \
+       $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
+       $(WEBOBJ)/AFS_component_version_number.o \
+       $(WEBOBJ)/afs_exporter.o \
+       $(WEBOBJ)/rxkad_client.o \
+       $(WEBOBJ)/rxkad_common.o \
+       $(WEBOBJ)/casestrcpy.o \
+       $(WEBOBJ)/dirpath.o \
+       $(WEBOBJ)/fileutil.o \
+       $(WEBOBJ)/netutils.o \
+       $(WEBOBJ)/et_name.o \
+       $(WEBOBJ)/com_err.o \
+       $(WEBOBJ)/error_msg.o \
+       $(WEBOBJ)/uerrors.o \
+       $(WEBOBJ)/kaerrors.o \
+       $(WEBOBJ)/ktc_errors.o \
+       $(WEBOBJ)/rxkad_errs.o \
+       $(WEBOBJ)/authclient.o \
+       $(WEBOBJ)/authcon.o \
+       $(WEBOBJ)/cellconfig.o \
+       $(WEBOBJ)/client.o \
+       $(WEBOBJ)/acfg_errors.o \
+       $(WEBOBJ)/kaaux.o \
+       $(WEBOBJ)/kalocalcell.o \
+       $(WEBOBJ)/kauth.cs.o \
+       $(WEBOBJ)/kauth.xdr.o \
+       $(WEBOBJ)/ktc.o \
+       $(WEBOBJ)/ptint.cs.o \
+       $(WEBOBJ)/ptint.xdr.o \
+       $(WEBOBJ)/ptuser.o \
+       $(WEBOBJ)/pterror.o \
+       $(WEBOBJ)/securehash.o \
+       $(WEBOBJ)/ticket.o \
+       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/ubik_int.cs.o \
+       $(WEBOBJ)/ubik_int.xdr.o \
+       $(WEBOBJ)/ubikclient.o \
+       $(WEBOBJ)/user.o \
+       $(WEBOBJ)/hostparse.o \
+       $(WEBOBJ)/nsafs.o \
+       $(WEBOBJ)/Krxstat.ss.o \
+       $(WEBOBJ)/Krxstat.xdr.o \
+       $(WEBOBJ)/rxstat.o
+
+
+AFSWEBOBJKRB = \
+       $(WEBOBJ)/afs_atomlist.o \
+       $(WEBOBJ)/afs_lhash.o \
+       $(WEBOBJ)/afs_analyze.o \
+       $(WEBOBJ)/afs_axscache.o \
+       $(WEBOBJ)/afs_buffer.o \
+       $(WEBOBJ)/afs_callback.o \
+       $(WEBOBJ)/afs_cbqueue.o \
+       $(WEBOBJ)/afs_cell.o \
+       $(WEBOBJ)/afs_chunk.o \
+       $(WEBOBJ)/afs_conn.o \
+       $(WEBOBJ)/afs_daemons.o \
+       $(WEBOBJ)/afs_dcache.o \
+       $(WEBOBJ)/afs_dir.o \
+       $(WEBOBJ)/afs_dynroot.o \
+       $(WEBOBJ)/afs_init.o \
+       $(WEBOBJ)/afs_lock.o \
+       $(WEBOBJ)/afs_mariner.o \
+       $(WEBOBJ)/afs_memcache.o \
+       $(WEBOBJ)/afs_osidnlc.o \
+       $(WEBOBJ)/afs_osi_pag.o \
+       $(WEBOBJ)/afs_segments.o \
+       $(WEBOBJ)/afs_server.o \
+       $(WEBOBJ)/afs_stat.o \
+       $(WEBOBJ)/afs_user.o \
+       $(WEBOBJ)/afs_util.o \
+       $(WEBOBJ)/afs_vcache.o \
+       $(WEBOBJ)/afs_osi_uio.o \
+       $(WEBOBJ)/afs_vnop_access.o \
+       $(WEBOBJ)/afs_vnop_attrs.o \
+       $(WEBOBJ)/afs_vnop_create.o \
+       $(WEBOBJ)/afs_vnop_dirops.o \
+       $(WEBOBJ)/afs_vnop_fid.o \
+       $(WEBOBJ)/afs_vnop_flock.o \
+       $(WEBOBJ)/afs_vnop_link.o \
+       $(WEBOBJ)/afs_vnop_lookup.o \
+       $(WEBOBJ)/afs_vnop_open.o \
+       $(WEBOBJ)/afs_vnop_read.o \
+       $(WEBOBJ)/afs_vnop_readdir.o \
+       $(WEBOBJ)/afs_vnop_remove.o \
+       $(WEBOBJ)/afs_vnop_rename.o \
+       $(WEBOBJ)/afs_vnop_strategy.o \
+       $(WEBOBJ)/afs_vnop_symlink.o \
+       $(WEBOBJ)/afs_vnop_write.o \
+       $(WEBOBJ)/afs_volume.o \
+       $(WEBOBJ)/afs_call.o \
+       $(WEBOBJ)/afs_pioctl.o \
+       $(WEBOBJ)/osi_vfsops.o \
+       $(WEBOBJ)/afs_usrops.o \
+       $(WEBOBJ)/osi_vnodeops.o \
+       $(WEBOBJ)/osi_vm.o \
+       $(WEBOBJ)/osi_groups.o \
+       $(WEBOBJ)/afsaux.o \
+       $(WEBOBJ)/Kvice.xdr.o \
+       $(WEBOBJ)/xdr_arrayn.o \
+       $(WEBOBJ)/Kvice.cs.o \
+       $(WEBOBJ)/fcrypt.o \
+       $(WEBOBJ)/rx.o \
+       $(WEBOBJ)/rx_rdwr.o \
+       $(WEBOBJ)/rx_clock.o \
+       $(WEBOBJ)/rx_event.o \
+       $(WEBOBJ)/rx_globals.o \
+       $(WEBOBJ)/rx_knet.o \
+       $(WEBOBJ)/rx_kcommon.o \
+       $(WEBOBJ)/rx_misc.o \
+       $(WEBOBJ)/rx_null.o \
+       $(WEBOBJ)/rx_getaddr.o \
+       $(WEBOBJ)/rx_packet.o \
+       $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/xdr_rx.o \
+       $(WEBOBJ)/Kvldbint.cs.o \
+       $(WEBOBJ)/Kvldbint.xdr.o \
+       $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
+       $(WEBOBJ)/AFS_component_version_number.o \
+       $(WEBOBJ)/afs_exporter.o \
+       $(WEBOBJ)/rxkad_client.o \
+       $(WEBOBJ)/rxkad_common.o \
+       $(WEBOBJ)/casestrcpy.o \
+       $(WEBOBJ)/dirpath.o \
+       $(WEBOBJ)/fileutil.o \
+       $(WEBOBJ)/netutils.o \
+       $(WEBOBJ)/et_name.o \
+       $(WEBOBJ)/com_err.o \
+       $(WEBOBJ)/error_msg.o \
+       $(WEBOBJ)/uerrors.o \
+       $(WEBOBJ)/kaerrors.o \
+       $(WEBOBJ)/ktc_errors.o \
+       $(WEBOBJ)/rxkad_errs.o \
+       $(WEBOBJ)/authclient.o \
+       $(WEBOBJ)/authcon.o \
+       $(WEBOBJ)/cellconfig.o \
+       $(WEBOBJ)/client.o \
+       $(WEBOBJ)/acfg_errors.o \
+       $(WEBOBJ)/kaaux.o \
+       $(WEBOBJ)/kalocalcell.o \
+       $(WEBOBJ)/kauth.cs.o \
+       $(WEBOBJ)/kauth.xdr.o \
+       $(WEBOBJ)/ktc.krb.o \
+       $(WEBOBJ)/ptint.cs.o \
+       $(WEBOBJ)/ptint.xdr.o \
+       $(WEBOBJ)/ptuser.o \
+       $(WEBOBJ)/pterror.o \
+       $(WEBOBJ)/securehash.o \
+       $(WEBOBJ)/ticket.o \
+       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/ubik_int.cs.o \
+       $(WEBOBJ)/ubik_int.xdr.o \
+       $(WEBOBJ)/ubikclient.o \
+       $(WEBOBJ)/user.o \
+       $(WEBOBJ)/nsafs.o \
+       $(WEBOBJ)/Krxstat.ss.o \
+       $(WEBOBJ)/Krxstat.xdr.o \
+       $(WEBOBJ)/rxstat.o
+
+# Compilation rules
+
+# These files are for the user space library
+
+$(UOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
+       $(CRULE1)
+$(UOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
+       $(CRULE1)
+$(UOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
+       $(CRULE1)
+$(UOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
+       $(CRULE1)
+$(UOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
+       $(CRULE1)
+$(UOBJ)/afs_cell.o: $(AFS)/afs_cell.c
+       $(CRULE1)
+$(UOBJ)/afs_conn.o: $(AFS)/afs_conn.c
+       $(CRULE1)
+$(UOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
+       $(CRULE1)
+$(UOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
+       $(CRULE1)
+$(UOBJ)/afs_init.o: $(AFS)/afs_init.c
+       $(CRULE1)
+$(UOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
+       $(CRULE1)
+$(UOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+       $(CRULE1)
+$(UOBJ)/afs_osi.o:     $(AFS)/afs_osi.c
+       $(CRULE1)
+$(UOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+       $(CRULE1)
+$(UOBJ)/afs_segments.o: $(AFS)/afs_segments.c
+       $(CRULE1)
+$(UOBJ)/afs_server.o: $(AFS)/afs_server.c
+       $(CRULE1)
+$(UOBJ)/afs_user.o: $(AFS)/afs_user.c
+       $(CRULE1)
+$(UOBJ)/afs_util.o: $(AFS)/afs_util.c
+       $(CRULE1)
+$(UOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
+       $(CRULE1)
+$(UOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+       $(CRULE1)
+$(UOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+       $(CRULE1)
+$(UOBJ)/afs_volume.o: $(AFS)/afs_volume.c
+       $(CRULE1)
+$(UOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
+       $(CRULE1)
+$(UOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
+       $(CRULE1)
+$(UOBJ)/afs_callback.o: $(AFS)/afs_callback.c
+       $(CRULE1)
+$(UOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
+       $(CRULE1)
+$(UOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
+       $(CRULE1)
+$(UOBJ)/afs_dir.o:     $(AFS)/afs_dir.c
+       $(CRULE1)
+$(UOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+       $(CRULE1)
+$(UOBJ)/afs_lock.o: $(AFS)/afs_lock.c
+       $(CRULE1)
+$(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
+       $(CRULE1)
+$(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c
+       $(CRULE1)
+$(UOBJ)/fcrypt.o:      $(AFS)/fcrypt.c
+       $(CRULE1)
+$(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+       $(CRULE1)
+$(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
+       $(CRULE1)
+$(UOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
+       $(CRULE1)
+$(UOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
+       $(CRULE1)
+$(UOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+       $(CRULE1)
+$(UOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+       $(CRULE1)
+$(UOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
+       $(CRULE1)
+$(UOBJ)/rx.o: $(RX)/rx.c
+       $(CRULE1)
+$(UOBJ)/rx_clock.o: $(RX)/rx_clock.c
+       $(CRULE1)
+$(UOBJ)/rx_event.o: $(RX)/rx_event.c
+       $(CRULE1)
+$(UOBJ)/rx_globals.o: $(RX)/rx_globals.c
+       $(CRULE1)
+$(UOBJ)/rx_misc.o: $(RX)/rx_misc.c
+       $(CRULE1)
+$(UOBJ)/rx_null.o: $(RX)/rx_null.c
+       $(CRULE1)
+$(UOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
+       $(CRULE1)
+$(UOBJ)/rx_packet.o: $(RX)/rx_packet.c
+       $(CRULE1)
+$(UOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
+       $(CRULE1)
+$(UOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
+       $(CRULE1)
+$(UOBJ)/xdr_int64.o: $(RX)/xdr_int64.c
+       $(CRULE1)
+$(UOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
+       $(CRULE1)
+$(UOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
+       $(CRULE1)
+$(UOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
+       $(CRULE1)
+$(UOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
+       $(CRULE1)
+$(UOBJ)/osi_vm.o: $(AFS)/osi_vm.c
+       $(CRULE1)
+$(UOBJ)/osi_groups.o: $(AFS)/osi_groups.c
+       $(CRULE1)
+$(UOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+       $(CRULE1)
+$(UOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+       $(CRULE1)
+$(UOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+       $(CRULE1)
+$(UOBJ)/afsaux.o: $(AFSINT)/afsaux.c
+       $(CRULE1)
+$(UOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
+       $(CRULE1)
+$(UOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
+       $(CRULE1)
+$(UOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+       $(CRULE1)
+$(UOBJ)/afs_main.o: $(AFS)/afs_main.c
+       $(CRULE1)
+$(UOBJ)/rx_knet.o: $(RX)/rx_knet.c
+       $(CRULE1)
+$(UOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
+       $(CRULE1)
+$(UOBJ)/afs_call.o: $(AFS)/afs_call.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(UOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(UOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
+       $(CRULE1) -DAFS_NONFSTRANS
+$(UOBJ)/ktc.o:         $(AFS)/ktc.c
+       $(CRULE1)
+$(UOBJ)/ticket.o: $(AFS)/ticket.c
+       $(CRULE1)
+$(UOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
+       $(CRULE1)
+$(UOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
+       $(CRULE1)
+$(UOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
+       $(CRULE1)
+$(UOBJ)/ptuser.o: $(AFS)/ptuser.c
+       $(CRULE1)
+$(UOBJ)/pterror.o: $(AFS)/pterror.c
+       $(CRULE1)
+$(UOBJ)/ubikclient.o: $(AFS)/ubikclient.c
+       $(CRULE1)
+$(UOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
+       $(CRULE1)
+$(UOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
+       $(CRULE1)
+$(UOBJ)/authclient.o: $(AFS)/authclient.c
+       $(CRULE1)
+$(UOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
+       $(CRULE1)
+$(UOBJ)/client.o: $(AFS)/client.c
+       $(CRULE1)
+$(UOBJ)/user.o: $(AFS)/user.c
+       $(CRULE1)
+$(UOBJ)/hostparse.o: $(AFS)/hostparse.c
+       $(CRULE1)
+$(UOBJ)/token.o: $(AFS)/token.c
+       $(CRULE1)
+$(UOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
+       $(CRULE1)
+$(UOBJ)/kaaux.o: $(AFS)/kaaux.c
+       $(CRULE1)
+$(UOBJ)/authcon.o: $(AFS)/authcon.c
+       $(CRULE1)
+$(UOBJ)/cellconfig.o: $(AFS)/cellconfig.c
+       $(CRULE1)
+$(UOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
+       $(CRULE1)
+$(UOBJ)/dirpath.o: $(AFS)/dirpath.c
+       $(CRULE1)
+$(UOBJ)/fileutil.o: $(AFS)/fileutil.c
+       $(CRULE1)
+$(UOBJ)/netutils.o: $(AFS)/netutils.c
+       $(CRULE1)
+$(UOBJ)/et_name.o: $(AFS)/et_name.c
+       $(CRULE1)
+$(UOBJ)/com_err.o: $(AFS)/com_err.c
+       $(CRULE1)
+$(UOBJ)/error_msg.o: $(AFS)/error_msg.c
+       $(CRULE1)
+$(UOBJ)/uerrors.o: $(AFS)/uerrors.c
+       $(CRULE1)
+$(UOBJ)/kaerrors.o: $(AFS)/kaerrors.c
+       $(CRULE1)
+$(UOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
+       $(CRULE1)
+$(UOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
+       $(CRULE1)
+$(UOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
+       $(CRULE1)
+$(UOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
+       $(CRULE1)
+$(UOBJ)/rxstat.o: $(AFSINT)/rxstat.c
+       $(CRULE1)
+$(UOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+       $(CRULE1)
+$(UOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+       $(CRULE1)
+
+# These files are for the netscape plugin
+
+$(WEBOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c
+       $(CRULE2)
+$(WEBOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c
+       $(CRULE2)
+$(WEBOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c
+       $(CRULE2)
+$(WEBOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c
+       $(CRULE2)
+$(WEBOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c
+       $(CRULE2)
+$(WEBOBJ)/afs_cell.o: $(AFS)/afs_cell.c
+       $(CRULE2)
+$(WEBOBJ)/afs_conn.o: $(AFS)/afs_conn.c
+       $(CRULE2)
+$(WEBOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c
+       $(CRULE2)
+$(WEBOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c
+       $(CRULE2)
+$(WEBOBJ)/afs_init.o: $(AFS)/afs_init.c
+       $(CRULE2)
+$(WEBOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c
+       $(CRULE2)
+$(WEBOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c
+       $(CRULE2)
+$(WEBOBJ)/afs_osi.o:   $(AFS)/afs_osi.c
+       $(CRULE2)
+$(WEBOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c
+       $(CRULE2)
+$(WEBOBJ)/afs_segments.o: $(AFS)/afs_segments.c
+       $(CRULE2)
+$(WEBOBJ)/afs_server.o: $(AFS)/afs_server.c
+       $(CRULE2)
+$(WEBOBJ)/afs_user.o: $(AFS)/afs_user.c
+       $(CRULE2)
+$(WEBOBJ)/afs_util.o: $(AFS)/afs_util.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c
+       $(CRULE2)
+$(WEBOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c
+       $(CRULE2)
+$(WEBOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c
+       $(CRULE2)
+$(WEBOBJ)/afs_volume.o: $(AFS)/afs_volume.c
+       $(CRULE2)
+$(WEBOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c
+       $(CRULE2)
+$(WEBOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c
+       $(CRULE2)
+$(WEBOBJ)/afs_callback.o: $(AFS)/afs_callback.c
+       $(CRULE2)
+$(WEBOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c
+       $(CRULE2)
+$(WEBOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c
+       $(CRULE2)
+$(WEBOBJ)/afs_dir.o:   $(AFS)/afs_dir.c
+       $(CRULE2)
+$(WEBOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c
+       $(CRULE2)
+$(WEBOBJ)/afs_lock.o: $(AFS)/afs_lock.c
+       $(CRULE2)
+$(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
+       $(CRULE2)
+$(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c
+       $(CRULE2)
+$(WEBOBJ)/fcrypt.o:    $(AFS)/fcrypt.c
+       $(CRULE2)
+$(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+       $(CRULE2)
+$(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
+       $(CRULE2)
+$(WEBOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c
+       $(CRULE2)
+$(WEBOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c
+       $(CRULE2)
+$(WEBOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
+       $(CRULE2)
+$(WEBOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
+       $(CRULE2)
+$(WEBOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
+       $(CRULE2)
+$(WEBOBJ)/rx.o: $(RX)/rx.c
+       $(CRULE2)
+$(WEBOBJ)/rx_clock.o: $(RX)/rx_clock.c
+       $(CRULE2)
+$(WEBOBJ)/rx_event.o: $(RX)/rx_event.c
+       $(CRULE2)
+$(WEBOBJ)/rx_globals.o: $(RX)/rx_globals.c
+       $(CRULE2)
+$(WEBOBJ)/rx_misc.o: $(RX)/rx_misc.c
+       $(CRULE2)
+$(WEBOBJ)/rx_null.o: $(RX)/rx_null.c
+       $(CRULE2)
+$(WEBOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c
+       $(CRULE2)
+$(WEBOBJ)/rx_packet.o: $(RX)/rx_packet.c
+       $(CRULE2)
+$(WEBOBJ)/rx_conncache.o: $(RX)/rx_conncache.c
+       $(CRULE2)
+$(WEBOBJ)/xdr_rx.o: $(RX)/xdr_rx.c
+       $(CRULE2)
+$(WEBOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c
+       $(CRULE2)
+$(WEBOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c
+       $(CRULE2)
+$(WEBOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c
+       $(CRULE2)
+$(WEBOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c
+       $(CRULE2)
+$(WEBOBJ)/osi_vm.o: $(AFS)/osi_vm.c
+       $(CRULE2)
+$(WEBOBJ)/osi_groups.o: $(AFS)/osi_groups.c
+       $(CRULE2)
+$(WEBOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c
+       $(CRULE2)
+$(WEBOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c
+       $(CRULE2)
+$(WEBOBJ)/afsaux.o: $(AFSINT)/afsaux.c
+       $(CRULE2)
+$(WEBOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c
+       $(CRULE2)
+$(WEBOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c
+       $(CRULE2)
+$(WEBOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/afs_main.o: $(AFS)/afs_main.c
+       $(CRULE2)
+$(WEBOBJ)/rx_knet.o: $(RX)/rx_knet.c
+       $(CRULE2)
+$(WEBOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c
+       $(CRULE2)
+$(WEBOBJ)/afs_call.o: $(AFS)/afs_call.c
+       $(CRULE2) -DAFS_NONFSTRANS
+$(WEBOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c
+       $(CRULE2) -DAFS_NONFSTRANS
+$(WEBOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c
+       $(CRULE2) -DAFS_NONFSTRANS
+$(WEBOBJ)/ktc.o:       $(AFS)/ktc.c
+       $(CRULE2)
+$(WEBOBJ)/ktc.krb.o:   $(AFS)/ktc.c
+       $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC 
+       mv ktc.o ktc.krb.o
+$(WEBOBJ)/securehash.o: $(AFS)/securehash.c
+       $(CRULE2)
+$(WEBOBJ)/nsafs.o: $(AFS)/nsafs.c
+       $(CRULE2)
+$(WEBOBJ)/ticket.o: $(AFS)/ticket.c
+       $(CRULE2)
+$(WEBOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c
+       $(CRULE2)
+$(WEBOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c
+       $(CRULE2)
+$(WEBOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/ptuser.o: $(AFS)/ptuser.c
+       $(CRULE2)
+$(WEBOBJ)/pterror.o: $(AFS)/pterror.c
+       $(CRULE2)
+$(WEBOBJ)/ubikclient.o: $(AFS)/ubikclient.c
+       $(CRULE2)
+$(WEBOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c
+       $(CRULE2)
+$(WEBOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/authclient.o: $(AFS)/authclient.c
+       $(CRULE2)
+$(WEBOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c
+       $(CRULE2)
+$(WEBOBJ)/client.o: $(AFS)/client.c
+       $(CRULE2)
+$(WEBOBJ)/user.o: $(AFS)/user.c
+       $(CRULE2)
+$(WEBOBJ)/hostparse.o: $(AFS)/hostparse.c
+       $(CRULE2)
+$(WEBOBJ)/token.o: $(AFS)/token.c
+       $(CRULE2)
+$(WEBOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c
+       $(CRULE2)
+$(WEBOBJ)/kaaux.o: $(AFS)/kaaux.c
+       $(CRULE2)
+$(WEBOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c
+       $(CRULE2)
+$(WEBOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/authcon.o: $(AFS)/authcon.c
+       $(CRULE2)
+$(WEBOBJ)/cellconfig.o: $(AFS)/cellconfig.c
+       $(CRULE2)
+$(WEBOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c
+       $(CRULE1)
+$(WEBOBJ)/dirpath.o: $(AFS)/dirpath.c
+       $(CRULE1)
+$(WEBOBJ)/fileutil.o: $(AFS)/fileutil.c
+       $(CRULE1)
+$(WEBOBJ)/netutils.o: $(AFS)/netutils.c
+       $(CRULE1)
+$(WEBOBJ)/et_name.o: $(AFS)/et_name.c
+       $(CRULE2)
+$(WEBOBJ)/com_err.o: $(AFS)/com_err.c
+       $(CRULE2)
+$(WEBOBJ)/error_msg.o: $(AFS)/error_msg.c
+       $(CRULE2)
+$(WEBOBJ)/uerrors.o: $(AFS)/uerrors.c
+       $(CRULE2)
+$(WEBOBJ)/kaerrors.o: $(AFS)/kaerrors.c
+       $(CRULE2)
+$(WEBOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c
+       $(CRULE2)
+$(WEBOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c
+       $(CRULE2)
+$(WEBOBJ)/rxstat.o: $(AFSINT)/rxstat.c
+       $(CRULE2)
+$(WEBOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c
+       $(CRULE2)
+$(WEBOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c
+       $(CRULE2)
+
+clean:
+       -$(RM) -rf UAFS* AFSWEB* nsapi des afs afsint config rx
+       -$(RM) -f  h net netinet rpc ufs machine inet nfs sys des linktest
+
+
+${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
+       ${INSTALL} $? $@
+
+${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
+       ${INSTALL} $? $@
+
+${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS)
+       ${INSTALL} $? $@
+
+
+${DESTDIR}${libdir}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
+       ${INSTALL} $? $@
+
+${DESTDIR}${libdir}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
+       ${INSTALL} $? $@
+
+${DESTDIR}${libdir}/$(LIBUAFS): UAFS/$(LIBUAFS)
+       ${INSTALL} $? $@
+
+
+${DEST}/root.afsweb/usr/lib/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
+       ${INSTALL} $? $@
+
+${DEST}/root.afsweb/usr/lib/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/param.h: afs/param.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/stds.h: afs/stds.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/afs_sysnames.h: afs/afs_sysnames.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/afs_stats.h: afs/afs_stats.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/sysincludes.h: afs/sysincludes.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/include/afs/afs_usrops.h: afs/afs_usrops.h
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/lib/libdes.a: des/libdes.a
+       ${INSTALL} $? $@
+
+${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS)
+       ${INSTALL} $? $@
index be37a4958c7d9e82dd173ce85db33117993d4bb9..9b4cd603e46030b17d5fd335811a96b300fbc989 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -28,8 +31,8 @@ SYS_NAME=@AFS_SYSNAME@
 include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
-DEFINES= -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+DEFINES= -DKERNEL -DUKERNEL
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 AR = /usr/bin/ar
 ARFLAGS = -r
 RANLIB = /bin/ranlib
index 8931b1905de176880d9db9d4e2a3e4cfb8b2c56f..78f6be2d98f5cf573edcf704e6d210216a60779c 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -29,9 +32,9 @@ include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = cc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index 24f3bfcc3f9ae56234642d817628b3c8f71dcdf2..df1625e2a134fa5d871c52cafd40615afaeea159 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -30,11 +33,11 @@ DBUG=-O
 include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
-DEFINES=-DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE -D_NO_PROTO -DOSF
+DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF
 KOPTS=
 DBUG=
 OPTF=-O
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF
index e597b89effe7775097e1c7021bc71e5f99ec6ccb..f16d116e96707cd1f9e51a060f66b1ca5efe817a 100644 (file)
@@ -6,6 +6,9 @@ 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@
@@ -23,9 +26,9 @@ include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = gcc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index 0057b011add533800dab5c4b996eef9aaeb464ee..1fa074c38e8d5e540e841b5b0fa6ed323c48633f 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -29,9 +32,9 @@ include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = /opt/ansic/bin/cc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index a078593a9633887f33236153504fef911d40bc4f..c2b9a2f31b7559a4c61bc2c27ea5cdbf63b2e142 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -29,8 +32,8 @@ include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = cc
-DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+DEFINES=-D_SGI_MP_SOURCE -DKERNEL -DUKERNEL
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index 0e65b33edec7d68aed979be45211aa1ecfacea39..59e08ff009b62a3b2e0fb8fd7895c73169057244 100644 (file)
@@ -5,13 +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
 
-# MakefileProto for Solaris systems
+# 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@
@@ -29,9 +32,9 @@ include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = gcc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index d95d14f851cce3ab5c6807fe33cb9f3fc59c4d76..0b07425c4708cb01b30863e352e5626c30917132 100644 (file)
@@ -12,6 +12,9 @@ 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@
@@ -28,8 +31,8 @@ SYS_NAME=@AFS_SYSNAME@
 include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
index 31ca5baf4169b76a0b7fefb48e974784093e769e..e347062ff4f51fa448870b9e5827a4c22cc39965 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,14 +22,14 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs
+INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs
 
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}
 
index 676b27f9b9540f2cfeb200a98625896c9e1ea3be..4fc4e584962aadc608ac77092b7298da0a5aea7c 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index be2903a9eaf9959243a3c4038fc89fc93237d8ab..70404aaafbbcbeab89c923ccaa48a49f402e80c0 100644 (file)
@@ -20,6 +20,9 @@
 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@
@@ -31,8 +34,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -53,7 +56,7 @@ KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \
           ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
           ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a
 
-INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys
+INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys
 CFLAGS=        -g ${XCFLAGS} ${INCLUDES}
 LIBC=  /lib/libc.a
 SRCS=  login.c 
index ffb0679ffb7cd13191c640b23488baf4edb5ccff..d589aaa95ec18edb5ddd261fecc1c2bb4fdd4869 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -32,7 +35,7 @@ include ../config/Makefile.${SYS_NAME}
 # subtle bugs that may have been introduced in process.s, be warned!
 OPTIMIZE=${LWP_OPTMZ}
 
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTIMIZE} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
        waitkey.o threadname.o AFS_component_version_number.o
@@ -54,57 +57,57 @@ process.s:
 process.o      : process.s process.c
        @case "$(SYS_NAME)" in \
        pmax_he1) \
-               $(CC) -c -I${TOP_INCDIR} process.s;; \
+               $(CC) -c -I${TOP_INCDIR} ${srcdir}/process.s;; \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-               /usr/ccs/lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \
+               /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} process.ss -o process.o; \
                        $(RM) process.ss ;; \
        sgi_5* ) \
-               $(CC) -c -I${TOP_INCDIR} -KPIC -G0  process.s;; \
+               $(CC) -c -I${TOP_INCDIR} -KPIC -G0  ${srcdir}/process.s;; \
        sgi_61 | sgi_62 | sgi_63 ) \
-               $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0  process.s;; \
+               $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0  ${srcdir}/process.s;; \
        s390*) \
-               /lib/cpp -P -I${TOP_INCDIR} process.s >process.ss; \
+               /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s >process.ss; \
                ${AS} -ahlns process.ss -o process.o >process.lst; \
                $(RM) process.ss ;; \
        ppc_darwin* ) \
-               $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} process.s;; \
+               $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \
        i386_fbsd* ) \
-               /usr/bin/cpp -P process.fbsd.s > process.ss; \
+               /usr/bin/cpp -P ${srcdir}/process.fbsd.s > process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        hp* | *_linux* | sgi_64 | sgi_65 ) \
-               ${CC} ${CFLAGS} -c process.c;; \
+               ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \
        ncrx86_*) \
-               /usr/ccs/lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \
+               /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-               ${AS} -v  -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \
+               ${AS} -v  -P -DOSF -I${TOP_INCDIR} -DASSEMBLER ${srcdir}/process.s; \
                ${AS} -v process.i -o process.o;; \
        *_obsd* ) \
-               cp process.s process.S ; \
+               cp ${srcdir}/process.s process.S ; \
                ${CC} -E -I${TOP_INCDIR} process.S >process.ss ; \
                ${AS} process.ss -o process.o ;  \
                $(RM) -f process.S ;;\
        hp_ux110 ) \
-               ${CC} ${CFLAGS} -c process.c;; \
+               ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \
        *) \
-               /lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \
+               /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} process.ss -o process.o; \
                $(RM) process.ss ;; \
        esac
 
 iomgr.o                : iomgr.c lwp.h timer.h
-               ${CC} -c ${CFLAGS} iomgr.c
+               ${CC} -c ${CFLAGS} ${srcdir}/iomgr.c
 
 preempt.o      : preempt.c lwp.h preempt.h
 lwp.o          : lwp.c lwp.h
        case "$(SYS_NAME)" in \
                rs_aix*) \
-                       $(CC) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -c lwp.c;; \
+                       $(CC) -I${srcdir} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -c ${srcdir}/lwp.c;; \
                *)  \
-                       $(CC) ${CFLAGS} -c lwp.c;; \
+                       $(CC) ${CFLAGS} -c ${srcdir}/lwp.c;; \
                esac
 lock.o         : lock.c lock.h lwp.h
 timer.o                : timer.c
@@ -120,7 +123,7 @@ rw: rw.o liblwp.a $(TOP_LIBDIR)/util.a
        ${CC} ${CFLAGS} -o rw rw.o liblwp.a $(TOP_LIBDIR)/util.a
 
 rw.o: rw.c
-       ${CC} ${CFLAGS} -c rw.c
+       ${CC} ${CFLAGS} -c ${srcdir}/rw.c
 
 
 #
index bf1077fc8d69ff159c126fbb36959480c5aafe8d..f82550a88e8e67b38c23a94336a671a56de5fa2d 100644 (file)
@@ -4,6 +4,9 @@
 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@
index ab558b8ba21454490ace29c8967c2dd117808ef4..138d7220c4f25e1764b78be33a62379cf3a9ff13 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCPATH=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+INCPATH=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}
 BINDIR=/usr/local/etc
 LINKDIR=/etc
 LIBS=${TOP_LIBDIR}/util.a
index 298c28ce33a71928b617f6f1daadc7fb8067f624..763cad6babc9d14d0dd9679c7ab25b9aa40ba4dd 100644 (file)
@@ -9,6 +9,9 @@
 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@
@@ -20,15 +23,16 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
-CFLAGS = ${XCFLAGS}
+
+CFLAGS = -I. -I${srcdir} ${XCFLAGS}
 
 all: ${TOP_LIBDIR}/libnull.a
 
@@ -37,9 +41,9 @@ install: ${DESTDIR}${libdir}/afs/libnull.a
 ${DEST}/lib/afs/libnull.a: libnull.a
        ${INSTALL} $? $@
 
-null.o: null.c AFS_component_version_number.o
+null.o: null.c AFS_component_version_number.c
 
-libnull.a: null.o
+libnull.a: null.o 
        -$(RM) -f $@
        $(AR) crv $@ null.o
        $(RANLIB) $@
@@ -48,6 +52,7 @@ clean:
        $(RM) -f *.o *.a AFS_component_version_number.c
 
 include ../config/Makefile.version
+
 ${DESTDIR}${libdir}/afs/libnull.a: libnull.a
        ${INSTALL} $? $@
 
index 6ec6a692cf9693280668b9b241cd575d38155ab6..d2bbbb2311d7a57492b7bab93a03101785ca19ea 100644 (file)
@@ -7,6 +7,9 @@
 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@
@@ -18,8 +21,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -27,7 +30,7 @@ SHELL    = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES=-I/usr/include -I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+INCLUDES=-I/usr/include -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}
 DBGFLAG  = -UDEBUG
 CFLAGS   = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS)
 YFLAGS   = -vd
index 929115c5815f311fb32d992af61d076a35490203..bd6e4cae27ba5155e3c52788cb931de0248e0cf7 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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
@@ -43,26 +46,26 @@ LDFLAGS = ${SHARE_LDFLAGS}
  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
-INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} \
+INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \
        -I/usr/include -I/usr/include/sys
 CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS}
 
 all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1
 
 afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-       ${CC} ${CFLAGS} -c afs_setcred.c -o afs_setcred.o
+       ${CC} ${CFLAGS} -c ${srcdir}/afs_setcred.c -o afs_setcred.o
 
 afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_setcred.c -o afs_setcred_krb.o
 
 pam_afs.so.1: $(SHOBJS) afs_setcred.o
        set -x; \
        case "$(SYS_NAME)" in \
        hp_ux*) \
-               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ afs_setcred.o \
+               $(LD) $(LDFLAGS) -c ${srcdir}/mapfile.hp -o $@ afs_setcred.o \
                        $(SHOBJS) $(LIBS) ;; \
        sun*_5*) \
-               $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o \
+               $(LD) $(LDFLAGS) -M ${srcdir}/mapfile -o $@ afs_setcred.o \
                        $(SHOBJS) $(LIBS) ;; \
        *linux*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred.o $(SHOBJS) $(LIBS) ;;\
@@ -76,10 +79,10 @@ pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o
        set -x; \
        case "$(SYS_NAME)" in \
        hp_ux*) \
-               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ \
+               $(LD) $(LDFLAGS) -c ${srcdir}/mapfile.hp -o $@ \
                        afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
        sun*_5*) \
-               $(LD) $(LDFLAGS) -M mapfile -o $@ \
+               $(LD) $(LDFLAGS) -M ${srcdir}/mapfile -o $@ \
                        afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
        *linux*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o $(SHOBJS) $(KLIBS) ;;\
index 49067af2f09a973d9922e0b97467b23d9e789d59..53ef92579144f612f1dfde925f1cac70d6f54b8d 100644 (file)
@@ -9,6 +9,9 @@
 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@
@@ -20,8 +23,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,18 +33,18 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 LIBS= ${XLIBS}
-CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I../config ${XCFLAGS}
 
 all: pinstall
 
-pinstall: install.c AFS_component_version_number.c 
+pinstall: ${srcdir}/install.c AFS_component_version_number.c 
        case ${SYS_NAME} in \
                 sgi_64 | sgi_65) \
-                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+                        ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} ;; \
                 sgi_* ) \
-                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} -lmld ;; \
+                        ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} -lmld ;; \
                 *) \
-                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+                        ${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${LIBS} ;; \
         esac
 
 test: pinstall
index 5ecf101ea830d6cc04be47b79e131a5f0a6e1313..b22a8b268a5c945c5f172b213700c0f65edbadbb 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 53c9d516ff09d04c725946a521b3597c32069ddd..03082fecbd161af0af4c4d1ce9a6e38f03e6575e 100644 (file)
@@ -6,8 +6,11 @@
 # 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@
@@ -19,14 +22,14 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-CFLAGS=$(DBUG) -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=$(DBUG) -I${TOP_INCDIR} -I../config ${XCFLAGS}
 
 all: ${TOP_LIBDIR}/libprocmgmt.a ${TOP_INCDIR}/afs/procmgmt.h
 
@@ -38,7 +41,8 @@ libprocmgmt.a: procmgmt_unix.o AFS_component_version_number.o
        $(AR) crv $@ procmgmt_unix.o AFS_component_version_number.o
        $(RANLIB) $@
 
-procmgmt_unix.o: procmgmt_unix.c procmgmt.h
+procmgmt_unix.o: ${srcdir}/procmgmt_unix.c ${srcdir}/procmgmt.h
+       $(CC) $(CFLAGS) -c ${srcdir}/procmgmt_unix.c
 
 #
 # Install targets
@@ -48,7 +52,7 @@ install: ${DESTDIR}${libdir}/afs/libprocmgmt.a ${DESTDIR}${includedir}/afs/procm
 ${DEST}/lib/afs/libprocmgmt.a: libprocmgmt.a
        ${INSTALL} $? $@
 
-${DEST}/include/afs/procmgmt.h: procmgmt.h
+${DEST}/include/afs/procmgmt.h: ${srcdir}/procmgmt.h
        ${INSTALL} $? $@
 
 #
@@ -64,10 +68,10 @@ ${DESTDIR}${libdir}/afs/libprocmgmt.a: libprocmgmt.a
 ${TOP_LIBDIR}/libprocmgmt.a: libprocmgmt.a
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/procmgmt.h: procmgmt.h
+${DESTDIR}${includedir}/afs/procmgmt.h: ${srcdir}/procmgmt.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/procmgmt.h: procmgmt.h
+${TOP_INCDIR}/afs/procmgmt.h: ${srcdir}/procmgmt.h
        ${INSTALL} $? $@
 
 dest: ${DEST}/lib/afs/libprocmgmt.a ${DEST}/include/afs/procmgmt.h
index bf9eb2d7679aa569951d20cb8162f169414b59af..750b9b467079fb50d0be3f5ce8ceab9a9d9314c1 100644 (file)
@@ -7,6 +7,9 @@
 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@
@@ -26,10 +29,10 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
-CFLAGS=$(DBUG) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} $(DBUG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 INCLS=${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/lock.h  \
        ${TOP_INCDIR}/lwp.h \
@@ -81,16 +84,16 @@ ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg
 ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg
 
 ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg
-       ${RXGEN} -x ptint.xg
+       ${RXGEN} -x ${srcdir}/ptint.xg
 
 Kptint.cs.c: ptint.xg Kptint.h
-       ${RXGEN} -x -k -C -o Kptint.cs.c ptint.xg
+       ${RXGEN} -x -k -C -o Kptint.cs.c ${srcdir}/ptint.xg
  
 Kptint.xdr.c: ptint.xg
-       ${RXGEN} -x -k -c -o Kptint.xdr.c ptint.xg
+       ${RXGEN} -x -k -c -o Kptint.xdr.c ${srcdir}/ptint.xg
  
 Kptint.h: ptint.xg
-       ${RXGEN} -x -k -h -o Kptint.h ptint.xg
+       ${RXGEN} -x -k -h -o Kptint.h ${srcdir}/ptint.xg
 
 display.o: display.c ${INCLS}
 
@@ -108,7 +111,7 @@ ptuser.o: ptuser.c ${LINCLS}
 
 pterror.h pterror.c: pterror.et
        $(RM) -f pterror.h pterror.c
-       ${COMPILE_ET} pterror
+       ${COMPILE_ET} -p ${srcdir} pterror
 
 libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
        $(RM) -f $@
index 0c3591334023bde53d19049968d981e4230cc37b..7546d8a692e7cce814be9dfa689210c77328e323 100644 (file)
@@ -19,6 +19,9 @@
 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@
@@ -30,8 +33,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -43,7 +46,7 @@ SRCS= rcp.c
 OBJS=   rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
 
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a \
          ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \
          ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
index 52c819d8dffa260cca481e562aebfee7a7d89e0f..31450ef0776ac833928a4b7aef32a2c8f4a5a811 100644 (file)
@@ -19,6 +19,9 @@
 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@
@@ -30,8 +33,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -54,7 +57,7 @@ AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \
 RES = 
 LIBS = ../login/libutil.a ${RES} ${AFSLIBS}
 ALIBS= ${AFSLIBS} 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 include ../config/Makefile.version
 
index b89f27a8031a8abeb06cdabf58ae6427d9af69a2..8e6c4c55d3db5855c9e30fed0550237013bb6943 100644 (file)
@@ -19,6 +19,9 @@
 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@
@@ -30,8 +33,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -39,7 +42,7 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}
 CFLAGS=        ${DBUG} ${INCLUDES} ${XCFLAGS}
 LIBC=  /lib/libc.a
 OBJS=   rcmd.o ../inetd/ta-rauth.o herror.o
index 1e5bad7be583c29df3f1139a6bbb45e775152860..2530f0f6d2f764075b9899d5a397f8e7db292532 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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@
@@ -29,20 +32,29 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS}
 
 #
 # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx).
 # Really the xdr stuff should be in its own directory.
 #
-XDROBJS = xdr_arrayn.o xdr_rx.o xdr_afsuuid.o
+XDROBJS_common = xdr_rx.o xdr_afsuuid.o
 
-RXOBJS = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
-       rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-       xdr_int64.o 
+XDROBJS = xdr_arrayn.o ${XDROBJS_common}
+
+XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
+       xdr_float.o  xdr_refernce.o  xdr_update.o \
+       xdr_array.o xdr_mem.o ${XDROBJS_common}
+
+RXOBJS_common = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o \
+       rx_globals.o rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o rx_trace.o \
+       rx_conncache.o xdr_int64.o 
+
+RXOBJS = ${RXOBJS_common} 
+RXOBJS_djgpp = ${RXOBJS_common} rx_xmit_nt.o
 
 MULTIOBJS = rx_multi.o
 
@@ -50,14 +62,6 @@ LIBOBJS = ${RXOBJS} ${MULTIOBJS} ${XDROBJS}
 
 LIBOBJS_djgpp = ${RXOBJS_djgpp} ${MULTIOBJS} ${XDROBJS_djgpp}
 
-XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
-       xdr_float.o  xdr_refernce.o  xdr_update.o \
-       xdr_array.o xdr_mem.o xdr_rx.o xdr_afsuuid.o
-
-RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
-               rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-               xdr_int64.o rx_xmit_nt.o
-
 BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
             rx_clock.h rx_queue.h rx_event.h
 
@@ -72,7 +76,14 @@ KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
        xdr_afsuuid.c rx_trace.h xdr_int64.c
 UKSRCS = $(KSRCS) rx_conncache.c
 
-all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a
+all: \
+       includes kinstall ukinstall \
+       ${TOP_LIBDIR}/librx.a
+
+install-djgpp: \
+       includes kinstall ukinstall \
+       ${TOP_INCDIR}/rx/rx_xmit_nt.h \
+       ${TOP_LIBDIR}/librx-djgpp.a
 
 RX_component_version_number.c: AFS_component_version_number.c
        sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c
@@ -118,20 +129,6 @@ librx-djgpp.a: ${LIBOBJS_djgpp} RX_component_version_number.o
 #
 # Install targets
 #
-install:  ${DESTDIR}${libdir}/librx.a \
-       ${DESTDIR}${includedir}/rx/rx_packet.h \
-       ${DESTDIR}${includedir}/rx/rx.h \
-       ${DESTDIR}${includedir}/rx/rx_user.h \
-       ${DESTDIR}${includedir}/rx/rx_event.h \
-       ${DESTDIR}${includedir}/rx/rx_queue.h \
-       ${DESTDIR}${includedir}/rx/rx_globals.h \
-       ${DESTDIR}${includedir}/rx/rx_clock.h \
-       ${DESTDIR}${includedir}/rx/rx_multi.h \
-       ${DESTDIR}${includedir}/rx/rx_pthread.h \
-       ${DESTDIR}${includedir}/rx/rx_lwp.h \
-       ${DESTDIR}${includedir}/rx/rx_misc.h \
-       ${DESTDIR}${includedir}/rx/rx_null.h \
-       ${DESTDIR}${includedir}/rx/xdr.h
 
 includes: \
        ${TOP_INCDIR}/rx/rx_packet.h \
@@ -148,99 +145,339 @@ includes: \
        ${TOP_INCDIR}/rx/rx_null.h \
        ${TOP_INCDIR}/rx/xdr.h
 
-kinstall: ${KERNELDIR}/rx
-       $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx
-       $(INSTALL) $(KSRCS) $(KERNELDIR)rx
+${TOP_LIBDIR}/librx.a: librx.a
+       ${INSTALL} $? $@
 
-ukinstall: ${UKERNELDIR}/rx
-       $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx
-       -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx
+${TOP_LIBDIR}/librx-djgpp.a: librx-djgpp.a
+       ${INSTALL} $? ${TOP_LIBDIR}/librx-djgpp.a
+       ${INSTALL} $? ${TOP_LIBDIR}/librx.a
 
-${DEST}/include/rx/rx_packet.h: rx_packet.h
+${TOP_INCDIR}/rx/rx_packet.h: rx_packet.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx.h: rx.h
+${TOP_INCDIR}/rx/rx.h: rx.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_user.h: rx_user.h
+${TOP_INCDIR}/rx/rx_user.h: rx_user.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_event.h: rx_event.h
+${TOP_INCDIR}/rx/rx_event.h: rx_event.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_queue.h: rx_queue.h
+${TOP_INCDIR}/rx/rx_queue.h: rx_queue.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_globals.h: rx_globals.h
+${TOP_INCDIR}/rx/rx_globals.h: rx_globals.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_clock.h: rx_clock.h
+${TOP_INCDIR}/rx/rx_clock.h: rx_clock.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_multi.h: rx_multi.h
+${TOP_INCDIR}/rx/rx_multi.h: rx_multi.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_pthread.h: rx_pthread.h
+${TOP_INCDIR}/rx/rx_pthread.h: rx_pthread.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_lwp.h: rx_lwp.h
+${TOP_INCDIR}/rx/rx_lwp.h: rx_lwp.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_misc.h: rx_misc.h
+${TOP_INCDIR}/rx/rx_misc.h: rx_misc.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rx_null.h: rx_null.h
+${TOP_INCDIR}/rx/rx_null.h: rx_null.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/xdr.h: xdr.h
+${TOP_INCDIR}/rx/xdr.h: xdr.h
        ${INSTALL} $? $@
 
+${TOP_INCDIR}/rx/rx_xmit_nt.h: rx_xmit_nt.h 
+       ${INSTALL} $? $@
+
+kinstall: \
+       ${KERNELDIR}/rx \
+       ${KERNELDIR}/rx/rx.c \
+       ${KERNELDIR}/rx/rx_clock.c \
+       ${KERNELDIR}/rx/rx_clock.h \
+       ${KERNELDIR}/rx/rx_event.c \
+       ${KERNELDIR}/rx/rx_event.h \
+       ${KERNELDIR}/rx/rx_getaddr.c \
+       ${KERNELDIR}/rx/rx_globals.c \
+       ${KERNELDIR}/rx/rx_globals.h \
+       ${KERNELDIR}/rx/rx.h \
+       ${KERNELDIR}/rx/rx_kcommon.c \
+       ${KERNELDIR}/rx/rx_kcommon.h \
+       ${KERNELDIR}/rx/rx_kernel.h \
+       ${KERNELDIR}/rx/rx_kmutex.h \
+       ${KERNELDIR}/rx/rx_knet.c \
+       ${KERNELDIR}/rx/rx_misc.c \
+       ${KERNELDIR}/rx/rx_misc.h \
+       ${KERNELDIR}/rx/rx_multi.h \
+       ${KERNELDIR}/rx/rx_null.c \
+       ${KERNELDIR}/rx/rx_null.h \
+       ${KERNELDIR}/rx/rx_packet.c \
+       ${KERNELDIR}/rx/rx_packet.h \
+       ${KERNELDIR}/rx/rx_queue.h \
+       ${KERNELDIR}/rx/rx_rdwr.c \
+       ${KERNELDIR}/rx/rx_trace.h \
+       ${KERNELDIR}/rx/xdr_afsuuid.c \
+       ${KERNELDIR}/rx/xdr_array.c \
+       ${KERNELDIR}/rx/xdr_arrayn.c \
+       ${KERNELDIR}/rx/xdr.c \
+       ${KERNELDIR}/rx/xdr.h \
+       ${KERNELDIR}/rx/xdr_int64.c      \
+       ${KERNELDIR}/rx/xdr_rx.c
+
+ukinstall: \
+       ${UKERNELDIR}/rx \
+       ${UKERNELDIR}/rx/rx.c \
+       ${UKERNELDIR}/rx/rx_clock.c \
+       ${UKERNELDIR}/rx/rx_clock.h \
+       ${UKERNELDIR}/rx/rx_conncache.c \
+       ${UKERNELDIR}/rx/rx_event.c \
+       ${UKERNELDIR}/rx/rx_event.h \
+       ${UKERNELDIR}/rx/rx_getaddr.c \
+       ${UKERNELDIR}/rx/rx_globals.c \
+       ${UKERNELDIR}/rx/rx_globals.h \
+       ${UKERNELDIR}/rx/rx.h \
+       ${UKERNELDIR}/rx/rx_kcommon.c \
+       ${UKERNELDIR}/rx/rx_kcommon.h \
+       ${UKERNELDIR}/rx/rx_kcommon.h \
+       ${UKERNELDIR}/rx/rx_kernel.h \
+       ${UKERNELDIR}/rx/rx_kmutex.h \
+       ${UKERNELDIR}/rx/rx_knet.c \
+       ${UKERNELDIR}/rx/rx_misc.c \
+       ${UKERNELDIR}/rx/rx_misc.h \
+       ${UKERNELDIR}/rx/rx_multi.h \
+       ${UKERNELDIR}/rx/rx_null.c \
+       ${UKERNELDIR}/rx/rx_null.h \
+       ${UKERNELDIR}/rx/rx_packet.c \
+       ${UKERNELDIR}/rx/rx_packet.h \
+       ${UKERNELDIR}/rx/rx_queue.h \
+       ${UKERNELDIR}/rx/rx_rdwr.c \
+       ${UKERNELDIR}/rx/rx_trace.h \
+       ${UKERNELDIR}/rx/xdr_afsuuid.c \
+       ${UKERNELDIR}/rx/xdr_array.c \
+       ${UKERNELDIR}/rx/xdr_arrayn.c \
+       ${UKERNELDIR}/rx/xdr.c \
+       ${UKERNELDIR}/rx/xdr.h \
+       ${UKERNELDIR}/rx/xdr_int64.c \
+       ${UKERNELDIR}/rx/xdr_rx.c
+
+
 ${UKERNELDIR}/rx:
-       mkdir -p ${UKERNELDIR}/rx
+       mkdir -p $@
 
 ${KERNELDIR}/rx:
-       mkdir -p ${KERNELDIR}/rx
+       mkdir -p $@
 
-install-djgpp: includes kinstall ukinstall librx-djgpp ${TOP_INCDIR}/rx/rx_xmit_nt.h ${TOP_LIBDIR}/librx-djgpp.a
+${KERNELDIR}/rx/rx.c: rx.c
+       ${INSTALL} $? $@
 
-${DEST}/lib/librx.a: librx.a
+${KERNELDIR}/rx/rx_clock.c: rx_clock.c
        ${INSTALL} $? $@
 
-# rule will never be satisfied
-${DESTDIR}/lib/librx-djgpp.a: librx-djgpp.a
-       ${INSTALL} $? ${DESTDIR}/lib/librx.a
+${KERNELDIR}/rx/rx_clock.h: rx_clock.h
+       ${INSTALL} $? $@
 
-${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${TOP_INCDIR}/rx
+${KERNELDIR}/rx/rx_event.c: rx_event.c
        ${INSTALL} $? $@
 
-#
-# Misc. targets
-#
-clean:
-       $(RM) -f *.o *.a core *_component_version_number.c
+${KERNELDIR}/rx/rx_event.h: rx_event.h
+       ${INSTALL} $? $@
 
-include ../config/Makefile.version
+${KERNELDIR}/rx/rx_getaddr.c: rx_getaddr.c
+       ${INSTALL} $? $@
 
-${DESTDIR}${libdir}/librx.a: librx.a
+${KERNELDIR}/rx/rx_globals.c: rx_globals.c
        ${INSTALL} $? $@
 
-${TOP_LIBDIR}/librx.a: librx.a
+${KERNELDIR}/rx/rx_globals.h: rx_globals.h
        ${INSTALL} $? $@
 
-dest: ${DEST}/lib/librx.a \
-       ${DEST}/include/rx/rx_packet.h \
-       ${DEST}/include/rx/rx.h \
-       ${DEST}/include/rx/rx_user.h \
-       ${DEST}/include/rx/rx_event.h \
-       ${DEST}/include/rx/rx_queue.h \
-       ${DEST}/include/rx/rx_globals.h \
-       ${DEST}/include/rx/rx_clock.h \
-       ${DEST}/include/rx/rx_multi.h \
-       ${DEST}/include/rx/rx_pthread.h \
-       ${DEST}/include/rx/rx_lwp.h \
-       ${DEST}/include/rx/rx_misc.h \
-       ${DEST}/include/rx/rx_null.h \
-       ${DEST}/include/rx/xdr.h
+${KERNELDIR}/rx/rx.h: rx.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_kcommon.c: rx_kcommon.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_kcommon.h: rx_kcommon.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_kernel.h: rx_kernel.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_kmutex.h: ${MKAFS_OSTYPE}/rx_kmutex.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_knet.c: ${MKAFS_OSTYPE}/rx_knet.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_misc.c: rx_misc.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_misc.h: rx_misc.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_multi.h: rx_multi.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_null.c: rx_null.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_null.h: rx_null.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_packet.c: rx_packet.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_packet.h: rx_packet.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_queue.h: rx_queue.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_rdwr.c: rx_rdwr.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/rx_trace.h: rx_trace.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr_afsuuid.c: xdr_afsuuid.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr_array.c: xdr_array.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr_arrayn.c: xdr_arrayn.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr.c: xdr.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr.h: xdr.h
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr_int64.c: xdr_int64.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/rx/xdr_rx.c: xdr_rx.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_clock.c: rx_clock.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_clock.h: rx_clock.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_conncache.c: rx_conncache.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx.c: rx.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_event.c: rx_event.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_event.h: rx_event.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_getaddr.c: rx_getaddr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_globals.c: rx_globals.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_globals.h: rx_globals.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx.h: rx.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_kcommon.c: rx_kcommon.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_kcommon.h: UKERNEL/rx_kcommon.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_kernel.h: rx_kernel.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_kmutex.h: UKERNEL/rx_kmutex.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_knet.c: UKERNEL/rx_knet.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_misc.c: rx_misc.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_misc.h : rx_misc.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_multi.h: rx_multi.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_null.c: rx_null.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_null.h: rx_null.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_packet.c: rx_packet.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_packet.h: rx_packet.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_queue.h: rx_queue.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_rdwr.c: rx_rdwr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rx_trace.h: rx_trace.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr_afsuuid.c: xdr_afsuuid.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr_array.c: xdr_array.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr_arrayn.c: xdr_arrayn.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr.c: xdr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr.h: xdr.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr_int64.c: xdr_int64.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/xdr_rx.c: xdr_rx.c
+       ${INSTALL} $? $@
+
+install:
+       ${DESTDIR}${libdir}/librx.a \
+       ${DESTDIR}${includedir}/rx/rx_packet.h \
+       ${DESTDIR}${includedir}/rx/rx.h \
+       ${DESTDIR}${includedir}/rx/rx_user.h \
+       ${DESTDIR}${includedir}/rx/rx_event.h \
+       ${DESTDIR}${includedir}/rx/rx_queue.h \
+       ${DESTDIR}${includedir}/rx/rx_globals.h \
+       ${DESTDIR}${includedir}/rx/rx_clock.h \
+       ${DESTDIR}${includedir}/rx/rx_multi.h \
+       ${DESTDIR}${includedir}/rx/rx_pthread.h \
+       ${DESTDIR}${includedir}/rx/rx_lwp.h \
+       ${DESTDIR}${includedir}/rx/rx_misc.h \
+       ${DESTDIR}${includedir}/rx/rx_null.h \
+       ${DESTDIR}${includedir}/rx/xdr.h
+
+${DESTDIR}${libdir}/librx.a: librx.a
+       ${INSTALL} $? $@
 
 ${DESTDIR}${includedir}/rx/rx_packet.h: rx_packet.h
        ${INSTALL} $? $@
@@ -282,42 +519,67 @@ ${DESTDIR}${includedir}/rx/xdr.h: xdr.h
        ${INSTALL} $? $@
 
 
-${TOP_INCDIR}/rx/rx_packet.h: rx_packet.h
+dest: ${DEST}/lib/librx.a \
+       ${DEST}/include/rx/rx_packet.h \
+       ${DEST}/include/rx/rx.h \
+       ${DEST}/include/rx/rx_user.h \
+       ${DEST}/include/rx/rx_event.h \
+       ${DEST}/include/rx/rx_queue.h \
+       ${DEST}/include/rx/rx_globals.h \
+       ${DEST}/include/rx/rx_clock.h \
+       ${DEST}/include/rx/rx_multi.h \
+       ${DEST}/include/rx/rx_pthread.h \
+       ${DEST}/include/rx/rx_lwp.h \
+       ${DEST}/include/rx/rx_misc.h \
+       ${DEST}/include/rx/rx_null.h \
+       ${DEST}/include/rx/xdr.h
+
+${DEST}/lib/librx.a: librx.a
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx.h: rx.h
+${DEST}/include/rx/rx_packet.h: rx_packet.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_user.h: rx_user.h
+${DEST}/include/rx/rx.h: rx.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_event.h: rx_event.h
+${DEST}/include/rx/rx_user.h: rx_user.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_queue.h: rx_queue.h
+${DEST}/include/rx/rx_event.h: rx_event.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_globals.h: rx_globals.h
+${DEST}/include/rx/rx_queue.h: rx_queue.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_clock.h: rx_clock.h
+${DEST}/include/rx/rx_globals.h: rx_globals.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_multi.h: rx_multi.h
+${DEST}/include/rx/rx_clock.h: rx_clock.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_pthread.h: rx_pthread.h
+${DEST}/include/rx/rx_multi.h: rx_multi.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_lwp.h: rx_lwp.h
+${DEST}/include/rx/rx_pthread.h: rx_pthread.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_misc.h: rx_misc.h
+${DEST}/include/rx/rx_lwp.h: rx_lwp.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/rx_null.h: rx_null.h
+${DEST}/include/rx/rx_misc.h: rx_misc.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/rx/xdr.h: xdr.h
+${DEST}/include/rx/rx_null.h: rx_null.h
+       ${INSTALL} $? $@
+
+${DEST}/include/rx/xdr.h: xdr.h
        ${INSTALL} $? $@
 
+#
+# Misc. targets
+#
+clean:
+       $(RM) -f *.o *.a core *_component_version_number.c
+
+include ../config/Makefile.version
index ae2a8bf75bcb37eb148bbcb9ffffdb398c8110f9..92834695939698681c19a457c3bf73427d5cf3ad 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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@
@@ -32,7 +35,7 @@ include ../config/Makefile.${SYS_NAME}
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS}
 
 LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
               ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a
@@ -42,7 +45,7 @@ all: rxdebug rxdumptrace
 rxdebug.o: rxdebug.c
 
 rxdumptrace.o: ../rx/rx_trace.c
-       $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o ../rx/rx_trace.c
+       $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o ${srcdir}/../rx/rx_trace.c
 
 rxdumptrace: rxdumptrace.o ${LIBS}
        $(RM) -f rxdumptrace
index ef122380a2dff8575c8c9f5bb609ee5dd0f2d357..fb179e685198669431c80a6aca7ec52d366ba2e0 100644 (file)
@@ -7,6 +7,9 @@
 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@
@@ -18,8 +21,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -36,7 +39,7 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
        rpc_svcout.o rpc_clntout.o
 
 GOAL=rxgen
-CFLAGS=-I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=-I. -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
 
 all: ukinstall rxgen ${TOP_INCDIR}/afs/rxgen_consts.h
 
index f5e112ef26097b5c135fb0f92435dc0ddca4fd3c..d62b53be082e35fd779313a1f4c11d0e4acdcefa 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,7 +24,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -31,9 +34,9 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+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 \
        rxkad.h
 
@@ -171,7 +174,7 @@ rxkad_errs.o: rxkad_errs.c
 
 rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
        $(RM) -f rxkad.h rxkad_errs.c
-       ${COMPILE_ET} rxkad_errs -h rxkad
+       ${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad
 
 ticket.o: ticket.c lifetimes.h ${INCLS}
 
index 96d5257d1ec01f348a953b838f5a7fa7fab0d0ed..bb7d8bb9eb8f3c46ce9aa56e772561318f512151 100644 (file)
@@ -65,7 +65,7 @@ th_stress_errs.o: stress_errs.c
        ${THRULE} -o th_stress_errs.o
 
 stress_errs.c stress_errs.h: stress_errs.et
-       $(RM) -f stress_errs.h stress_errs.c; ${COMPILE_ET} stress_errs -h stress_errs
+       $(RM) -f stress_errs.h stress_errs.c; ${COMPILE_ET} -p ${srcdir} stress_errs -h stress_errs
 
 stress.o stress_c.o stress_s.o: ${HEADERS}
 
index 872b4da7fa990d57facaa0560712909439ede5f3..de7c3243898857bb30b66d296ce87d2535d7bb8c 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,11 +31,11 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
 KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c
 
-CFLAGS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o
 
@@ -42,7 +45,7 @@ all: kinstall ukinstall ${TOP_INCDIR}/rx/rxstat.h ${TOP_LIBDIR}/librxstat.a
 # Build targets
 #
 rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg
-       ${RXGEN} -x rxstat.xg
+       ${RXGEN} -x ${srcdir}/rxstat.xg
 
 librxstat.a: ${LIBOBJS} AFS_component_version_number.o
        -$(RM) -f $@
@@ -50,13 +53,13 @@ librxstat.a: ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) $@
 
 Krxstat.cs.c: rxstat.xg
-       ${RXGEN} -x -k -C -o $@ rxstat.xg
+       ${RXGEN} -x -k -C -o $@ ${srcdir}/rxstat.xg
 
 Krxstat.ss.c: rxstat.xg
-       ${RXGEN} -x -k -S -o $@ rxstat.xg
+       ${RXGEN} -x -k -S -o $@ ${srcdir}/rxstat.xg
 
 Krxstat.xdr.c: rxstat.xg
-       ${RXGEN} -x -k -c -o $@ rxstat.xg
+       ${RXGEN} -x -k -c -o $@ ${srcdir}/rxstat.xg
 
 #
 # Install targets
index 3942cbabad3f95b20840cc20eab4bbbf60b25d56..eeb7a6d1dc54e64ab8fc63a0aa951eb881d7bc8b 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,8 +32,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=${DBUG} -I. \
-       -I${TOP_SRCDIR}/config \
+CFLAGS=-I. -I${srcdir} ${DBUG} \
+       -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \
        ${XCFLAGS}
index 73dbc6d330b9a59c1b479578ae862e026847fc6a..4983469277c559ea1415b444d82582ee03c46ba3 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -33,7 +36,7 @@ SHELL=/bin/sh
 #
 include ../config/Makefile.${SYS_NAME}
 OPTIMIZE=-g
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = ${OPTIMIZE} ${XLDFLAGS}
 LIBDIR=${TOP_LIBDIR}/
 AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \
index b89dd13f129c86f37078c4b2c41bb9cad00b2d30..162b61c26a99b2565d2c314686de0973aa617e36 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -48,7 +51,7 @@ all: ${TOP_LIBDIR}/libafssiad.so ${TOP_LIBDIR}/libafssiad.krb.so
 clean:
        $(RM) -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c
 
-CFLAGS=$(DEBUG) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=$(DEBUG) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 ${DEST}/lib/afs/libafssiad.so: libafssiad.so
        ${INSTALL} $? $@
index 30f3af868bd4cb55d67e7cf5e535743c8daf4232..5fe8609d1ca5194d6354da1538e54d11119632ba 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,82 +33,48 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
-CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR}  ${XCFLAGS}
+UKERNELDIR=../libuafs
+KERNELDIR=../libafs
+
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCFLAGS}
 SFLAGS=-P -I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
-UKSRCS=afsl.exp
 
 OBJECTS= afssyscalls.o syscall.o
 RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
 
-include ../config/Makefile.version
-
-all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall
-       case "${SYS_NAME}" in \
-       rs_aix*)                        \
-               ${INSTALL} afs.exp ${TOP_LIBDIR};;      \
-       sgi_6? ) \
-               ${INSTALL} xfsattrs.h ${TOP_INCDIR}/afs;; \
-       esac
-
-install: ${DESTDIR}${libdir}/afs/libsys.a ${DESTDIR}${sbindir}/rmtsysd ${DESTDIR}${includedir}/afs/afssyscalls.h ${DESTDIR}${bindir}/pagsh ${DESTDIR}${bindir}/pagsh.krb  
-       case "${SYS_NAME}" in \
-       rs_aix*)                        \
-               ${INSTALL} afs.exp ${DESTDIR}${includedir}/afs;;        \
-       sgi_6? ) \
-               ${INSTALL} xfsattrs.h ${DESTDIR}${includedir}/afs;; \
-       esac
-
-${DEST}/etc/rmtsysd: rmtsysd
-       ${INSTALL} -s $? $@
-
-${DEST}/bin/pagsh: pagsh
-       ${INSTALL} -s $? $@
-
-${DEST}/bin/pagsh.krb: pagsh.krb
-       ${INSTALL} -s $? $@
-
-${DEST}/include/afs/afssyscalls.h: afssyscalls.h
-       ${INSTALL} $? $@
+all: \
+       rmtsysd \
+       pagsh \
+       pagsh.krb \
+       ${TOP_INCDIR}/afs/afssyscalls.h \
+       ${TOP_INCDIR}/afs/afs.exp \
+       ${TOP_INCDIR}/afs/xfsattrs.h \
+       ${TOP_LIBDIR}/afs.exp \
+       ${TOP_LIBDIR}/libsys.a \
+       ${KERNELDIR}/afs \
+       ${KERNELDIR}/afs/xfsattrs.h \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/afs/afs.exp
 
 libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
        -$(RM) -f $@
-       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
+       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
+               AFS_component_version_number.o ${LIBSYS_AIX_EXP}
        $(RANLIB) $@
-       case "${SYS_NAME}" in                           \
-           rs_aix*)            \
-               $(AR) crv $@ afsl.exp;;         \
-       esac
-
-kinstall:
-       case "${SYS_NAME}" in                           \
-           rs_aix*)                    \
-               ${INSTALL} afs.exp ${TOP_LIBDIR}/afs;;  \
-           sgi_6? ) \
-               ${INSTALL} xfsattrs.h ../libafs/afs;; \
-           *)                                          \
-               echo No $@ source here;;                \
-       esac
-
-ukinstall webinstall: ${UKERNELDIR}/afs ${UKSRCS}
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
 
 tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 
 syscall.o: syscall.s
        case "$(SYS_NAME)" in \
         sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-               /usr/ccs/lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
+               /usr/ccs/lib/cpp  ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* |ppc_darwin* ) \
-                ${CC} ${CFLAGS} -c syscall.s;;          \
+                ${CC} ${CFLAGS} -c ${srcdir}/syscall.s;;          \
         alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER syscall.s; \
+               ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${srcdir}/syscall.s; \
                ${AS} -o syscall.o syscall.i; \
                $(RM) -f syscall.ss syscall.i;; \
         hp_ux11? ) \
@@ -113,110 +82,108 @@ syscall.o: syscall.s
        i386_*bsd* ) \
                touch syscall.o;; \
         *) \
-               /lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
+               /lib/cpp  ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
 
-
 afssyscalls.o: afssyscalls.c afssyscalls.h
-       ${CC} ${CFLAGS} -c afssyscalls.c
+       ${CC} ${CFLAGS} -c ${srcdir}/afssyscalls.c
 
 rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
 rmtsysd: AFS_component_version_number.o
 
 rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg
-       ${RXGEN} rmtsys.xg
+       ${RXGEN} ${srcdir}/rmtsys.xg
 
 rmtsysd: rmtsysd.o libsys.a
        ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
 
-
 pagsh: libsys.a AFS_component_version_number.o
-       ${CC} ${CFLAGS} -c pagsh.c
+       ${CC} ${CFLAGS} -c ${srcdir}/pagsh.c
        ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS}
 
 pagsh.krb: libsys.a
-       ${CC} ${CFLAGS} -c pagsh.c -DAFS_KERBEROS_ENV 
+       ${CC} ${CFLAGS} -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV 
        ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${LIBS}
 
+#
 # Test programs.
+#
 
 iinc:  iinc.c 
-       case "${SYS_NAME}" in                           \
-           sgi_6*) \
-               $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \
-           *)                                          \
-               $(CC) -o iinc -I${TOP_INCDIR} iinc.c ${LIBS} ${XLIBS};; \
-       esac
+       $(CC) -o iinc ${CFLAGS} ${srcdir}/iinc.c ${LIBS}
+
 idec:  idec.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \
-           *)                                          \
-               $(CC) -o idec -I${TOP_INCDIR} idec.c ${LIBS} ${XLIBS};; \
-       esac
+       $(CC) -o idec ${CFLAGS} ${srcdir}/idec.c ${LIBS}
+
 icreate:icreate.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \
-           *)                                          \
-               $(CC) -o icreate -I${TOP_INCDIR} icreate.c ${XLIBS};; \
-       esac
+       $(CC) -o icreate ${CFLAGS} ${srcdir}/icreate.c ${LIBS}
+
 iopen: iopen.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \
-           *)                                          \
-               $(CC) -o iopen -I${TOP_INCDIR} iopen.c ${XLIBS};; \
-       esac
+       $(CC) -o iopen ${CFLAGS} ${srcdir}/iopen.c ${LIBS}
+
 iread: iread.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \
-           *)                                          \
-               ${CC} -o iread -I${TOP_INCDIR} iread.c ${XLIBS};; \
-       esac
+       ${CC} -o iread ${CFLAGS} ${srcdir}/iread.c ${LIBS}
+
 iwrite:        iwrite.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-           sgi_6* ) \
-               ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \
-           *)                                          \
-               ${CC} -o iwrite -I${TOP_INCDIR} iwrite.c ${XLIBS};; \
-       esac
+       ${CC} -o iwrite ${CFLAGS} ${srcdir}/iwrite.c ${LIBS}
+
 istat: istat.c  AFS_component_version_number.c
-       case "${SYS_NAME}" in                           \
-               sgi_6* ) \
-               $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \
-           *)                                          \
-               $(CC) -o istat -I${TOP_INCDIR} istat.c ${XLIBS};; \
-       esac
+       $(CC) -o istat ${CFLAGS} ${srcdir}/istat.c ${LIBS}
+
 fixit: fixit.c AFS_component_version_number.c
-       $(CC) -o fixit -IDEST/include fixit.c libsys.a 
+       $(CC) -o fixit ${CFLAGS} ${srcdir}/fixit.c ${LIBS}
 
 
 xfsinode: xfsinode.c  AFS_component_version_number.c
        case "${SYS_NAME}" in \
                sgi_62 | sgi_64 ) \
-               $(CC) -o xfsinode ${CFLAGS} xfsinode.c libsys.a;; \
+               $(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS}
        esac
 
+#
+# Installation targets
+#
 
+${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h
+       ${INSTALL} $? $@
 
-clean:
-       $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
-       rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
-       rmtsysd AFS_component_version_number.c pagsh pagsh.krb
-${DEST}/lib/afs/libsys.a: libsys.a
+${TOP_INCDIR}/afs/afs.exp: afs.exp
        ${INSTALL} $? $@
 
-${DESTDIR}${libdir}/afs/libsys.a: libsys.a
+${TOP_LIBDIR}/afs.exp: afs.exp
        ${INSTALL} $? $@
 
+${TOP_INCDIR}/afs/xfsattrs.h: xfsattrs.h
+       ${INSTALL} $? $@
 
 ${TOP_LIBDIR}/libsys.a: libsys.a
        ${INSTALL} $? $@
 
+${UKERNELDIR}/afs:
+       mkdir -p $@
+
+${UKERNELDIR}/afs/afs.exp: afs.exp
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs:
+       mkdir -p $@
+
+${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
+       ${INSTALL} $? $@
+
+install: 
+       ${DESTDIR}${libdir}/afs/libsys.a \
+       ${DESTDIR}${sbindir}/rmtsysd \
+       ${DESTDIR}${includedir}/afs/afssyscalls.h \
+       ${DESTDIR}${bindir}/pagsh \
+       ${DESTDIR}${bindir}/pagsh.krb \
+       ${DESTDIR}${includedir}/afs/afs.exp \
+       ${DESTDIR}${includedir}/afs/xfsattrs.h
+
+${DESTDIR}${libdir}/afs/libsys.a: libsys.a
+       ${INSTALL} $? $@
 
 ${DESTDIR}${sbindir}/rmtsysd: rmtsysd
        ${INSTALL} -s $? $@
@@ -224,20 +191,54 @@ ${DESTDIR}${sbindir}/rmtsysd: rmtsysd
 ${DESTDIR}${includedir}/afs/afssyscalls.h: afssyscalls.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h
-       ${INSTALL} $? $@
-
 ${DESTDIR}${bindir}/pagsh: pagsh
        ${INSTALL} -s $? $@
 
 ${DESTDIR}${bindir}/pagsh.krb: pagsh.krb
        ${INSTALL} -s $? $@
 
-dest: ${DEST}/lib/afs/libsys.a ${DEST}/etc/rmtsysd ${DEST}/include/afs/afssyscalls.h ${DEST}/bin/pagsh ${DEST}/bin/pagsh.krb  
-       case "${SYS_NAME}" in \
-       rs_aix*)                        \
-               ${INSTALL} afs.exp ${DEST}/include/afs;;        \
-       sgi_6? ) \
-               ${INSTALL} xfsattrs.h ${DEST}/include/afs;; \
-       esac
+${DESTDIR}${includedir}/afs/afs.exp: afs.exp
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/xfsattrs.h: xfsattrs.h
+       ${INSTALL} $? $@
+
+dest: \
+       ${DEST}/lib/afs/libsys.a \
+       ${DEST}/etc/rmtsysd \
+       ${DEST}/bin/pagsh \
+       ${DEST}/bin/pagsh.krb \
+       ${DEST}/include/afs/afssyscalls.h \
+       ${DEST}/include/afs/afs.exp \
+       ${DEST}/include/afs/xfsattrs.h
 
+${DEST}/lib/afs/libsys.a: libsys.a
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/afs.exp: afs.exp
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/xfsattrs.h: xfsattrs.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/afssyscalls.h: afssyscalls.h
+       ${INSTALL} $? $@
+
+${DEST}/etc/rmtsysd: rmtsysd
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/pagsh: pagsh
+       ${INSTALL} -s $? $@
+
+${DEST}/bin/pagsh.krb: pagsh.krb
+       ${INSTALL} -s $? $@
+
+#
+# Misc targets
+#
+include ../config/Makefile.version
+
+clean:
+       $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
+       rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
+       rmtsysd AFS_component_version_number.c pagsh pagsh.krb
index 338ce9c901fa724ec10114f326e4a70dd9a556eb..53e11333527bc57fd53c0a792020779ac774f57f 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -34,22 +37,23 @@ BUTMINCLS   =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 BUTMINCLUDE =-I${TOP_INCDIR}
 
 CC      = ${MT_CC}
-CFLAGS  = ${DBG} -w -I${TOP_SRCDIR}/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE}
+CFLAGS=-I. -I${srcdir} ${DBG} -w -I${TOP_OBJDIR}/src/config ${MT_CFLAGS} @XBSA_CFLAGS@ ${BUTMINCLUDE} \
+       -I../bucoord -I../volser
 
 LDFLAGS = ${DBG} ${XLDFLAGS}
 
-LWP     =../lwp
-BUTM    =../butm
-BUTC    =../butc
-BUCOORD = ../bucoord
-VOLSER  = ../volser
+LWP     = ${srcdir}/../lwp
+BUTM    = ${srcdir}/../butm
+BUTC    = ${srcdir}/../butc
+BUCOORD = ${srcdir}/../bucoord
+VOLSER  = ${srcdir}/../volser
 
-BUCOORDOBJS=ubik_db_if.o ${BUCOORD}/volstub.o ${BUCOORD}/dlq.o \
-           ${BUCOORD}/status.o ${BUCOORD}/bucoord_errs.o
+BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
+           ../bucoord/status.o ../bucoord/bucoord_errs.o
 
-VOLSERLIBOBJ=${VOLSER}/volint.cs.o  vsprocs.o              ${VOLSER}/vsutils.o \
-            ${VOLSER}/lockprocs.o  ${VOLSER}/volint.xdr.o ${VOLSER}/volerr.o \
-            ${VOLSER}/volint.ss.o  AFS_component_version_number.o 
+VOLSERLIBOBJ=../volser/volint.cs.o  vsprocs.o ../volser/vsutils.o \
+            ../volser/lockprocs.o ../volser/volint.xdr.o ../volser/volerr.o \
+            ../volser/volint.ss.o  AFS_component_version_number.o 
 VOLSERLIBS  =libvolser.a
 
 LWPOBJS     =lock.o
index d8cd5e972e7ebebf6503ee0f3e6382f187f00bfe..1c0a7904a7c797deda8589f960dc564a9dc94c7c 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,14 +22,14 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 OPTIMIZE=-g
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+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 \
           ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \
index eb3035824f3d1699aca98f34b06fb487d73be442..0ef038a05aefcb1707b5968b2c67acc27df0f1a2 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -29,7 +32,7 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs
+INCLUDES=-I${TOP_OBJDIR}/src/config -I. -I.. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs
 CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG
 LDFLAGS=${DBG} ${XLDFLAGS}
 
index 335c1036f1345c2b24d8934d7c7c89e57b2cbd7a..1139b3a98f19444b21cbae960f231e2fcd417717 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -26,7 +29,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS}
+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 \
@@ -41,8 +44,8 @@ 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_SRCDIR}/rxgen/rxgen
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+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
 
@@ -56,34 +59,34 @@ udebug: udebug.o libubik.a
        ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS)
 
 ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c ubik_int.h: ubik_int.xg
-       ${RXGEN} -x ubik_int.xg
+       ${RXGEN} -x ${srcdir}/ubik_int.xg
 
 Kubik_int.cs.c: ubik_int.xg Kubik_int.h
-       ${RXGEN} -x -k -C -o Kubik_int.cs.c ubik_int.xg
+       ${RXGEN} -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
  
 Kubik_int.xdr.c: ubik_int.xg
-       ${RXGEN} -x -k -c -o Kubik_int.xdr.c ubik_int.xg
+       ${RXGEN} -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
  
 Kubik_int.h: ubik_int.xg
-       ${RXGEN} -x -k -h -o Kubik_int.h ubik_int.xg
+       ${RXGEN} -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg
 
 utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
 utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
 utst_int.xdr.o: utst_int.xdr.c utst_int.h
 utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg
-       ${RXGEN} utst_int.xg
+       ${RXGEN} ${srcdir}/utst_int.xg
 
 utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
 utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c
 
 udebug.o: udebug.c ${INCLS} AFS_component_version_number.c
-       ${CC} ${CFLAGS} -g -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c
+       ${CC} ${CFLAGS} -g -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c
 
 uerrors.o: uerrors.c
 
 uerrors.c ubik.h: uerrors.et ubik.p.h
        $(RM) -f ubik.h uerrors.c
-       ${COMPILE_ET} uerrors -h ubik
+       ${COMPILE_ET} -p ${srcdir} uerrors -h ubik
 
 libubik.a: ${LIBOBJS} AFS_component_version_number.o
        -$(RM) -f $@
index 46d8d6ad16c5c0c85f15c4ca92a5a5341a810350..40cff1b3d39a3bef911324a8a55fc7fa78aa27f4 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,7 +22,7 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -36,9 +39,9 @@ LIBS=${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libsys.a
 
-CFLAGS=-I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
 
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
 all: upserver upclient
 
@@ -56,7 +59,7 @@ utils.o: utils.c update.h global.h
 client.o server.o: update.h global.h AFS_component_version_number.c
 
 update.cs.c update.ss.c update.er.c update.h: update.xg
-       ${RXGEN} update.xg
+       ${RXGEN} ${srcdir}/update.xg
 
 #
 # Installation targets
index 07477387f8984f5094370b6afa966d671afe943e..2c2b3195db66615ae69ac858c868ddc5ebdc0d68 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,15 +22,15 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-CFLAGS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 
 all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
 
index c18e6d1b795ee578d5f6d03a6ec6646406f0ac8d..b4db6d6f64e432382cebab99d3527660af0afd3c 100644 (file)
@@ -10,6 +10,9 @@
 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@
@@ -21,8 +24,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -32,7 +35,7 @@ include ../config/Makefile.${SYS_NAME}
 
 all: uss
 
-CFLAGS=${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} -I. ${XCFLAGS}
 
 #
@@ -69,34 +72,34 @@ uss: uss.o ${OBJS}
        ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS}
 
 uss.o:  uss.c AFS_component_version_number.c
-       ${CC} -c ${CFLAGS} uss.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss.c
 
 uss_procs.o : uss_procs.c
-       ${CC} -c ${CFLAGS} uss_procs.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_procs.c
 
 uss_common.o : uss_common.c
-       ${CC} -c ${CFLAGS} uss_common.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_common.c
 
 uss_vol.o : uss_vol.c
-       ${CC} -c ${CFLAGS} uss_vol.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_vol.c
 
 uss_acl.o : uss_acl.c
-       ${CC} -c ${CFLAGS} uss_acl.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_acl.c
 
 uss_ptserver.o : uss_ptserver.c
-       ${CC} -c ${CFLAGS} uss_ptserver.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_ptserver.c
 
 uss_kauth.o : uss_kauth.c
-       ${CC} -c ${CFLAGS} uss_kauth.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_kauth.c
 
 uss_fs.o : uss_fs.c
-       ${CC} -c ${CFLAGS} uss_fs.c
+       ${CC} -c ${CFLAGS} ${srcdir}/uss_fs.c
 
 lex.yy.o : lex.yy.c y.tab.c
        ${CC} -c ${CFLAGS} lex.yy.c
 
 lex.yy.c : lex.c
-       ${LEX} lex.c
+       ${LEX} ${srcdir}/lex.c
 
 y.tab.o : y.tab.c
        ${CC} -c ${CFLAGS} y.tab.c
@@ -118,7 +121,7 @@ uss_kauth.c: uss_kauth.h uss_common.h
 uss_fs.c: uss_fs.h
 
 y.tab.c : grammar.y
-       ${YACC} -d grammar.y
+       ${YACC} -d ${srcdir}/grammar.y
 
 #
 # Installation targets
index 6d4474f6d7357663d50e2b43f784f076555d2c2b..17112bc62c60b0d114b7dd01c02e926b70ee8955 100644 (file)
@@ -8,6 +8,9 @@
 DEST=@DEST@
 TOP_INCDIR=@TOP_INCDIR@
 TOP_LIBDIR=@TOP_LIBDIR@
+TOP_OBJDIR=@TOP_OBJDIR@
+srcdir=@srcdir@
+VPATH=${srcdir}
 bindir=@bindir@
 sbindir=@sbindir@
 libexecdir=@libexecdir@
@@ -16,8 +19,8 @@ includedir=@includedir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
 localstatedir=@localstatedir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 prefix=@prefix@
@@ -37,7 +40,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS = ${OPTMZ} ${XLDFLAGS}
 
 objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
@@ -65,7 +68,7 @@ all: ukinstall kinstall \
        ${TOP_LIBDIR}/libafsutil.a \
        sys
 
-dirpath.h: dirpath.hin Makefile
+dirpath.h: ${srcdir}/dirpath.hin Makefile
        ( sed \
                -e "s+@afsconfdir+${afsconfdir}+" \
                -e "s+@viceetcdir+${viceetcdir}+" \
@@ -77,7 +80,7 @@ dirpath.h: dirpath.hin Makefile
                -e "s+@afslocaldir+${afslocaldir}+" \
                -e "s+@afsbackupdir+${afsbackupdir}+" \
                -e "s+@afsbosconfigdir+${afsbosconfigdir}+" \
-               dirpath.hin >dirpath.h.tmp && \
+               ${srcdir}/dirpath.hin >dirpath.h.tmp && \
                mv dirpath.h.tmp dirpath.h )
 
 util.a: ${objects} AFS_component_version_number.o
@@ -85,56 +88,68 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
-volparse.o: volparse.c
-       ${CC} ${CFLAGS} -c volparse.c
+assert.o: ${srcdir}/assert.c
+       ${CC} ${CFLAGS} -c ${srcdir}/assert.c
 
-snprintf.o: snprintf.c
-       ${CC} ${CFLAGS} -c snprintf.c
+casestrcpy.o: ${srcdir}/casestrcpy.c
+       ${CC} ${CFLAGS} -c ${srcdir}/casestrcpy.c
 
-base64.o: base64.c
-       ${CC} ${CFLAGS} -c base64.c
+hputil.o: ${srcdir}/hputil.c
+       ${CC} ${CFLAGS} -c ${srcdir}/hputil.c
 
-hostparse.o: hostparse.c afsutil.h
-       ${CC} ${CFLAGS} -c hostparse.c
+flipbase64.o: ${srcdir}/flipbase64.c
+       ${CC} ${CFLAGS} -c ${srcdir}/flipbase64.c
 
-ktime.o: ktime.c
-       ${CC} ${CFLAGS} -c ktime.c
+volparse.o: ${srcdir}/volparse.c
+       ${CC} ${CFLAGS} -c ${srcdir}/volparse.c
 
-kreltime.o: kreltime.c
-       ${CC} ${CFLAGS} -c kreltime.c
+snprintf.o: ${srcdir}/snprintf.c
+       ${CC} ${CFLAGS} -c ${srcdir}/snprintf.c
 
-get_krbrlm.o: get_krbrlm.c
-       ${CC} ${CFLAGS} -c get_krbrlm.c
+base64.o: ${srcdir}/base64.c
+       ${CC} ${CFLAGS} -c ${srcdir}/base64.c
 
-uuid.o: uuid.c
-       ${CC} ${CFLAGS} -c uuid.c
+hostparse.o: ${srcdir}/hostparse.c ${srcdir}/afsutil.h
+       ${CC} ${CFLAGS} -c ${srcdir}/hostparse.c
 
-sys.o: sys.c ${TOP_INCDIR}/afs/param.h AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c sys.c
+ktime.o: ${srcdir}/ktime.c
+       ${CC} ${CFLAGS} -c ${srcdir}/ktime.c
+
+kreltime.o: ${srcdir}/kreltime.c
+       ${CC} ${CFLAGS} -c ${srcdir}/kreltime.c
+
+get_krbrlm.o: ${srcdir}/get_krbrlm.c
+       ${CC} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
+
+uuid.o: ${srcdir}/uuid.c
+       ${CC} ${CFLAGS} -c ${srcdir}/uuid.c
+
+sys.o: ${srcdir}/sys.c ${TOP_INCDIR}/afs/param.h AFS_component_version_number.c
+       ${CC} ${CFLAGS} -c ${srcdir}/sys.c
 
 sys: sys.o 
        ${CC} ${LDFLAGS} -o sys sys.o
 
-isathing.o: isathing.c
-       ${CC} ${CFLAGS} -c isathing.c
+isathing.o: ${srcdir}/isathing.c
+       ${CC} ${CFLAGS} -c ${srcdir}/isathing.c
 
-serverLog.o: serverLog.c
-       ${CC} ${CFLAGS} -c serverLog.c
+serverLog.o: ${srcdir}/serverLog.c
+       ${CC} ${CFLAGS} -c ${srcdir}/serverLog.c
 
-dirpath.o: dirpath.c dirpath.h
-       ${CC} ${CFLAGS} -c dirpath.c
+dirpath.o: ${srcdir}/dirpath.c dirpath.h
+       ${CC} ${CFLAGS} -c ${srcdir}/dirpath.c
 
-fileutil.o: fileutil.c fileutil.h
-       ${CC} ${CFLAGS} -c fileutil.c
+fileutil.o: ${srcdir}/fileutil.c ${srcdir}/fileutil.h
+       ${CC} ${CFLAGS} -c ${srcdir}/fileutil.c
 
-netutils.o: netutils.c netutils.h
-       ${CC} ${CFLAGS} -c netutils.c
+netutils.o: ${srcdir}/netutils.c ${srcdir}/netutils.h
+       ${CC} ${CFLAGS} -c ${srcdir}/netutils.c
 
-afs_atomlist.o: afs_atomlist.c afs_atomlist.h
-       ${CC} ${CFLAGS} -c afs_atomlist.c
+afs_atomlist.o: ${srcdir}/afs_atomlist.c ${srcdir}/afs_atomlist.h
+       ${CC} ${CFLAGS} -c ${srcdir}/afs_atomlist.c
 
-afs_lhash.o: afs_lhash.c afs_lhash.h afs_atomlist.h
-       ${CC} ${CFLAGS} -c afs_lhash.c
+afs_lhash.o: ${srcdir}/afs_lhash.c ${srcdir}/afs_lhash.h ${srcdir}/afs_atomlist.h
+       ${CC} ${CFLAGS} -c ${srcdir}/afs_lhash.c
 
 #
 # Install targets
@@ -165,46 +180,46 @@ install: \
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/pthread_nosigs.h: pthread_nosigs.h
+${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/assert.h: assert.h
+${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/errors.h: errors.h
+${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/vice.h: vice.h
+${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/remote.h: remote.h
+${TOP_INCDIR}/afs/remote.h: ${srcdir}/remote.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/ktime.h: ktime.h
+${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/fileutil.h: fileutil.h
+${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/netutils.h: netutils.h
+${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/packages.h: packages.h
+${TOP_INCDIR}/afs/packages.h: ${srcdir}/packages.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/afsutil.h: afsutil.h
+${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/pthread_glock.h: pthread_glock.h
+${TOP_INCDIR}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/afs_atomlist.h: afs_atomlist.h
+${TOP_INCDIR}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/afs/afs_lhash.h: afs_lhash.h
+${TOP_INCDIR}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
        ${INSTALL} $? $@
 
-${TOP_INCDIR}/potpourri.h: potpourri.h
+${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL} $? $@
 
 
@@ -218,46 +233,46 @@ ${TOP_LIBDIR}/libafsutil.a: util.a
 ${DESTDIR}${includedir}/afs/dirpath.h: dirpath.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/pthread_nosigs.h: pthread_nosigs.h
+${DESTDIR}${includedir}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/assert.h: assert.h
+${DESTDIR}${includedir}/afs/assert.h: ${srcdir}/assert.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/errors.h: errors.h
+${DESTDIR}${includedir}/afs/errors.h: ${srcdir}/errors.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/vice.h: vice.h
+${DESTDIR}${includedir}/afs/vice.h: ${srcdir}/vice.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/remote.h: remote.h
+${DESTDIR}${includedir}/afs/remote.h: ${srcdir}/remote.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/ktime.h: ktime.h
+${DESTDIR}${includedir}/afs/ktime.h: ${srcdir}/ktime.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/fileutil.h: fileutil.h
+${DESTDIR}${includedir}/afs/fileutil.h: ${srcdir}/fileutil.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/netutils.h: netutils.h
+${DESTDIR}${includedir}/afs/netutils.h: ${srcdir}/netutils.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/packages.h: packages.h
+${DESTDIR}${includedir}/afs/packages.h: ${srcdir}/packages.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/afsutil.h: afsutil.h
+${DESTDIR}${includedir}/afs/afsutil.h: ${srcdir}/afsutil.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/pthread_glock.h: pthread_glock.h
+${DESTDIR}${includedir}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/afs_atomlist.h: afs_atomlist.h
+${DESTDIR}${includedir}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/afs_lhash.h: afs_lhash.h
+${DESTDIR}${includedir}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/potpourri.h: potpourri.h
+${DESTDIR}${includedir}/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL} $? $@
 
 
@@ -275,46 +290,46 @@ ${DESTDIR}${bindir}/sys: sys
 ${DEST}/include/afs/dirpath.h: dirpath.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/pthread_nosigs.h: pthread_nosigs.h
+${DEST}/include/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/assert.h: assert.h
+${DEST}/include/afs/assert.h: ${srcdir}/assert.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/errors.h: errors.h
+${DEST}/include/afs/errors.h: ${srcdir}/errors.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/vice.h: vice.h
+${DEST}/include/afs/vice.h: ${srcdir}/vice.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/remote.h: remote.h
+${DEST}/include/afs/remote.h: ${srcdir}/remote.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/ktime.h: ktime.h
+${DEST}/include/afs/ktime.h: ${srcdir}/ktime.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/fileutil.h: fileutil.h
+${DEST}/include/afs/fileutil.h: ${srcdir}/fileutil.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/netutils.h: netutils.h
+${DEST}/include/afs/netutils.h: ${srcdir}/netutils.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/packages.h: packages.h
+${DEST}/include/afs/packages.h: ${srcdir}/packages.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/afsutil.h: afsutil.h
+${DEST}/include/afs/afsutil.h: ${srcdir}/afsutil.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/pthread_glock.h: pthread_glock.h
+${DEST}/include/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/afs_atomlist.h: afs_atomlist.h
+${DEST}/include/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
        ${INSTALL} $? $@
 
-${DEST}/include/afs/afs_lhash.h: afs_lhash.h
+${DEST}/include/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
        ${INSTALL} $? $@
 
-${DEST}/include/potpourri.h: potpourri.h
+${DEST}/include/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL} $? $@
 
 
@@ -337,25 +352,25 @@ kinstall: ${KDIR}/vice.h \
        ${KDIR}/afs_lhash.c \
        ${KDIR}/afs_lhash.h
 
-${KDIR}/vice.h: vice.h
+${KDIR}/vice.h: ${srcdir}/vice.h
        ${INSTALL} $? $@
 
-${KDIR}/afs_base64.c: base64.c
+${KDIR}/afs_base64.c: ${srcdir}/base64.c
        ${INSTALL} $? $@
 
-${KDIR}/afs_uuid.c: uuid.c
+${KDIR}/afs_uuid.c: ${srcdir}/uuid.c
        ${INSTALL} $? $@
 
-${KDIR}/afs_atomlist.c: afs_atomlist.c
+${KDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
        ${INSTALL} $? $@
 
-${KDIR}/afs_atomlist.h: afs_atomlist.h
+${KDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
        ${INSTALL} $? $@
 
-${KDIR}/afs_lhash.c: afs_lhash.c
+${KDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
        ${INSTALL} $? $@
 
-${KDIR}/afs_lhash.h: afs_lhash.h
+${KDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
        ${INSTALL} $? $@
 
 ukinstall: \
@@ -377,55 +392,55 @@ ukinstall: \
        ${UKDIR}/casestrcpy.c \
        ${UKDIR}/hostparse.c 
 
-${UKDIR}/errors.h: errors.h
+${UKDIR}/errors.h: ${srcdir}/errors.h
        ${INSTALL} $? $@
 
-${UKDIR}/afsutil.h: afsutil.h
+${UKDIR}/afsutil.h: ${srcdir}/afsutil.h
        ${INSTALL} $? $@
 
 ${UKDIR}/dirpath.h: dirpath.h
        ${INSTALL} $? $@
 
-${UKDIR}/dirpath.c: dirpath.c
+${UKDIR}/dirpath.c: ${srcdir}/dirpath.c
        ${INSTALL} $? $@
 
-${UKDIR}/fileutil.h: fileutil.h
+${UKDIR}/fileutil.h: ${srcdir}/fileutil.h
        ${INSTALL} $? $@
 
-${UKDIR}/fileutil.c: fileutil.c
+${UKDIR}/fileutil.c: ${srcdir}/fileutil.c
        ${INSTALL} $? $@
 
-${UKDIR}/netutils.h: netutils.h
+${UKDIR}/netutils.h: ${srcdir}/netutils.h
        ${INSTALL} $? $@
 
-${UKDIR}/netutils.c: netutils.c
+${UKDIR}/netutils.c: ${srcdir}/netutils.c
        ${INSTALL} $? $@
 
-${UKDIR}/casestrcpy.c: casestrcpy.c
+${UKDIR}/casestrcpy.c: ${srcdir}/casestrcpy.c
        ${INSTALL} $? $@
 
-${UKDIR}/hostparse.c: hostparse.c
+${UKDIR}/hostparse.c: ${srcdir}/hostparse.c
        ${INSTALL} $? $@
 
-${UKDIR}/pthread_glock.h: pthread_glock.h
+${UKDIR}/pthread_glock.h: ${srcdir}/pthread_glock.h
        ${INSTALL} $? $@
 
-${UKDIR}/vice.h: vice.h
+${UKDIR}/vice.h: ${srcdir}/vice.h
        ${INSTALL} $? $@
 
-${UKDIR}/afs_uuid.c: uuid.c
+${UKDIR}/afs_uuid.c: ${srcdir}/uuid.c
        ${INSTALL} $? $@
 
-${UKDIR}/afs_atomlist.c: afs_atomlist.c
+${UKDIR}/afs_atomlist.c: ${srcdir}/afs_atomlist.c
        ${INSTALL} $? $@
 
-${UKDIR}/afs_atomlist.h: afs_atomlist.h
+${UKDIR}/afs_atomlist.h: ${srcdir}/afs_atomlist.h
        ${INSTALL} $? $@
 
-${UKDIR}/afs_lhash.c: afs_lhash.c
+${UKDIR}/afs_lhash.c: ${srcdir}/afs_lhash.c
        ${INSTALL} $? $@
 
-${UKDIR}/afs_lhash.h: afs_lhash.h
+${UKDIR}/afs_lhash.h: ${srcdir}/afs_lhash.h
        ${INSTALL} $? $@
 
 #
index bfa2000ea64b3f0af2297f5a50857fa6ee316b3c..98b6b39fa94bbf427833e7e61e099e576be4973d 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -34,7 +37,8 @@ include ../config/Makefile.${SYS_NAME}
 INSTALLex = ${INSTALL} -m 755
 CCXPG2= /usr/xpg2bin/cc
 
-CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+# Note - be careful with this line, ubik.h is very picky about getting the right lock.h
+CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
 
 INCLS=${TOP_INCDIR}/afs/afsint.h \
        ${TOP_INCDIR}/afs/cmd.h \
@@ -141,7 +145,7 @@ fs: fs.o $(LIBS)
 livesys.o: livesys.c ${INCLS} AFS_component_version_number.c
 
 livesys: livesys.c $(LIBS)
-       ${CC} -g -o livesys $(CFLAGS) livesys.c $(LIBS) ${XLIBS}
+       ${CC} -g -o livesys $(CFLAGS) ${srcdir}/livesys.c $(LIBS) ${XLIBS}
 
 twiddle: twiddle.c $(LIBS)
        ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
@@ -157,9 +161,9 @@ whatfid: whatfid.o ${LIBS}
 fstrace.o: fstrace.c AFS_component_version_number.c
        case ${SYS_NAME} in \
                sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
+                       ${CCXPG2} -g -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \
                * ) \
-                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
+                       ${CC} ${CFLAGS} -g -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \
        esac
 
 fstrace: fstrace.o
@@ -169,7 +173,7 @@ fstrace: fstrace.o
                sun4_411 | sun4c_411 | sun4m_412 ) \
                        ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
                hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \
-                       ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
+                       ${CC} -I${TOP_OBJDIR}/src/config  -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
                * ) \
                        ${CC} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
        esac
@@ -183,9 +187,9 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
                alpha_linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                *linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
                        ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
                sgi_6? ) \
@@ -197,30 +201,30 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
                                case $$CPU_KDEFS in \
                                *-64*)  ${CC} -D_KMEMUSER -woff 1178 \
                                                -g -I${TOP_INCDIR} \
-                                               -I${TOP_SRCDIR}/config \
+                                               -I${TOP_OBJDIR}/src/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS64} \
-                                               -c kdump.c -o kdump.$$IP.o \
+                                               -c ${srcdir}/kdump.c -o kdump.$$IP.o \
                                        ;; \
                                *)      ${CC} -D_KMEMUSER -woff 1178 \
                                                -g -I${TOP_INCDIR} \
-                                               -I${TOP_SRCDIR}/config \
+                                               -I${TOP_OBJDIR}/src/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
-                                               -c kdump.c -o kdump.$$IP.o \
+                                               -c ${srcdir}/kdump.c -o kdump.$$IP.o \
                                        ;; \
                                esac || exit $$?; \
                        done \
                        ;; \
                *) \
-                       ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -c kdump.c ;; \
+                       ${CC} -g -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -c ${srcdir}/kdump.c ;; \
        esac ;
 
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[78] | hp_ux11* ) \
-               ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
+               ${CC} -g -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \
        esac
 
 kdump:  kdump.o
index 57ec1a795add7cb40970c917140ebe8b425aa93d..672fe8d05bd0f6eda1919f15a46697dbe46d9d49 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -30,7 +33,7 @@ include ../../config/Makefile.${SYS_NAME}
 
 OPTIMIZE=-O
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I..
+INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I..
 LDIRS= -L${TOP_LIBDIR} -L..
 LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil
 
index ac083d4fdad01941dfc7e55223026eecde4a7dde..df5da143fab02a9fcf2cfb20a6f8602c29210b6e 100644 (file)
@@ -19,6 +19,9 @@
 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@
@@ -30,19 +33,20 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+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}
 
-CFLAGS=${DBUG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBUG} -w -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LIBC=  /lib/libc.a
-SRCS=  dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
-       pass5.c setup.c utilities.c ufs_subr.c ufs_tables.c dirutils.c\
-       vprintf.c proplist.c
+SRCS=  ${srcdir}/dir.c ${srcdir}/inode.c ${srcdir}/main.c ${srcdir}/pass1.c ${srcdir}/pass1b.c \
+       ${srcdir}/pass2.c ${srcdir}/pass3.c ${srcdir}/pass4.c ${srcdir}/pass5.c ${srcdir}/setup.c \
+       ${srcdir}/utilities.c ${srcdir}/ufs_subr.c ${srcdir}/ufs_tables.c ${srcdir}/dirutils.c \
+       ${srcdir}/vprintf.c ${srcdir}/proplist.c
 LOCOBJS=dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \
        pass5.o setup.o utilities.o dirutils.o vprintf.o proplist.o
 SYSOBJS=ufs_subr.o ufs_tables.o
@@ -100,16 +104,16 @@ ${DESTDIR}${afssrvlibexecdir}/vfsck: vfsck
 dest: ${DEST}/root.server/etc/vfsck ${DEST}/root.server/usr/afs/bin/vfsck
        case ${SYS_NAME} in                             \
                hp_ux10? )                              \
-                       ${CP} bcheckrc ${DEST}/root.server/etc; \
+                       ${CP} ${srcdir}/bcheckrc ${DEST}/root.server/etc; \
                        ;;                              \
                hp_ux11? )                              \
-                       ${CP} bcheckrc-hp_ux110 ${DEST}/root.server/etc/bcheckrc; \
+                       ${CP} ${srcdir}/bcheckrc-hp_ux110 ${DEST}/root.server/etc/bcheckrc; \
                        ;;                              \
        esac
        case ${SYS_NAME} in                             \
                hp_ux10? | hp_ux11? )                   \
-                        ${CP} mount ${DEST}/root.server/etc ;\
-                        ${CP} umount ${DEST}/root.server/etc; \
+                        ${CP} ${srcdir}/mount ${DEST}/root.server/etc ;\
+                        ${CP} ${srcdir}/umount ${DEST}/root.server/etc; \
                         chmod 755 ${DEST}/root.server/etc/bcheckrc ${DEST}/root.server/etc/mount ${DEST}/root.server/etc/umount ;\
                                ;;                                      \
        esac
index 287d9f2d1c6321e3cf61c366f614ee67d64d34bd..5d9e22151a09dd3aaba1c4e35690db62458983cb 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=-DNINTERFACE -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs \
+CFLAGS=-DNINTERFACE -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs \
         ${XCFLAGS} -DRXDEBUG
 
 LDFLAGS = ${DBUG} ${XLDFLAGS}
@@ -80,7 +83,7 @@ ${objects}: ${headers}
 viced.o: AFS_component_version_number.o
 
 check_sysid: check_sysid.c
-       ${CC} ${CFLAGS} -o check_sysid check_sysid.c
+       ${CC} ${CFLAGS} -o check_sysid ${srcdir}/check_sysid.c
 
 fileserver: ${objects} ${headers} ${LIBS}
        set -x; \
@@ -94,13 +97,13 @@ fileserver: ${objects} ${headers} ${LIBS}
        esac
 
 fsprobe.o: fsprobe.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c fsprobe.c
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c ${srcdir}/fsprobe.c
 
 fsprobe: fsprobe.o
        ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} 
 
 cbd.o: callback.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o callback.c
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o ${srcdir}/callback.c
 
 cbd: cbd.o
        ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} 
index 69b880bf18ea2f7a77bce9159d537780b572c2fd..20dcc67402d693af392f0bc3734f11c03adfe849 100644 (file)
@@ -273,6 +273,7 @@ static CallPreamble(acall, activecall)
     struct client *tclient;
     int retry_flag=1;
     int code = 0;
+    char hoststr[16];
     tconn = rx_ConnectionOf(*acall);
     *acall = (struct rx_call *)tconn;      /* change it! */
 
@@ -312,21 +313,23 @@ retry:
 
     h_Lock_r(thost);
     if (thost->hostFlags & HOSTDELETED) {
-      ViceLog(3,("Discarded a packet for deleted host %08x\n",thost->host));
+      ViceLog(3,("Discarded a packet for deleted host %s\n",afs_inet_ntoa_r(thost->host,hoststr)));
       code = VBUSY; /* raced, so retry */
     }
     else if (thost->hostFlags & VENUSDOWN) {
       if (BreakDelayedCallBacks_r(thost)) {
-       ViceLog(0,("BreakDelayedCallbacks FAILED for host %08x which IS UP.  Possible network or routing failure.\n",thost->host));
+       ViceLog(0,("BreakDelayedCallbacks FAILED for host %s which IS UP.  Possible network or routing failure.\n",
+               afs_inet_ntoa_r(thost->host, hoststr)));
        if ( MultiProbeAlternateAddress_r (thost) ) {
-           ViceLog(0, ("MultiProbe failed to find new address for host %x.%d\n",
-                       thost->host, thost->port));
+           ViceLog(0, ("MultiProbe failed to find new address for host %s:%d\n",
+                       afs_inet_ntoa_r(thost->host, hoststr), thost->port));
            code = -1;
        } else {
-           ViceLog(0, ("MultiProbe found new address for host %x.%d\n",
-                       thost->host, thost->port));
+           ViceLog(0, ("MultiProbe found new address for host %s:%d\n",
+                       afs_inet_ntoa_r(thost->host, hoststr), thost->port));
            if (BreakDelayedCallBacks_r(thost)) {
-               ViceLog(0,("BreakDelayedCallbacks FAILED AGAIN for host %08x which IS UP.  Possible network or routing failure.\n",thost->host));
+               ViceLog(0,("BreakDelayedCallbacks FAILED AGAIN for host %s which IS UP.  Possible network or routing failure.\n",
+                       afs_inet_ntoa_r(thost->host, hoststr)));
                code = -1;
            }
        }
index 78ea7013142773ff372f5bd13671afbba37e3a46..186365911ab7b8ccef42e04ff1f4e5e7e8c892a8 100644 (file)
@@ -788,6 +788,8 @@ static void MultiBreakCallBack_r(cba, ncbas, afidp, xhost)
     if (multi_error) {
       unsigned short idx ;
       struct host *hp;
+      char hoststr[16];
+
       idx = 0;
       /* If there's an error, we have to hunt for the right host. 
        * The conns array _should_ correspond one-to-one to the cba
@@ -817,9 +819,9 @@ static void MultiBreakCallBack_r(cba, ncbas, afidp, xhost)
        {
          if (ShowProblems) {
                ViceLog(7, 
-                 ("BCB: Failed on file %u.%d.%d, host %x.%d is down\n",
+                 ("BCB: Failed on file %u.%d.%d, host %s:%d is down\n",
                   afidp->AFSCBFids_val->Volume, afidp->AFSCBFids_val->Vnode,
-                  afidp->AFSCBFids_val->Unique, hp->host, hp->port));
+                  afidp->AFSCBFids_val->Unique, afs_inet_ntoa_r(hp->host,hoststr), hp->port));
                }
 
                H_LOCK
@@ -870,9 +872,10 @@ BreakCallBack(xhost, fid, flag)
     struct rx_connection *conns[MAX_CB_HOSTS];
     struct AFSCBFids tf;
     int hostindex;
+    char hoststr[16];
 
-    ViceLog(7,("BCB: BreakCallBack(all but %x.%d, (%u,%d,%d))\n",
-              xhost->host, xhost->port, fid->Volume, fid->Vnode, 
+    ViceLog(7,("BCB: BreakCallBack(all but %s:%d, (%u,%d,%d))\n",
+              afs_inet_ntoa_r(xhost->host,hoststr), xhost->port, fid->Volume, fid->Vnode, 
               fid->Unique));
 
     H_LOCK
@@ -902,8 +905,8 @@ BreakCallBack(xhost, fid, flag)
            ViceLog(0,("BCB: BOGUS! cb->hhead is NULL!\n"));
          }
          else if (thishost->hostFlags & VENUSDOWN) {
-           ViceLog(7,("BCB: %x.%d is down; delaying break call back\n",
-                      thishost->host, thishost->port));
+           ViceLog(7,("BCB: %s:%d is down; delaying break call back\n",
+                      afs_inet_ntoa_r(thishost->host,hoststr), thishost->port));
            cb->status = CB_DELAYED;
          }
          else {
@@ -949,6 +952,8 @@ DeleteCallBack(host, fid)
 {
     register struct FileEntry *fe;
     register u_short *pcb;
+    char hoststr[16];
+
     cbstuff.DeleteCallBacks++;
     
     H_LOCK
@@ -963,8 +968,8 @@ DeleteCallBack(host, fid)
     }
     pcb = FindCBPtr(fe, host);
     if (!*pcb) {
-       ViceLog(8,("DCB: No call back for host %x.%d, (%u, %d, %d)\n",
-           host->host, host->port, fid->Volume, fid->Vnode, fid->Unique));
+       ViceLog(8,("DCB: No call back for host %s:%d, (%u, %d, %d)\n",
+           afs_inet_ntoa_r(host->host,hoststr), host->port, fid->Volume, fid->Vnode, fid->Unique));
        h_Unlock_r(host);
        H_UNLOCK
        return;
@@ -1075,6 +1080,7 @@ int BreakDelayedCallBacks_r(host)
     struct CallBack *cb;
     struct interfaceAddr interf;
     int code;
+    char hoststr[16];
 
     cbstuff.nbreakers++;
     if (!(host->hostFlags & RESETDONE) && !(host->hostFlags & HOSTDELETED)) {
@@ -1093,13 +1099,13 @@ int BreakDelayedCallBacks_r(host)
        if (code) {
            if (ShowProblems) {
                ViceLog(0,
-          ("CB: Call back connect back failed (in break delayed) for %x.%d\n",
-                       host->host, host->port));
+          ("CB: Call back connect back failed (in break delayed) for %s:%d\n",
+                       afs_inet_ntoa_r(host->host,hoststr), host->port));
              }
            host->hostFlags |= VENUSDOWN;
        }
        else {
-           ViceLog(25,("InitCallBackState success on %x\n",host->host));
+           ViceLog(25,("InitCallBackState success on %s\n",afs_inet_ntoa_r(host->host,hoststr)));
            /* reset was done successfully */
            host->hostFlags |= RESETDONE;
            host->hostFlags &= ~VENUSDOWN;
@@ -1138,14 +1144,14 @@ int BreakDelayedCallBacks_r(host)
            int i;
            if (ShowProblems) {
                ViceLog(0,
-            ("CB: XCallBackBulk failed, host=%x.%d; callback list follows:\n",
-                   host->host, host->port));
+            ("CB: XCallBackBulk failed, host=%s:%d; callback list follows:\n",
+                   afs_inet_ntoa_r(host->host,hoststr), host->port));
            }
            for (i = 0; i<nfids; i++) {
                if (ShowProblems) {
                    ViceLog(0,
-                   ("CB: Host %x.%d, file %u.%u.%u (part of bulk callback)\n",
-                              host->host, host->port, 
+                   ("CB: Host %s:%d, file %u.%u.%u (part of bulk callback)\n",
+                              afs_inet_ntoa_r(host->host,hoststr), host->port, 
                               fids[i].Volume, fids[i].Vnode, fids[i].Unique));
                }
                /* used to do this:
@@ -1184,6 +1190,8 @@ static int MultiBreakVolumeCallBack_r (host, isheld, parms)
   int isheld;
   struct VCBParams *parms;
 {
+    char hoststr[16];
+
     if ( !isheld )
        return isheld; /* host is held only by h_Enumerate, do nothing */
     if ( host->hostFlags & HOSTDELETED )
@@ -1195,11 +1203,11 @@ static int MultiBreakVolumeCallBack_r (host, isheld, parms)
            h_Unlock_r(host);
            return 0;      /* Release hold */
        }
-       ViceLog(8,("BVCB: volume call back for host %x.%d failed\n",
-                host->host,host->port));
+       ViceLog(8,("BVCB: volume call back for host %s:%d failed\n",
+                afs_inet_ntoa_r(host->host,hoststr),host->port));
        if (ShowProblems) {
-           ViceLog(0, ("CB: volume callback for host %x.%d failed\n",
-                   host->host, host->port));
+           ViceLog(0, ("CB: volume callback for host %s:%d failed\n",
+                   afs_inet_ntoa_r(host->host,hoststr), host->port));
        }
        DeleteAllCallBacks_r(host); /* Delete all callback state rather than
                                     attempting to selectively remember to
@@ -1342,6 +1350,8 @@ CleanupTimedOutCallBacks_r()
     register u_short *thead;
     register struct CallBack *cb;
     register int ntimedout = 0;
+    char hoststr[16];
+
     extern void ShutDown();
 
     while (tfirst <= now) {
@@ -1351,8 +1361,8 @@ CleanupTimedOutCallBacks_r()
            do {
                cb = itocb(cbi);
                cbi = cb->tnext;
-               ViceLog(8,("CCB: deleting timed out call back %x.%d, (%u,%u,%u)\n",
-                       h_itoh(cb->hhead)->host, h_itoh(cb->hhead)->port, 
+               ViceLog(8,("CCB: deleting timed out call back %s:%d, (%u,%u,%u)\n",
+                       afs_inet_ntoa_r(h_itoh(cb->hhead)->host, hoststr), h_itoh(cb->hhead)->port, 
                        itofe(cb->fhead)->volid, itofe(cb->fhead)->vnode,
                        itofe(cb->fhead)->unique));
                HDel(cb);
@@ -1465,8 +1475,9 @@ int ClearHostCallbacks_r(hp, locked)
     struct interfaceAddr interf;
     int code;
     int held = 0;
+    char hoststr[16];
 
-    ViceLog(5,("GSS: Delete longest inactive host %x\n", hp->host));
+    ViceLog(5,("GSS: Delete longest inactive host %s\n", afs_inet_ntoa_r(hp->host,hoststr)));
     if ( !(held = h_Held_r(hp)) )
        h_Hold_r(hp);
 
@@ -1794,6 +1805,7 @@ struct AFSCBFids* afidp;
        afs_int32                       addr[AFS_MAX_INTERFACE_ADDR];
        static struct rx_securityClass *sc = 0;
        static struct AFSCBs tc = {0,0};
+       char hoststr[16];
 
        /* nothing more can be done */
        if ( !host->interface ) return 1;       /* failure */
@@ -1824,8 +1836,8 @@ struct AFSCBFids* afidp;
        }
 
        assert(j);  /* at least one alternate address */
-       ViceLog(125,("Starting multibreakcall back on all addr for host:%x\n",
-                       host->host));
+       ViceLog(125,("Starting multibreakcall back on all addr for host %s\n",
+                       afs_inet_ntoa_r(host->host,hoststr)));
        H_UNLOCK
        multi_Rx(conns, j)
        {
@@ -1841,8 +1853,8 @@ struct AFSCBFids* afidp;
                        connSuccess          = conns[multi_i];
                        rx_SetConnDeadTime(host->callback_rxcon, 50);
                        rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
-                       ViceLog(125,("multibreakcall success with addr:%x\n",
-                                       addr[multi_i]));
+                       ViceLog(125,("multibreakcall success with addr %s\n",
+                                       afs_inet_ntoa_r(addr[multi_i],hoststr)));
                        H_UNLOCK
                        multi_Abort; 
                }
@@ -1872,6 +1884,7 @@ struct host*              host;
        struct rx_connection*   connSuccess = 0;
        afs_int32                       addr[AFS_MAX_INTERFACE_ADDR];
        static struct rx_securityClass *sc = 0;
+       char hoststr[16];
 
        /* nothing more can be done */
        if ( !host->interface ) return 1;       /* failure */
@@ -1902,8 +1915,8 @@ struct host*              host;
        }
 
        assert(j);  /* at least one alternate address */
-       ViceLog(125,("Starting multiprobe on all addr for host:%x\n",
-                       host->host));
+       ViceLog(125,("Starting multiprobe on all addr for host %s\n",
+                       afs_inet_ntoa_r(host->host,hoststr)));
        H_UNLOCK
        multi_Rx(conns, j)
        {
@@ -1919,8 +1932,8 @@ struct host*              host;
                        connSuccess          = conns[multi_i];
                        rx_SetConnDeadTime(host->callback_rxcon, 50);
                        rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
-                       ViceLog(125,("multiprobe success with addr:%x\n",
-                                       addr[multi_i]));
+                       ViceLog(125,("multiprobe success with addr %s\n",
+                                       afs_inet_ntoa_r(addr[multi_i],hoststr)));
                        H_UNLOCK
                        multi_Abort; 
                }
index 0280e7b5e458459e653b13d891ccc6db12c242cf..8d235b7af8544e7022ae964675674fd6ce3896ed 100644 (file)
@@ -1596,7 +1596,7 @@ InitVL() {
                                 AFSDIR_SERVER_NETINFO_FILEPATH,
                                 AFSDIR_SERVER_NETRESTRICT_FILEPATH);
       if (code < 0) {
-       ViceLog(0,("Can' register any valid addresses:%s\n",reason));
+       ViceLog(0,("Can't register any valid addresses: %s\n",reason));
        exit(1);
       }
       FS_HostAddr_cnt = (afs_uint32) code;
index 8b4daebf91c9faefc203097aea92aed9ba08ad89..239d4a54921e88062bc93f9b5ecbfd2d593a80db 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -28,9 +31,9 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR=../libafs/
 UKERNELDIR=../libuafs/
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 
-CFLAGS=${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBUG} -I.. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/lwp.h \
              ${TOP_INCDIR}/lock.h  \
@@ -53,37 +56,39 @@ LIBS=\
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/util.a
 
-auditlib=${TOP_LIBDIR}/libaudit.a
 
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h
 UKSRCS=$(KSRCS)
 
 OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o
 
 CDIR=../../../src/vlserver
-include ../config/Makefile.version
 
-noversion: install
 
-all: kinstall ukinstall \
+all: \
        vlserver vlclient cnvldb vlserver cnvldb vldb_check \
        ${TOP_LIBDIR}/libvldb.a \
        ${TOP_INCDIR}/afs/vl_opcodes.h \
        ${TOP_INCDIR}/afs/vlserver.h \
        ${TOP_INCDIR}/afs/vldbint.h \
-       ${TOP_INCDIR}/afs/cnvldb.h
-
-clean:
-       $(RM) -f *.o vlserver vlclient cnvldb vldbint.cs.c vldbint.ss.c \
-       vldbint.xdr.c vldbint.h Kvldbint.cs.c Kvldbint.xdr.c \
-       core *.a *.otl vlserver.h vldb_check\
-       vl_errors.c AFS_component_version_number.c
-
-vldb_check: vldb_check.c
-       $(CC) ${CFLAGS} -o vldb_check vldb_check.c ${XLIBS} \
+       ${TOP_INCDIR}/afs/cnvldb.h \
+       ${KERNELDIR}/afsint/Kvldbint.cs.c \
+       ${KERNELDIR}/afsint/Kvldbint.xdr.c \
+       ${KERNELDIR}/afsint/vl_opcodes.h \
+       ${KERNELDIR}/afsint/vldbint.h \
+       ${UKERNELDIR}/afsint/Kvldbint.cs.c \
+       ${UKERNELDIR}/afsint/Kvldbint.xdr.c \
+       ${UKERNELDIR}/afsint/vl_opcodes.h \
+       ${UKERNELDIR}/afsint/vldbint.h
+
+
+vldb_check: vldb_check.o
+       $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${XLIBS} \
                ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a
 
+vldb_check.o: vldb_check.c AFS_component_version_number.o
+
 cnvldb: cnvldb.o 
        $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${TOP_LIBDIR}/libcmd.a\
                 ${TOP_LIBDIR}/util.a            
@@ -96,7 +101,8 @@ sascnvldb: sascnvldb.o
 sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
-       $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o  $(LIBS) ${XLIBS} ${auditlib}
+       $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
+               vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
 
 vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o
 vlutils.o: vlutils.c ${INCLS}
@@ -105,12 +111,12 @@ vldbint.ss.o: vldbint.ss.c vldbint.xdr.c
 vldbint.cs.o: vldbint.cs.c vldbint.xdr.c
 vldbint.xdr.o: vldbint.xdr.c vldbint.h
 vldbint.ss.c vldbint.cs.c vldbint.xdr.c vldbint.h: vldbint.xg
-       ${RXGEN} -x vldbint.xg
+       ${RXGEN} -x ${srcdir}/vldbint.xg
 
 Kvldbint.cs.c: vldbint.xg
-       ${RXGEN} -x -k -C -o $@ vldbint.xg
+       ${RXGEN} -x -k -C -o $@ ${srcdir}/vldbint.xg
 Kvldbint.xdr.c: vldbint.xg
-       ${RXGEN} -x -k -c -o $@ vldbint.xg
+       ${RXGEN} -x -k -c -o $@ ${srcdir}/vldbint.xg
 
 libvldb.a: $(OBJS) AFS_component_version_number.o
        $(RM) -f $@
@@ -124,7 +130,7 @@ vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
 
 vl_errors.o: vl_errors.c
 vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} vl_errors -h vlserver
+       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver
 
 system: install
 
@@ -143,85 +149,74 @@ ${DEST}/root.server/usr/afs/bin/vlserver: vlserver
 ${DEST}/etc/vldb_convert: cnvldb
        ${INSTALL} -f $? $@
 
-install: \
-       ${DESTDIR}${afssrvlibexecdir}/vlserver \
-       ${DESTDIR}${afssrvsbindir}/vldb_convert \
-       ${DESTDIR}${libdir}/afs/libvldb.a \
-       ${DESTDIR}${includedir}/afs/vl_opcodes.h \
-       ${DESTDIR}${includedir}/afs/vlserver.h \
-       ${DESTDIR}${includedir}/afs/vldbint.h \
-       ${DESTDIR}${includedir}/afs/cnvldb.h \
-       ${DESTDIR}${afssrvsbindir}/vldb_check
-
-libinstall: \
-       ${DESTDIR}${libdir}/afs/libvldb.a \
-       ${DESTDIR}${includedir}/afs/vl_opcodes.h \
-       ${DESTDIR}${includedir}/afs/vlserver.h \
-       ${DESTDIR}${includedir}/afs/vldbint.h \
-       ${DESTDIR}${includedir}/afs/cnvldb.h 
-
-${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver
+${TOP_LIBDIR}/libvldb.a: libvldb.a
        ${INSTALL} $? $@
 
-${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb
-       ${INSTALL} -f $? $@
-
-${DEST}/lib/afs/libvldb.a: libvldb.a
+${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h
        ${INSTALL} $? $@
 
-${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a
+${TOP_INCDIR}/afs/vlserver.h: vlserver.h
        ${INSTALL} $? $@
 
-
-${TOP_LIBDIR}/libvldb.a: libvldb.a
+${TOP_INCDIR}/afs/vldbint.h: vldbint.h
        ${INSTALL} $? $@
 
-
-${DEST}/include/afs/vl_opcodes.h: vl_opcodes.h
+${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/vl_opcodes.h: vl_opcodes.h
+${KERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h
+${KERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c
        ${INSTALL} $? $@
 
-
-${DEST}/include/afs/vlserver.h: vlserver.h
+${KERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h
+${KERNELDIR}/afsint/vldbint.h: vldbint.h
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/vlserver.h: vlserver.h
+${UKERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c
        ${INSTALL} $? $@
 
+${UKERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c
+       ${INSTALL} $? $@
 
-${DEST}/include/afs/vldbint.h: vldbint.h
+${UKERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h
+${UKERNELDIR}/afsint/vldbint.h: vldbint.h
        ${INSTALL} $? $@
 
+install: \
+       ${DESTDIR}${afssrvlibexecdir}/vlserver \
+       ${DESTDIR}${afssrvsbindir}/vldb_convert \
+       ${DESTDIR}${libdir}/afs/libvldb.a \
+       ${DESTDIR}${includedir}/afs/vl_opcodes.h \
+       ${DESTDIR}${includedir}/afs/vlserver.h \
+       ${DESTDIR}${includedir}/afs/vldbint.h \
+       ${DESTDIR}${includedir}/afs/cnvldb.h \
+       ${DESTDIR}${afssrvsbindir}/vldb_check
 
-${TOP_INCDIR}/afs/vldbint.h: vldbint.h
+${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver
        ${INSTALL} $? $@
 
+${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb
+       ${INSTALL} -f $? $@
 
-${DEST}/include/afs/cnvldb.h: cnvldb.h
+${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/afs/cnvldb.h: cnvldb.h
+${DESTDIR}${includedir}/afs/vl_opcodes.h: vl_opcodes.h
        ${INSTALL} $? $@
 
-
-${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
+${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h
        ${INSTALL} $? $@
 
+${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h
+       ${INSTALL} $? $@
 
-${DEST}/etc/vldb_check: vldb_check
+${DESTDIR}${includedir}/afs/cnvldb.h: cnvldb.h
        ${INSTALL} $? $@
 
 ${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check
@@ -236,3 +231,37 @@ dest: \
        ${DEST}/include/afs/vldbint.h \
        ${DEST}/include/afs/cnvldb.h \
        ${DEST}/etc/vldb_check
+
+${DEST}/lib/afs/libvldb.a: libvldb.a
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/vl_opcodes.h: vl_opcodes.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/vlserver.h: vlserver.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/vldbint.h: vldbint.h
+       ${INSTALL} $? $@
+
+${DEST}/include/afs/cnvldb.h: cnvldb.h
+       ${INSTALL} $? $@
+
+${DEST}/etc/vldb_check: vldb_check
+       ${INSTALL} $? $@
+
+${DEST}/root.server/usr/afs/bin/vlserver: vlserver
+       ${INSTALL} $? $@
+
+${DEST}/etc/vldb_convert: cnvldb
+       ${INSTALL} -f $? $@
+
+#
+# Misc targets
+#
+include ../config/Makefile.version
+
+clean:
+       $(RM) -f *.o *.a *.otl *.xdr.c *.cs.c *.ss.c core \
+               vlserver vlclient cnvldb vldbint.h vlserver.h vldb_check \
+               vl_errors.c AFS_component_version_number.c
index c93d917949d7bafa771e1cc57be3f7914f9fe779..d707fa727727c512299071e043a53e6290ba158d 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -28,7 +31,7 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCDIRS=-I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${FSINCLUDES}
+INCDIRS=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} ${FSINCLUDES}
 LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
 
 LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \
@@ -164,9 +167,9 @@ vol-info: vol-info.o physio.o ihandle.o
 listinodes.o: listinodes.c AFS_component_version_number.c
        case ${SYS_NAME} in                             \
                hp?00_ux101 | hp_ux10? )                \
-                       ${CC} ${CFLAGS} -D_FILE64 -c listinodes.c \
+                       ${CC} ${CFLAGS} -D_FILE64 -c ${srcdir}/listinodes.c \
                                ;;                      \
-               * )     ${CC} ${CFLAGS} -c listinodes.c \
+               * )     ${CC} ${CFLAGS} -c ${srcdir}/listinodes.c \
                                ;;                      \
        esac
 
@@ -175,7 +178,7 @@ gi: ${TOP_LIBDIR}/libsys.a
                 *linux* | sgi_* | *fbsd* ) \
                        echo "Don't build gi on ${SYS_NAME}";; \
                 *) \
-                       ${CC} ${CFLAGS} -c gi.c ; \
+                       ${CC} ${CFLAGS} -c ${srcdir}/gi.c ; \
                        ${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \
         esac
 
@@ -197,10 +200,10 @@ fs_conv_sol26: fs_conv_411.o vlib.a
        ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
 
 fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
-       ${CC} ${CFLAGS} -c fs_conv_411.c
+       ${CC} ${CFLAGS} -c ${srcdir}/fs_conv_411.c
 
 xfs_size_check: xfs_size_check.c
-       ${CC} ${CFLAGS} -o xfs_size_check xfs_size_check.c
+       ${CC} ${CFLAGS} -o xfs_size_check ${srcdir}/xfs_size_check.c
 
 #
 # Misc. targets
index 9dadbda661fdfd705367eb9eee487e25a825f266..99e046b216a9509fb8a1682228cb440413083526 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -19,8 +22,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
index 5c5445612617ac9a101a72dbf19f57187e84a104..e52a558e6436993229e3d92f1177a3a0c618f900 100644 (file)
@@ -8,6 +8,9 @@
 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@
@@ -26,13 +29,13 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
 
-INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
+INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
 INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR}
 
 VINCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \
@@ -66,7 +69,7 @@ LIBS=\
 
 VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
 SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
- volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o
+ volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o
 
 all: volserver vos restorevol \
        ${TOP_INCDIR}/afs/volser.h \
@@ -74,7 +77,7 @@ all: volserver vos restorevol \
        ${TOP_LIBDIR}/libvolser.a
 
 restorevol: restorevol.c
-       ${CC} ${CFLAGS} -o restorevol restorevol.c \
+       ${CC} ${CFLAGS} -o restorevol ${srcdir}/restorevol.c \
                ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a
 
 vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
@@ -91,10 +94,10 @@ libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
 
 volser.h volerr.c: volerr.et volser.p.h
        $(RM) -f volser.h volerr.c
-       ${COMPILE_ET} volerr -h volser
+       ${COMPILE_ET} -p ${srcdir} volerr -h volser
 
 volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
-       ${RXGEN} -x volint.xg
+       ${RXGEN} -x ${srcdir}/volint.xg
 
 #
 # Dependencies
index 81cb339e914ef89ffe34f3bd84b98c7efea17fcf..c62090d05a875bd09128d716f30459e9be749966 100644 (file)
@@ -11,6 +11,9 @@
 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@
@@ -22,8 +25,8 @@ mandir=@mandir@
 afssrvbindir=@afssrvbindir@
 afssrvsbindir=@afssrvsbindir@
 afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
-RXGEN=${TOP_SRCDIR}/rxgen/rxgen
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -31,8 +34,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS=${DBUG} -I. \
-       -I${TOP_SRCDIR}/config \
+CFLAGS=-I. -I${srcdir} ${DBUG} \
+       -I${TOP_OBJDIR}/src/config \
        -I${TOP_INCDIR} \
        -I${TOP_INCDIR}/afs \
        -I/usr/include ${XCFLAGS}