diff --git a/Makefile.in b/Makefile.in index cdecbdf9f8..e7ff462950 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ diff --git a/acinclude.m4 b/acinclude.m4 index 5051481788..b68353ddbd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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) diff --git a/configure.in b/configure.in index 6b94ae19ed..1c14a87aca 100644 --- a/configure.in +++ b/configure.in @@ -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 \ diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 07e4239b0f..bf58fc66e9 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -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 $@ diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 67bf2fee0a..315200d958 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -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 diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 213ed29ba8..57dbd51fba 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -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} diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 494806c94e..016a010712 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -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 diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index aeebffc29b..e5187f6cd5 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -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 diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 04d8ba6a88..8794744ef6 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -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 diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index cafaed0cce..8e56b70f14 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -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 diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index 4350da0e6a..1e83978417 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -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@ diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index 6fcbc06b0e..c66d657561 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -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 diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index 0420d732a8..ad6ef9a46c 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -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 diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 55e8c96e25..ba9b99e594 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -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 diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 701dd619ff..68929b202c 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -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 $@ diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 536ed1912c..5f255b037a 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -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 diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index 81e322df53..0bbfa60424 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -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 diff --git a/src/cf/Makefile.am.common b/src/cf/Makefile.am.common index 025b752670..fcb583c592 100644 --- a/src/cf/Makefile.am.common +++ b/src/cf/Makefile.am.common @@ -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) diff --git a/src/cf/linux-test2.m4 b/src/cf/linux-test2.m4 index 8e0753b111..99536c1f9b 100644 --- a/src/cf/linux-test2.m4 +++ b/src/cf/linux-test2.m4 @@ -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 ]) diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index f564e1ec97..be4660e99e 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -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 diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index a7974b0bb3..c6ed991828 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -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 \ diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c index 9cbbf641c8..8c42caf290 100644 --- a/src/comerr/compile_et.c +++ b/src/comerr/compile_et.c @@ -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) { diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 186d63a294..8104f6e1c0 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -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@ diff --git a/src/config/Makefile.alpha_dux40.in b/src/config/Makefile.alpha_dux40.in index 9884a72e70..0c22a66b83 100644 --- a/src/config/Makefile.alpha_dux40.in +++ b/src/config/Makefile.alpha_dux40.in @@ -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 diff --git a/src/config/Makefile.alpha_dux50.in b/src/config/Makefile.alpha_dux50.in index 9c9546ec10..8bb47aaac8 100644 --- a/src/config/Makefile.alpha_dux50.in +++ b/src/config/Makefile.alpha_dux50.in @@ -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 diff --git a/src/config/Makefile.alpha_linux_22.in b/src/config/Makefile.alpha_linux_22.in index eb760eef33..2bfab08ce8 100644 --- a/src/config/Makefile.alpha_linux_22.in +++ b/src/config/Makefile.alpha_linux_22.in @@ -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 diff --git a/src/config/Makefile.alpha_linux_24.in b/src/config/Makefile.alpha_linux_24.in index 83fba93d4d..df6073bfaa 100644 --- a/src/config/Makefile.alpha_linux_24.in +++ b/src/config/Makefile.alpha_linux_24.in @@ -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 diff --git a/src/config/Makefile.hp_ux102.in b/src/config/Makefile.hp_ux102.in index b0b318d559..f136dabf10 100644 --- a/src/config/Makefile.hp_ux102.in +++ b/src/config/Makefile.hp_ux102.in @@ -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 diff --git a/src/config/Makefile.hp_ux110.in b/src/config/Makefile.hp_ux110.in index c07be9a672..65909197ad 100644 --- a/src/config/Makefile.hp_ux110.in +++ b/src/config/Makefile.hp_ux110.in @@ -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 diff --git a/src/config/Makefile.i386_fbsd_42.in b/src/config/Makefile.i386_fbsd_42.in index a8a0001c0b..7cb933bbd2 100644 --- a/src/config/Makefile.i386_fbsd_42.in +++ b/src/config/Makefile.i386_fbsd_42.in @@ -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 diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in index 5c14c95c22..6f8bd5effa 100644 --- a/src/config/Makefile.i386_linux22.in +++ b/src/config/Makefile.i386_linux22.in @@ -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 # diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in index 9635c318eb..b9f4678bec 100644 --- a/src/config/Makefile.i386_linux24.in +++ b/src/config/Makefile.i386_linux24.in @@ -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 # diff --git a/src/config/Makefile.i386_obsd29.in b/src/config/Makefile.i386_obsd29.in index 1682fe4f5e..06010ff04b 100644 --- a/src/config/Makefile.i386_obsd29.in +++ b/src/config/Makefile.i386_obsd29.in @@ -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 diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 1cf3b9e702..9f2ec33834 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -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 diff --git a/src/config/Makefile.parisc_linux24.in b/src/config/Makefile.parisc_linux24.in index 9635c318eb..b9f4678bec 100644 --- a/src/config/Makefile.parisc_linux24.in +++ b/src/config/Makefile.parisc_linux24.in @@ -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 # diff --git a/src/config/Makefile.ppc_darwin_12.in b/src/config/Makefile.ppc_darwin_12.in index be76178b72..276945a798 100644 --- a/src/config/Makefile.ppc_darwin_12.in +++ b/src/config/Makefile.ppc_darwin_12.in @@ -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 diff --git a/src/config/Makefile.ppc_darwin_13.in b/src/config/Makefile.ppc_darwin_13.in index 2559ee45c1..1501410184 100644 --- a/src/config/Makefile.ppc_darwin_13.in +++ b/src/config/Makefile.ppc_darwin_13.in @@ -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 diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in index 423ee5ce22..1555905166 100644 --- a/src/config/Makefile.ppc_linux22.in +++ b/src/config/Makefile.ppc_linux22.in @@ -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 # diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in index 00762dd0e5..89d8905545 100644 --- a/src/config/Makefile.ppc_linux24.in +++ b/src/config/Makefile.ppc_linux24.in @@ -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 # diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in index 7ad11f211b..fc84085ebb 100644 --- a/src/config/Makefile.rs_aix42.in +++ b/src/config/Makefile.rs_aix42.in @@ -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 diff --git a/src/config/Makefile.s390_linux22.in b/src/config/Makefile.s390_linux22.in index 9f7232bffd..a4c513cf05 100644 --- a/src/config/Makefile.s390_linux22.in +++ b/src/config/Makefile.s390_linux22.in @@ -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 # diff --git a/src/config/Makefile.s390_linux24.in b/src/config/Makefile.s390_linux24.in index 421f6216ae..f832967d26 100644 --- a/src/config/Makefile.s390_linux24.in +++ b/src/config/Makefile.s390_linux24.in @@ -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 # diff --git a/src/config/Makefile.sgi_62.in b/src/config/Makefile.sgi_62.in index 8a7d9d6ca5..dc31b3f833 100644 --- a/src/config/Makefile.sgi_62.in +++ b/src/config/Makefile.sgi_62.in @@ -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 diff --git a/src/config/Makefile.sgi_63.in b/src/config/Makefile.sgi_63.in index fd33e43b07..0c01e1e5e6 100644 --- a/src/config/Makefile.sgi_63.in +++ b/src/config/Makefile.sgi_63.in @@ -38,4 +38,4 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -INSTALL=${TOP_SRCDIR}/pinstall/pinstall +INSTALL=${TOP_OBJDIR}/src/pinstall/pinstall diff --git a/src/config/Makefile.sgi_64.in b/src/config/Makefile.sgi_64.in index f8c75148e5..571a72dc08 100644 --- a/src/config/Makefile.sgi_64.in +++ b/src/config/Makefile.sgi_64.in @@ -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 diff --git a/src/config/Makefile.sgi_65.in b/src/config/Makefile.sgi_65.in index a0a0c87ca0..7b3482a5a4 100644 --- a/src/config/Makefile.sgi_65.in +++ b/src/config/Makefile.sgi_65.in @@ -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 diff --git a/src/config/Makefile.sparc64_linux22.in b/src/config/Makefile.sparc64_linux22.in index b550bd7d90..c0fbc7bab3 100644 --- a/src/config/Makefile.sparc64_linux22.in +++ b/src/config/Makefile.sparc64_linux22.in @@ -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 # diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in index b550bd7d90..c0fbc7bab3 100644 --- a/src/config/Makefile.sparc64_linux24.in +++ b/src/config/Makefile.sparc64_linux24.in @@ -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 # diff --git a/src/config/Makefile.sparc_linux22.in b/src/config/Makefile.sparc_linux22.in index b550bd7d90..c0fbc7bab3 100644 --- a/src/config/Makefile.sparc_linux22.in +++ b/src/config/Makefile.sparc_linux22.in @@ -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 # diff --git a/src/config/Makefile.sun4x_55.in b/src/config/Makefile.sun4x_55.in index e7bc377884..15de03757a 100644 --- a/src/config/Makefile.sun4x_55.in +++ b/src/config/Makefile.sun4x_55.in @@ -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 diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in index 8055c01a46..701aaf08b7 100644 --- a/src/config/Makefile.sun4x_56.in +++ b/src/config/Makefile.sun4x_56.in @@ -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 diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in index 5b8a3ea421..d1a63f78be 100644 --- a/src/config/Makefile.sun4x_57.in +++ b/src/config/Makefile.sun4x_57.in @@ -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 diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in index e1fb1301ac..1640703637 100644 --- a/src/config/Makefile.sun4x_58.in +++ b/src/config/Makefile.sun4x_58.in @@ -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 diff --git a/src/config/Makefile.sun4x_59.in b/src/config/Makefile.sun4x_59.in index e1fb1301ac..1640703637 100644 --- a/src/config/Makefile.sun4x_59.in +++ b/src/config/Makefile.sun4x_59.in @@ -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 diff --git a/src/config/Makefile.sunx86_54.in b/src/config/Makefile.sunx86_54.in index 1c60eca7c4..c88923049c 100644 --- a/src/config/Makefile.sunx86_54.in +++ b/src/config/Makefile.sunx86_54.in @@ -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 diff --git a/src/config/make_vnode.pl b/src/config/make_vnode.pl index c020861557..8fc19a9227 100644 --- a/src/config/make_vnode.pl +++ b/src/config/make_vnode.pl @@ -4,9 +4,11 @@ # # Created By: Derek Atkins # +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"); diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index 5c6810f6fa..c61efcc5a5 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -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} \ diff --git a/src/des/Makefile.in b/src/des/Makefile.in index 6e685cc75a..3e75283311 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -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 diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in index 43cc421004..303d576074 100644 --- a/src/des/test/Makefile.in +++ b/src/des/test/Makefile.in @@ -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} diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index cc27fee449..51a484258c 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -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 +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 -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 +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} $? $@ -${DESTDIR}${libdir}/afs/libdir.a: libdir.a +# +# Install targets +# +${TOP_INCDIR}/afs/dir.h: dir.h ${INSTALL} $? $@ - ${TOP_LIBDIR}/libdir.a: libdir.a ${INSTALL} $? $@ +${KERNELDIR}/afs: + mkdir -p $@ -${DEST}/include/afs/dir.h: dir.h +${UKERNELDIR}/afs: + mkdir -p $@ + +${KERNELDIR}/afs/dir.h: dir.h + ${INSTALL} $? $@ + +${KERNELDIR}/afs/afs_dir.c: dir.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/dir.h: dir.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/afs_dir.c: dir.c + ${INSTALL} $? $@ + +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 diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 572d22624f..9e720e2c02 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -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 diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index eb1f0e197d..cd96265cbf 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -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 \ diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 2869fe181c..6418b35e2c 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -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 +CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} + +KSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c \ + afscbint.h afsint.h afsaux.c UKSRCS=${KSRCS} -UTILS=${RXGEN} -include ../config/Makefile.version - -noversion: install - -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 - -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/rxgen_consts.h: ${TOP_INCDIR}/afs/rxgen_consts.h ${INSTALL} $? $@ +${UKERNELDIR}/afsint/rx.h: ${UKERNELDIR}/rx/rx.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/afscbint.h: afscbint.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kcallback.ss.c: Kcallback.ss.c + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kcallback.h: Kcallback.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kvice.cs.c: Kvice.cs.c + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kvice.h: Kvice.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kvice.xdr.c: Kvice.xdr.c + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/afscbint.h: afscbint.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/afsint.h: afsint.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/afsaux.c: afsaux.c + ${INSTALL} $? $@ + +${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} $? $@ - -${TOP_LIBDIR}/libafsint.a: libafsint.a - ${INSTALL} $? $@ - - -${DEST}/include/afs/afsint.h: afsint.h - ${INSTALL} $? $@ - ${DESTDIR}${includedir}/afs/afsint.h: afsint.h ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/afsint.h: afsint.h +${DESTDIR}${includedir}/afs/afscbint.h: afscbint.h ${INSTALL} $? $@ +dest: \ + ${DEST}/lib/afs/libafsint.a \ + ${DEST}/include/afs/afsint.h \ + ${DEST}/include/afs/afscbint.h + +${DEST}/lib/afs/libafsint.a: libafsint.a + ${INSTALL} $? $@ ${DEST}/include/afs/afscbint.h: afscbint.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/afscbint.h: afscbint.h +${DEST}/include/afs/afsint.h: afsint.h ${INSTALL} $? $@ +# +# Misc targets +# -${TOP_INCDIR}/afs/afscbint.h: afscbint.h - ${INSTALL} $? $@ +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 diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index 802f68a8a2..d6fe57e52c 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -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} \ diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index 72ee15a628..e55d512d1b 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -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@ diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index 3f6865f901..a04419237b 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -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 diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in index b1d3f963f9..ff69ac9c12 100644 --- a/src/inetd/Makefile.in +++ b/src/inetd/Makefile.in @@ -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 \ diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index d30fc494ff..b496226c3b 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -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,44 +228,23 @@ 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 $? $@ - -${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 targets +# +${TOP_LIBDIR}/libkauth.a: libkauth.a ${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 +${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a ${INSTALL} $? $@ -${DEST}/lib/afs/libkauth.krb.a: libkauth.krb.a +${TOP_INCDIR}/afs/kautils.h: kautils.h ${INSTALL} $? $@ -${DEST}/etc/kadb_check: rebuild - ${INSTALL} -f $? $@ +${TOP_INCDIR}/afs/kauth.h: kauth.h + ${INSTALL} $? $@ -${DEST}/etc/kdb: kdb - ${INSTALL} -s $? $@ - -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 +${TOP_INCDIR}/afs/kaport.h: kaport.h + ${INSTALL} $? $@ ${UKERNELDIR}/afs: mkdir -p $@ @@ -260,6 +252,42 @@ ${UKERNELDIR}/afs: ${UKERNELDIR}/afsint: mkdir -p $@ +${UKERNELDIR}/afs/authclient.c: authclient.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/user.c: user.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/kautils.h: kautils.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/kaserver.h: kaserver.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/kaaux.c: kaaux.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/token.c: token.c + ${INSTALL} $? $@ + +${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 \ ${DESTDIR}${sbindir}/kas \ @@ -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 + diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 08371f660a..2f3651a229 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -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 diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index f2f33a0a95..d7aaa66c46 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -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@ diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in index 76fd89ebba..e001679202 100644 --- a/src/libadmin/Makefile.in +++ b/src/libadmin/Makefile.in @@ -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@ diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 8f9dc886d5..e693dd75a3 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -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 = \ diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index 38e9cce31e..435447d008 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -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/ diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index adbd6af217..5bfcd1f227 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -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=\ diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index bd0865a1b7..2d5194622a 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -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 diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index 7bb794b1bd..71f592bd8d 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -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 diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index 256b0c4e36..aa06f8690f 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -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/ diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 53b83f6626..5f96bfc479 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -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} ######################################################################## diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index c87db45ff0..225fdba17f 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -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} ######################################################################## diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index 5e0bdad76a..f13855059d 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -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.in similarity index 83% rename from src/libafs/Makefile.common rename to src/libafs/Makefile.common.in index 9f1afd2ac1..f56c30376e 100644 --- a/src/libafs/Makefile.common +++ b/src/libafs/Makefile.common.in @@ -8,7 +8,7 @@ # Common elements for Makefiles for all system types. # SHELL=/bin/sh -INCLUDE= -I. -I/usr/include -I${TOP_SRCDIR}/config +INCLUDE= -I. -I/usr/include -I${TOP_OBJDIR}/src/config AFS =../afs RX =../rx AFSINT =../afsint @@ -35,7 +35,7 @@ all: setup $(COMPDIRS) single_compdir single_instdir single_destdir: cd $(KOBJ) ; \ echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \ - $(MAKE) DESTDIR=${DESTDIR} $@_libafs; + $(MAKE) DESTDIR=${DESTDIR} $@_libafs single_compdir_libafs: libafs single_instdir_libafs: install_libafs @@ -138,197 +138,197 @@ AFSNONFSOBJS = \ # Compilation rules # These files are to be optimized afs_atomlist.o: $(AFS)/afs_atomlist.c - $(CRULE2); + $(CRULE2) afs_lhash.o: $(AFS)/afs_lhash.c - $(CRULE2); + $(CRULE2) afs_analyze.o: $(AFS)/afs_analyze.c - $(CRULE2); + $(CRULE2) afs_axscache.o: $(AFS)/afs_axscache.c - $(CRULE2); + $(CRULE2) afs_buffer.o: $(AFS)/afs_buffer.c - $(CRULE2); + $(CRULE2) afs_cell.o: $(AFS)/afs_cell.c - $(CRULE2); + $(CRULE2) afs_conn.o: $(AFS)/afs_conn.c - $(CRULE2); + $(CRULE2) afs_dcache.o: $(AFS)/afs_dcache.c - $(CRULE2); + $(CRULE2) afs_dynroot.o: $(AFS)/afs_dynroot.c - $(CRULE2); + $(CRULE2) afs_init.o: $(AFS)/afs_init.c - $(CRULE2); + $(CRULE2) afs_mariner.o: $(AFS)/afs_mariner.c - $(CRULE2); + $(CRULE2) afs_osidnlc.o: $(AFS)/afs_osidnlc.c - $(CRULE2); + $(CRULE2) afs_osi.o: $(AFS)/afs_osi.c - $(CRULE2); + $(CRULE2) afs_osi_alloc.o: $(AFS)/afs_osi_alloc.c - $(CRULE2); + $(CRULE2) afs_osi_pag.o: $(AFS)/afs_osi_pag.c - $(CRULE2); + $(CRULE2) afs_osi_sleep.o: $(AFS)/afs_osi_sleep.c - $(CRULE2); + $(CRULE2) afs_osi_vnhold.o: $(AFS)/afs_osi_vnhold.c - $(CRULE2); + $(CRULE2) afs_osi_uio.o: $(AFS)/afs_osi_uio.c - $(CRULE2); + $(CRULE2) afs_osi_vget.o: $(AFS)/afs_osi_vget.c $(CRULE1) afs_segments.o: $(AFS)/afs_segments.c - $(CRULE2); + $(CRULE2) afs_server.o: $(AFS)/afs_server.c - $(CRULE2); + $(CRULE2) afs_user.o: $(AFS)/afs_user.c - $(CRULE2); + $(CRULE2) afs_util.o: $(AFS)/afs_util.c - $(CRULE2); + $(CRULE2) afs_vcache.o: $(AFS)/afs_vcache.c - $(CRULE2); + $(CRULE2) afs_vnop_access.o: $(AFS)/afs_vnop_access.c - $(CRULE1); + $(CRULE1) afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c - $(CRULE1); + $(CRULE1) afs_vnop_create.o: $(AFS)/afs_vnop_create.c - $(CRULE1); + $(CRULE1) afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c - $(CRULE1); + $(CRULE1) afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c - $(CRULE1); + $(CRULE1) afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c - $(CRULE1); + $(CRULE1) afs_vnop_link.o: $(AFS)/afs_vnop_link.c - $(CRULE1); + $(CRULE1) afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c - $(CRULE1); + $(CRULE1) afs_vnop_open.o: $(AFS)/afs_vnop_open.c - $(CRULE1); + $(CRULE1) afs_vnop_read.o: $(AFS)/afs_vnop_read.c - $(CRULE1); + $(CRULE1) afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c - $(CRULE1); + $(CRULE1) afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c - $(CRULE1); + $(CRULE1) afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c - $(CRULE1); + $(CRULE1) afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c - $(CRULE1); + $(CRULE1) afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c - $(CRULE1); + $(CRULE1) afs_vnop_write.o: $(AFS)/afs_vnop_write.c - $(CRULE1); + $(CRULE1) afs_volume.o: $(AFS)/afs_volume.c - $(CRULE2); + $(CRULE2) rx_rdwr.o: $(RX)/rx_rdwr.c - $(CRULE2); + $(CRULE2) afs_uuid.o: $(AFS)/afs_uuid.c - $(CRULE2); + $(CRULE2) xdr_afsuuid.o: $(RX)/xdr_afsuuid.c - $(CRULE2); + $(CRULE2) # these files are not to be optimized - subject to change. afs_cbqueue.o: $(AFS)/afs_cbqueue.c - $(CRULE1); + $(CRULE1) afs_callback.o: $(AFS)/afs_callback.c - $(CRULE1); + $(CRULE1) afs_chunk.o: $(AFS)/afs_chunk.c - $(CRULE1); + $(CRULE1) afs_daemons.o: $(AFS)/afs_daemons.c - $(CRULE1); + $(CRULE1) afs_dir.o: $(AFS)/afs_dir.c - $(CRULE1); + $(CRULE1) AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c - $(CRULE1); + $(CRULE1) afs_lock.o: $(AFS)/afs_lock.c - $(CRULE1); + $(CRULE1) afs_memcache.o: $(AFS)/afs_memcache.c - $(CRULE1); + $(CRULE1) afs_stat.o: $(AFS)/afs_stat.c - $(CRULE1); + $(CRULE1) fcrypt.o: $(AFS)/fcrypt.c - $(CRULE1); + $(CRULE1) crypt_conn.o: $(AFS)/crypt_conn.c - $(CRULE1); + $(CRULE1) rxkad_client.o: $(AFS)/rxkad_client.c - $(CRULE1); + $(CRULE1) rxkad_common.o: $(AFS)/rxkad_common.c - $(CRULE1); + $(CRULE1) afs_exporter.o: $(AFS)/afs_exporter.c - $(CRULE1); + $(CRULE1) afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c - $(CRULE1); + $(CRULE1) afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c - $(CRULE1); + $(CRULE1) afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c - $(CRULE1); + $(CRULE1) rx.o: $(RX)/rx.c - $(CRULE1); + $(CRULE1) rx_clock.o: $(RX)/rx_clock.c - $(CRULE1); + $(CRULE1) rx_event.o: $(RX)/rx_event.c - $(CRULE1); + $(CRULE1) rx_globals.o: $(RX)/rx_globals.c - $(CRULE1); + $(CRULE1) rx_misc.o: $(RX)/rx_misc.c - $(CRULE1); + $(CRULE1) rx_null.o: $(RX)/rx_null.c - $(CRULE1); + $(CRULE1) rx_getaddr.o: $(RX)/rx_getaddr.c - $(CRULE1); + $(CRULE1) rx_packet.o: $(RX)/rx_packet.c - $(CRULE1); + $(CRULE1) xdr_rx.o: $(RX)/xdr_rx.c - $(CRULE1); + $(CRULE1) afs_ncrops.o: $(AFS)/afs_ncrops.c - $(CRULE1); + $(CRULE1) afs_aixops.o: $(AFS)/afs_aixops.c - $(CRULE1); + $(CRULE1) afs_aix_subr.o: $(AFS)/afs_aix_subr.c - $(CRULE1); + $(CRULE1) afs_hp_subr.o: $(AFS)/afs_hp_subr.c - $(CRULE1); + $(CRULE1) afs_gfsops.o: $(AFS)/afs_gfsops.c - $(CRULE1); + $(CRULE1) afs_gfs_subr.o: $(AFS)/afs_gfs_subr.c - $(CRULE1); + $(CRULE1) Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c - $(CRULE1); + $(CRULE1) rxstat.o: $(AFSINT)/rxstat.c - $(CRULE1); + $(CRULE1) Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c - $(CRULE1); + $(CRULE1) Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c - $(CRULE1); + $(CRULE1) Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c - $(CRULE1); + $(CRULE1) Kvice.cs.o: $(AFSINT)/Kvice.cs.c - $(CRULE1); + $(CRULE1) afsaux.o: $(AFSINT)/afsaux.c - $(CRULE1); + $(CRULE1) xdr_arrayn.o: $(RX)/xdr_arrayn.c - $(CRULE1); + $(CRULE1) Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c - $(CRULE1); + $(CRULE1) Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c - $(CRULE1) -DAFS_UUID_XG; + $(CRULE1) -DAFS_UUID_XG afs_main.o: $(AFS)/afs_main.c - $(CRULE1); + $(CRULE1) rx_knet.o: $(RX)/rx_knet.c - $(CRULE1); + $(CRULE1) rx_kcommon.o: $(RX)/rx_kcommon.c - $(CRULE1); + $(CRULE1) # Files which do not contain NFS translator code. afs_call.o: $(AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS; + $(CRULE1) -DAFS_NONFSTRANS afs_pioctl.o: $(AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS; + $(CRULE1) -DAFS_NONFSTRANS # NFS Translator versions of the above code. afs_call_nfs.o: $(AFS)/afs_call.c - $(CRULE1) -o afs_call_nfs.o; + $(CRULE1) -o afs_call_nfs.o afs_pioctl_nfs.o: $(AFS)/afs_pioctl.c - $(CRULE1) -o afs_pioctl_nfs.o; + $(CRULE1) -o afs_pioctl_nfs.o diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index 0d7c3ab4e8..96701c6cc9 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -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 diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 4d4a949042..d2a39758e8 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -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. diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index cf848daa08..951ac055b2 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -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. diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index ef84b22636..86488321c7 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -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. diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index ab50ceb3c9..df9ae60690 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -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 diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 758385e71b..5200f16b43 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -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 diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 8ee1512b1d..12682e777a 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -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 -INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config +INCLUDES = -I. -I../ -I${TOP_OBJDIR}/src/config CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES) diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in index 31e172c9e0..a21f51c762 100644 --- a/src/libafs/MakefileProto.OBSD.in +++ b/src/libafs/MakefileProto.OBSD.in @@ -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. diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index afc4dbb595..471e39844d 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -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 -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. diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index e5d547f398..f0d084070a 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -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 diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index d894f06582..efd9a67ebd 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -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.in similarity index 86% rename from src/libuafs/Makefile.common rename to src/libuafs/Makefile.common.in index 00a930380c..bf1043f6bc 100644 --- a/src/libuafs/Makefile.common +++ b/src/libuafs/Makefile.common.in @@ -9,7 +9,7 @@ # SHELL=/bin/sh -INCLUDE= -I. -I/usr/include -I${TOP_SRCDIR}/config +INCLUDE= -I. -I/usr/include -I${TOP_OBJDIR}/src/config UOBJ =../UAFS WEBOBJ =../AFSWEB AFS =../afs @@ -28,7 +28,7 @@ webinstall: all \ ${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) + $(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 @@ -405,497 +405,497 @@ AFSWEBOBJKRB = \ # These files are for the user space library $(UOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_cell.o: $(AFS)/afs_cell.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_conn.o: $(AFS)/afs_conn.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_init.o: $(AFS)/afs_init.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_osi.o: $(AFS)/afs_osi.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_segments.o: $(AFS)/afs_segments.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_server.o: $(AFS)/afs_server.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_user.o: $(AFS)/afs_user.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_util.o: $(AFS)/afs_util.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_volume.o: $(AFS)/afs_volume.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_callback.o: $(AFS)/afs_callback.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_dir.o: $(AFS)/afs_dir.c - $(CRULE1); + $(CRULE1) $(UOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_lock.o: $(AFS)/afs_lock.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c - $(CRULE1); + $(CRULE1) $(UOBJ)/fcrypt.o: $(AFS)/fcrypt.c - $(CRULE1); + $(CRULE1) $(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx.o: $(RX)/rx.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_clock.o: $(RX)/rx_clock.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_event.o: $(RX)/rx_event.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_globals.o: $(RX)/rx_globals.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_misc.o: $(RX)/rx_misc.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_null.o: $(RX)/rx_null.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_packet.o: $(RX)/rx_packet.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_conncache.o: $(RX)/rx_conncache.c - $(CRULE1); + $(CRULE1) $(UOBJ)/xdr_rx.o: $(RX)/xdr_rx.c - $(CRULE1); + $(CRULE1) $(UOBJ)/xdr_int64.o: $(RX)/xdr_int64.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c - $(CRULE1); + $(CRULE1) $(UOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c - $(CRULE1); + $(CRULE1) $(UOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c - $(CRULE1); + $(CRULE1) $(UOBJ)/osi_vm.o: $(AFS)/osi_vm.c - $(CRULE1); + $(CRULE1) $(UOBJ)/osi_groups.o: $(AFS)/osi_groups.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afsaux.o: $(AFSINT)/afsaux.c - $(CRULE1); + $(CRULE1) $(UOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_main.o: $(AFS)/afs_main.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_knet.o: $(RX)/rx_knet.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c - $(CRULE1); + $(CRULE1) $(UOBJ)/afs_call.o: $(AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS; + $(CRULE1) -DAFS_NONFSTRANS $(UOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS; + $(CRULE1) -DAFS_NONFSTRANS $(UOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c - $(CRULE1) -DAFS_NONFSTRANS; + $(CRULE1) -DAFS_NONFSTRANS $(UOBJ)/ktc.o: $(AFS)/ktc.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ticket.o: $(AFS)/ticket.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ptuser.o: $(AFS)/ptuser.c - $(CRULE1); + $(CRULE1) $(UOBJ)/pterror.o: $(AFS)/pterror.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ubikclient.o: $(AFS)/ubikclient.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/authclient.o: $(AFS)/authclient.c - $(CRULE1); + $(CRULE1) $(UOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c - $(CRULE1); + $(CRULE1) $(UOBJ)/client.o: $(AFS)/client.c - $(CRULE1); + $(CRULE1) $(UOBJ)/user.o: $(AFS)/user.c - $(CRULE1); + $(CRULE1) $(UOBJ)/hostparse.o: $(AFS)/hostparse.c - $(CRULE1); + $(CRULE1) $(UOBJ)/token.o: $(AFS)/token.c - $(CRULE1); + $(CRULE1) $(UOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c - $(CRULE1); + $(CRULE1) $(UOBJ)/kaaux.o: $(AFS)/kaaux.c - $(CRULE1); + $(CRULE1) $(UOBJ)/authcon.o: $(AFS)/authcon.c - $(CRULE1); + $(CRULE1) $(UOBJ)/cellconfig.o: $(AFS)/cellconfig.c - $(CRULE1); + $(CRULE1) $(UOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c - $(CRULE1); + $(CRULE1) $(UOBJ)/dirpath.o: $(AFS)/dirpath.c - $(CRULE1); + $(CRULE1) $(UOBJ)/fileutil.o: $(AFS)/fileutil.c - $(CRULE1); + $(CRULE1) $(UOBJ)/netutils.o: $(AFS)/netutils.c - $(CRULE1); + $(CRULE1) $(UOBJ)/et_name.o: $(AFS)/et_name.c - $(CRULE1); + $(CRULE1) $(UOBJ)/com_err.o: $(AFS)/com_err.c - $(CRULE1); + $(CRULE1) $(UOBJ)/error_msg.o: $(AFS)/error_msg.c - $(CRULE1); + $(CRULE1) $(UOBJ)/uerrors.o: $(AFS)/uerrors.c - $(CRULE1); + $(CRULE1) $(UOBJ)/kaerrors.o: $(AFS)/kaerrors.c - $(CRULE1); + $(CRULE1) $(UOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c - $(CRULE1); + $(CRULE1) $(UOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c - $(CRULE1); + $(CRULE1) $(UOBJ)/rxstat.o: $(AFSINT)/rxstat.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c - $(CRULE1); + $(CRULE1) $(UOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c - $(CRULE1); + $(CRULE1) # These files are for the netscape plugin $(WEBOBJ)/afs_atomlist.o: $(AFS)/afs_atomlist.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_lhash.o: $(AFS)/afs_lhash.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_analyze.o: $(AFS)/afs_analyze.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_axscache.o: $(AFS)/afs_axscache.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_buffer.o: $(AFS)/afs_buffer.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_cell.o: $(AFS)/afs_cell.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_conn.o: $(AFS)/afs_conn.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_dcache.o: $(AFS)/afs_dcache.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_dynroot.o: $(AFS)/afs_dynroot.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_init.o: $(AFS)/afs_init.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_mariner.o: $(AFS)/afs_mariner.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_osidnlc.o: $(AFS)/afs_osidnlc.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_osi.o: $(AFS)/afs_osi.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_osi_pag.o: $(AFS)/afs_osi_pag.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_segments.o: $(AFS)/afs_segments.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_server.o: $(AFS)/afs_server.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_user.o: $(AFS)/afs_user.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_util.o: $(AFS)/afs_util.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vcache.o: $(AFS)/afs_vcache.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_osi_uio.o: $(AFS)/afs_osi_uio.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_access.o: $(AFS)/afs_vnop_access.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_attrs.o: $(AFS)/afs_vnop_attrs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_create.o: $(AFS)/afs_vnop_create.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_dirops.o: $(AFS)/afs_vnop_dirops.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_fid.o: $(AFS)/afs_vnop_fid.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_flock.o: $(AFS)/afs_vnop_flock.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_link.o: $(AFS)/afs_vnop_link.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_lookup.o: $(AFS)/afs_vnop_lookup.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_open.o: $(AFS)/afs_vnop_open.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_read.o: $(AFS)/afs_vnop_read.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_readdir.o: $(AFS)/afs_vnop_readdir.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_remove.o: $(AFS)/afs_vnop_remove.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_rename.o: $(AFS)/afs_vnop_rename.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_strategy.o: $(AFS)/afs_vnop_strategy.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_symlink.o: $(AFS)/afs_vnop_symlink.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_vnop_write.o: $(AFS)/afs_vnop_write.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_volume.o: $(AFS)/afs_volume.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_rdwr.o: $(RX)/rx_rdwr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_cbqueue.o: $(AFS)/afs_cbqueue.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_callback.o: $(AFS)/afs_callback.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_chunk.o: $(AFS)/afs_chunk.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_daemons.o: $(AFS)/afs_daemons.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_dir.o: $(AFS)/afs_dir.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/AFS_component_version_number.o: $(AFS)/AFS_component_version_number.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_lock.o: $(AFS)/afs_lock.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/fcrypt.o: $(AFS)/fcrypt.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rxkad_common.o: $(AFS)/rxkad_common.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_exporter.o: $(AFS)/afs_exporter.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx.o: $(RX)/rx.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_clock.o: $(RX)/rx_clock.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_event.o: $(RX)/rx_event.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_globals.o: $(RX)/rx_globals.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_misc.o: $(RX)/rx_misc.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_null.o: $(RX)/rx_null.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_getaddr.o: $(RX)/rx_getaddr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_packet.o: $(RX)/rx_packet.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_conncache.o: $(RX)/rx_conncache.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/xdr_rx.o: $(RX)/xdr_rx.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_usrops.o: $(AFS)/afs_usrops.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_uuid.o: $(AFS)/afs_uuid.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/xdr_afsuuid.o: $(RX)/xdr_afsuuid.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/osi_vnodeops.o: $(AFS)/osi_vnodeops.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/osi_vm.o: $(AFS)/osi_vm.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/osi_groups.o: $(AFS)/osi_groups.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Kcallback.ss.o: $(AFSINT)/Kcallback.ss.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Kvice.xdr.o: $(AFSINT)/Kvice.xdr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Kvice.cs.o: $(AFSINT)/Kvice.cs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afsaux.o: $(AFSINT)/afsaux.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/xdr_arrayn.o: $(RX)/xdr_arrayn.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Kvldbint.cs.o: $(AFSINT)/Kvldbint.cs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Kvldbint.xdr.o: $(AFSINT)/Kvldbint.xdr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_main.o: $(AFS)/afs_main.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_knet.o: $(RX)/rx_knet.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rx_kcommon.o: $(RX)/rx_kcommon.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/afs_call.o: $(AFS)/afs_call.c - $(CRULE2) -DAFS_NONFSTRANS; + $(CRULE2) -DAFS_NONFSTRANS $(WEBOBJ)/afs_pioctl.o: $(AFS)/afs_pioctl.c - $(CRULE2) -DAFS_NONFSTRANS; + $(CRULE2) -DAFS_NONFSTRANS $(WEBOBJ)/osi_vfsops.o: $(AFS)/osi_vfsops.c - $(CRULE2) -DAFS_NONFSTRANS; + $(CRULE2) -DAFS_NONFSTRANS $(WEBOBJ)/ktc.o: $(AFS)/ktc.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ktc.krb.o: $(AFS)/ktc.c - $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC ; - mv ktc.o ktc.krb.o; + $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC + mv ktc.o ktc.krb.o $(WEBOBJ)/securehash.o: $(AFS)/securehash.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/nsafs.o: $(AFS)/nsafs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ticket.o: $(AFS)/ticket.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rxkad_server.o: $(AFS)/rxkad_server.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ptint.cs.o: $(AFSINT)/ptint.cs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ptint.xdr.o: $(AFSINT)/ptint.xdr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ptuser.o: $(AFS)/ptuser.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/pterror.o: $(AFS)/pterror.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ubikclient.o: $(AFS)/ubikclient.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ubik_int.cs.o: $(AFSINT)/ubik_int.cs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ubik_int.xdr.o: $(AFSINT)/ubik_int.xdr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/authclient.o: $(AFS)/authclient.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/kalocalcell.o: $(AFS)/kalocalcell.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/client.o: $(AFS)/client.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/user.o: $(AFS)/user.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/hostparse.o: $(AFS)/hostparse.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/token.o: $(AFS)/token.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/acfg_errors.o: $(AFS)/acfg_errors.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/kaaux.o: $(AFS)/kaaux.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/kauth.cs.o: $(AFSINT)/kauth.cs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/kauth.xdr.o: $(AFSINT)/kauth.xdr.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/authcon.o: $(AFS)/authcon.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/cellconfig.o: $(AFS)/cellconfig.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/casestrcpy.o: $(AFS)/casestrcpy.c - $(CRULE1); + $(CRULE1) $(WEBOBJ)/dirpath.o: $(AFS)/dirpath.c - $(CRULE1); + $(CRULE1) $(WEBOBJ)/fileutil.o: $(AFS)/fileutil.c - $(CRULE1); + $(CRULE1) $(WEBOBJ)/netutils.o: $(AFS)/netutils.c - $(CRULE1); + $(CRULE1) $(WEBOBJ)/et_name.o: $(AFS)/et_name.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/com_err.o: $(AFS)/com_err.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/error_msg.o: $(AFS)/error_msg.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/uerrors.o: $(AFS)/uerrors.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/kaerrors.o: $(AFS)/kaerrors.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/ktc_errors.o: $(AFS)/ktc_errors.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rxkad_errs.o: $(AFS)/rxkad_errs.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/rxstat.o: $(AFSINT)/rxstat.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Krxstat.ss.o: $(AFSINT)/Krxstat.ss.c - $(CRULE2); + $(CRULE2) $(WEBOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c - $(CRULE2); + $(CRULE2) clean: -$(RM) -rf UAFS* AFSWEB* nsapi des afs afsint config rx diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index be37a4958c..9b4cd603e4 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -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 diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index 8931b1905d..78f6be2d98 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -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 diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index 24f3bfcc3f..df1625e2a1 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -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 diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index e597b89eff..f16d116e96 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -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 diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 0057b011ad..1fa074c38e 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -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 diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index a078593a96..c2b9a2f31b 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -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 diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 0e65b33ede..59e08ff009 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -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 diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index d95d14f851..0b07425c47 100644 --- a/src/libuafs/MakefileProto.SOLARIS.in +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -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 diff --git a/src/log/Makefile.in b/src/log/Makefile.in index 31ca5baf41..e347062ff4 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -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} diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index 676b27f9b9..4fc4e58496 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -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@ diff --git a/src/login/Makefile.in b/src/login/Makefile.in index be2903a9ea..70404aaafb 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -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 diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index ffb0679ffb..d589aaa95e 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -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 # diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in index bf1077fc8d..f82550a88e 100644 --- a/src/mpp/Makefile.in +++ b/src/mpp/Makefile.in @@ -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@ diff --git a/src/ntp/Makefile.in b/src/ntp/Makefile.in index ab558b8ba2..138d7220c4 100644 --- a/src/ntp/Makefile.in +++ b/src/ntp/Makefile.in @@ -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 diff --git a/src/null/Makefile.in b/src/null/Makefile.in index 298c28ce33..763cad6bab 100644 --- a/src/null/Makefile.in +++ b/src/null/Makefile.in @@ -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} $? $@ diff --git a/src/package/Makefile.in b/src/package/Makefile.in index 6ec6a692cf..d2bbbb2311 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -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 diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 929115c581..bd6e4cae27 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -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) ;;\ diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index 49067af2f0..53ef925791 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -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 diff --git a/src/pinstall/test/Makefile.in b/src/pinstall/test/Makefile.in index 5ecf101ea8..b22a8b268a 100644 --- a/src/pinstall/test/Makefile.in +++ b/src/pinstall/test/Makefile.in @@ -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@ diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index 53c9d516ff..03082fecbd 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -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 diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index bf9eb2d767..750b9b4670 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -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 $@ diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in index 0c35913340..7546d8a692 100644 --- a/src/rcp/Makefile.in +++ b/src/rcp/Makefile.in @@ -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 \ diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in index 52c819d8df..31450ef077 100644 --- a/src/rlogind/Makefile.in +++ b/src/rlogind/Makefile.in @@ -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 diff --git a/src/rsh/Makefile.in b/src/rsh/Makefile.in index b89f27a803..8e6c4c55d3 100644 --- a/src/rsh/Makefile.in +++ b/src/rsh/Makefile.in @@ -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 diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index 1e5bad7be5..2530f0f6d2 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -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/' 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 - -ukinstall: ${UKERNELDIR}/rx - $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx - -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx - -${DEST}/include/rx/rx_packet.h: rx_packet.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx.h: rx.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_user.h: rx_user.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_event.h: rx_event.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_queue.h: rx_queue.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_globals.h: rx_globals.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_clock.h: rx_clock.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_multi.h: rx_multi.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_pthread.h: rx_pthread.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_lwp.h: rx_lwp.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_misc.h: rx_misc.h - ${INSTALL} $? $@ - -${DEST}/include/rx/rx_null.h: rx_null.h - ${INSTALL} $? $@ - -${DEST}/include/rx/xdr.h: xdr.h - ${INSTALL} $? $@ - -${UKERNELDIR}/rx: - mkdir -p ${UKERNELDIR}/rx - -${KERNELDIR}/rx: - mkdir -p ${KERNELDIR}/rx - -install-djgpp: includes kinstall ukinstall librx-djgpp ${TOP_INCDIR}/rx/rx_xmit_nt.h ${TOP_LIBDIR}/librx-djgpp.a - -${DEST}/lib/librx.a: librx.a - ${INSTALL} $? $@ - -# rule will never be satisfied -${DESTDIR}/lib/librx-djgpp.a: librx-djgpp.a - ${INSTALL} $? ${DESTDIR}/lib/librx.a - -${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${TOP_INCDIR}/rx - ${INSTALL} $? $@ - -# -# Misc. targets -# -clean: - $(RM) -f *.o *.a core *_component_version_number.c - -include ../config/Makefile.version - -${DESTDIR}${libdir}/librx.a: librx.a - ${INSTALL} $? $@ - ${TOP_LIBDIR}/librx.a: librx.a ${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 +${TOP_LIBDIR}/librx-djgpp.a: librx-djgpp.a + ${INSTALL} $? ${TOP_LIBDIR}/librx-djgpp.a + ${INSTALL} $? ${TOP_LIBDIR}/librx.a + +${TOP_INCDIR}/rx/rx_packet.h: rx_packet.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx.h: rx.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_user.h: rx_user.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_event.h: rx_event.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_queue.h: rx_queue.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_globals.h: rx_globals.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_clock.h: rx_clock.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_multi.h: rx_multi.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_pthread.h: rx_pthread.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_lwp.h: rx_lwp.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_misc.h: rx_misc.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_null.h: rx_null.h + ${INSTALL} $? $@ + +${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 $@ + +${KERNELDIR}/rx: + mkdir -p $@ + +${KERNELDIR}/rx/rx.c: rx.c + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_clock.c: rx_clock.c + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_clock.h: rx_clock.h + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_event.c: rx_event.c + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_event.h: rx_event.h + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_getaddr.c: rx_getaddr.c + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_globals.c: rx_globals.c + ${INSTALL} $? $@ + +${KERNELDIR}/rx/rx_globals.h: rx_globals.h + ${INSTALL} $? $@ + +${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 diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index ae2a8bf75b..9283469593 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -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 diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index ef122380a2..fb179e6851 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -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 diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index f5e112ef26..d62b53be08 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -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} diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 96d5257d1e..bb7d8bb9eb 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -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} diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index 872b4da7fa..de7c324389 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -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 diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 3942cbabad..eeb7a6d1dc 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -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} diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 73dbc6d330..4983469277 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -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 \ diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index b89dd13f12..162b61c26a 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -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} $? $@ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 30f3af868b..5fe8609d1c 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -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,33 +33,197 @@ 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: \ + 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 -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;; \ +libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crv $@ ${OBJECTS} ${RMTOBJS} \ + AFS_component_version_number.o ${LIBSYS_AIX_EXP} + $(RANLIB) $@ + +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} ${srcdir}/syscall.s syscall.ss; \ + as -o syscall.o syscall.ss; \ + $(RM) syscall.ss;; \ + sgi_* |ppc_darwin* ) \ + ${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 ${srcdir}/syscall.s; \ + ${AS} -o syscall.o syscall.i; \ + $(RM) -f syscall.ss syscall.i;; \ + hp_ux11? ) \ + touch syscall.o;; \ + i386_*bsd* ) \ + touch syscall.o;; \ + *) \ + /lib/cpp ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \ + as -o syscall.o syscall.ss; \ + $(RM) syscall.ss;; \ esac -install: ${DESTDIR}${libdir}/afs/libsys.a ${DESTDIR}${sbindir}/rmtsysd ${DESTDIR}${includedir}/afs/afssyscalls.h ${DESTDIR}${bindir}/pagsh ${DESTDIR}${bindir}/pagsh.krb +afssyscalls.o: afssyscalls.c afssyscalls.h + ${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} ${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 ${srcdir}/pagsh.c + ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS} + +pagsh.krb: libsys.a + ${CC} ${CFLAGS} -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV + ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${LIBS} + +# +# Test programs. +# + +iinc: iinc.c + $(CC) -o iinc ${CFLAGS} ${srcdir}/iinc.c ${LIBS} + +idec: idec.c AFS_component_version_number.c + $(CC) -o idec ${CFLAGS} ${srcdir}/idec.c ${LIBS} + +icreate:icreate.c AFS_component_version_number.c + $(CC) -o icreate ${CFLAGS} ${srcdir}/icreate.c ${LIBS} + +iopen: iopen.c AFS_component_version_number.c + $(CC) -o iopen ${CFLAGS} ${srcdir}/iopen.c ${LIBS} + +iread: iread.c AFS_component_version_number.c + ${CC} -o iread ${CFLAGS} ${srcdir}/iread.c ${LIBS} + +iwrite: iwrite.c AFS_component_version_number.c + ${CC} -o iwrite ${CFLAGS} ${srcdir}/iwrite.c ${LIBS} + +istat: istat.c AFS_component_version_number.c + $(CC) -o istat ${CFLAGS} ${srcdir}/istat.c ${LIBS} + +fixit: fixit.c AFS_component_version_number.c + $(CC) -o fixit ${CFLAGS} ${srcdir}/fixit.c ${LIBS} + + +xfsinode: xfsinode.c AFS_component_version_number.c case "${SYS_NAME}" in \ - rs_aix*) \ - ${INSTALL} afs.exp ${DESTDIR}${includedir}/afs;; \ - sgi_6? ) \ - ${INSTALL} xfsattrs.h ${DESTDIR}${includedir}/afs;; \ + sgi_62 | sgi_64 ) \ + $(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS} esac +# +# Installation targets +# + +${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afs.exp: afs.exp + ${INSTALL} $? $@ + +${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 $? $@ + +${DESTDIR}${includedir}/afs/afssyscalls.h: afssyscalls.h + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/pagsh: pagsh + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/pagsh.krb: pagsh.krb + ${INSTALL} -s $? $@ + +${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 $? $@ @@ -66,178 +233,12 @@ ${DEST}/bin/pagsh: pagsh ${DEST}/bin/pagsh.krb: pagsh.krb ${INSTALL} -s $? $@ -${DEST}/include/afs/afssyscalls.h: afssyscalls.h - ${INSTALL} $? $@ - -libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o - -$(RM) -f $@ - $(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o - $(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; \ - as -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - sgi_* |ppc_darwin* ) \ - ${CC} ${CFLAGS} -c syscall.s;; \ - alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ - ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER syscall.s; \ - ${AS} -o syscall.o syscall.i; \ - $(RM) -f syscall.ss syscall.i;; \ - hp_ux11? ) \ - touch syscall.o;; \ - i386_*bsd* ) \ - touch syscall.o;; \ - *) \ - /lib/cpp ${SFLAGS} syscall.s syscall.ss; \ - as -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - esac - - -afssyscalls.o: afssyscalls.c afssyscalls.h - ${CC} ${CFLAGS} -c afssyscalls.c - -rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h -rmtsysd: AFS_component_version_number.o - -rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg - ${RXGEN} rmtsys.xg - -rmtsysd: rmtsysd.o libsys.a - ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS} - - -pagsh: libsys.a AFS_component_version_number.o - ${CC} ${CFLAGS} -c pagsh.c - ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS} - -pagsh.krb: libsys.a - ${CC} ${CFLAGS} -c pagsh.c -DAFS_KERBEROS_ENV - ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${LIBS} - -# Test programs. - -iinc: iinc.c - case "${SYS_NAME}" in \ - sgi_6*) \ - $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \ - *) \ - $(CC) -o iinc -I${TOP_INCDIR} iinc.c ${LIBS} ${XLIBS};; \ - esac -idec: idec.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \ - *) \ - $(CC) -o idec -I${TOP_INCDIR} idec.c ${LIBS} ${XLIBS};; \ - esac -icreate:icreate.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \ - *) \ - $(CC) -o icreate -I${TOP_INCDIR} icreate.c ${XLIBS};; \ - esac -iopen: iopen.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \ - *) \ - $(CC) -o iopen -I${TOP_INCDIR} iopen.c ${XLIBS};; \ - esac -iread: iread.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \ - *) \ - ${CC} -o iread -I${TOP_INCDIR} iread.c ${XLIBS};; \ - esac -iwrite: iwrite.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \ - *) \ - ${CC} -o iwrite -I${TOP_INCDIR} iwrite.c ${XLIBS};; \ - esac -istat: istat.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_6* ) \ - $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \ - *) \ - $(CC) -o istat -I${TOP_INCDIR} istat.c ${XLIBS};; \ - esac -fixit: fixit.c AFS_component_version_number.c - $(CC) -o fixit -IDEST/include fixit.c libsys.a - - -xfsinode: xfsinode.c AFS_component_version_number.c - case "${SYS_NAME}" in \ - sgi_62 | sgi_64 ) \ - $(CC) -o xfsinode ${CFLAGS} xfsinode.c libsys.a;; \ - esac - - +# +# 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 -${DEST}/lib/afs/libsys.a: libsys.a - ${INSTALL} $? $@ - -${DESTDIR}${libdir}/afs/libsys.a: libsys.a - ${INSTALL} $? $@ - - -${TOP_LIBDIR}/libsys.a: libsys.a - ${INSTALL} $? $@ - - -${DESTDIR}${sbindir}/rmtsysd: rmtsysd - ${INSTALL} -s $? $@ - -${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 - diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 338ce9c901..53e1133352 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -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 diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index d8cd5e972e..1c0a7904a7 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -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 \ diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index eb3035824f..0ef038a05a 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -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} diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 335c1036f1..1139b3a98f 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -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 $@ diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 46d8d6ad16..40cff1b3d3 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -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 diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in index 07477387f8..2c2b3195db 100644 --- a/src/usd/Makefile.in +++ b/src/usd/Makefile.in @@ -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 diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index c18e6d1b79..b4db6d6f64 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -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 diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 6d4474f6d7..17112bc62c 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -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} $? $@ # diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index bfa2000ea6..98b6b39fa9 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -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 diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index 57ec1a795a..672fe8d05b 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -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 diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index ac083d4fda..df5da143fa 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -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 diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 287d9f2d1c..5d9e22151a 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -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} diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 69b880bf18..20dcc67402 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -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; } } diff --git a/src/viced/callback.c b/src/viced/callback.c index 78ea701314..186365911a 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -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; ihost, 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; } diff --git a/src/viced/viced.c b/src/viced/viced.c index 0280e7b5e4..8d235b7af8 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -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; diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 8b4daebf91..239d4a5492 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -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 + ${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 -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} \ +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,6 +149,45 @@ ${DEST}/root.server/usr/afs/bin/vlserver: vlserver ${DEST}/etc/vldb_convert: cnvldb ${INSTALL} -f $? $@ +${TOP_LIBDIR}/libvldb.a: libvldb.a + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/vlserver.h: vlserver.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/vldbint.h: vldbint.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + +${KERNELDIR}/afsint/vldbint.h: vldbint.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/Kvldbint.cs.c: Kvldbint.cs.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/Kvldbint.xdr.c: Kvldbint.xdr.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/vldbint.h: vldbint.h + ${INSTALL} $? $@ + install: \ ${DESTDIR}${afssrvlibexecdir}/vlserver \ ${DESTDIR}${afssrvsbindir}/vldb_convert \ @@ -153,77 +198,27 @@ install: \ ${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 ${INSTALL} $? $@ ${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb ${INSTALL} -f $? $@ -${DEST}/lib/afs/libvldb.a: libvldb.a - ${INSTALL} $? $@ - ${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a ${INSTALL} $? $@ - -${TOP_LIBDIR}/libvldb.a: libvldb.a - ${INSTALL} $? $@ - - -${DEST}/include/afs/vl_opcodes.h: vl_opcodes.h - ${INSTALL} $? $@ - ${DESTDIR}${includedir}/afs/vl_opcodes.h: vl_opcodes.h ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h - ${INSTALL} $? $@ - - -${DEST}/include/afs/vlserver.h: vlserver.h - ${INSTALL} $? $@ - ${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vlserver.h: vlserver.h - ${INSTALL} $? $@ - - -${DEST}/include/afs/vldbint.h: vldbint.h - ${INSTALL} $? $@ - ${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vldbint.h: vldbint.h - ${INSTALL} $? $@ - - -${DEST}/include/afs/cnvldb.h: cnvldb.h - ${INSTALL} $? $@ - ${DESTDIR}${includedir}/afs/cnvldb.h: cnvldb.h ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h - ${INSTALL} $? $@ - - -${DEST}/etc/vldb_check: vldb_check - ${INSTALL} $? $@ - ${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check ${INSTALL} $? $@ @@ -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 diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index c93d917949..d707fa7277 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -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 diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index 9dadbda661..99e046b216 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -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@ diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 5c54456126..e52a558e64 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -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 diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index 81cb339e91..c62090d05a 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -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}