From 635df30c0f8113daeaeceb856bcaaf0b8ea3d9b5 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Thu, 30 Aug 2001 00:22:17 +0000 Subject: [PATCH] more-makefiles-cleanup-20010829 get rid of cases where we'd end up with two / because of DESTDIR pasting macroize calls to rm ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== get rid of another case of bogus trailing quoting --- Makefile.in | 4 +- configure.in | 4 +- src/Makefile.djgpp | 10 +- src/afs/Makefile.in | 36 ++--- src/afsd/Makefile.in | 54 ++++---- src/afsmonitor/Makefile.in | 2 +- src/afsweb/Makefile.in | 54 ++++---- src/audit/Makefile.in | 6 +- src/auth/Makefile.in | 10 +- src/auth/test/Makefile.in | 2 +- src/bozo/Makefile.in | 59 ++++---- src/bozo/test/Makefile.in | 19 ++- src/bu_utils/Makefile.in | 8 +- src/bubasics/Makefile.in | 16 +-- src/bucoord/Makefile.in | 11 +- src/budb/Makefile.in | 15 +-- src/butc/Makefile.in | 4 +- src/butm/Makefile.in | 8 +- src/cmd/Makefile.in | 26 ++-- src/cmd/test/Makefile.in | 2 +- src/comerr/Makefile.in | 14 +- src/comerr/test/Makefile.in | 29 ++-- src/config/Makefile.alpha_dux40.in | 2 +- src/config/Makefile.alpha_dux50.in | 2 +- src/config/Makefile.alpha_linux_22.in | 2 +- src/config/Makefile.djgpp.common | 4 +- src/config/Makefile.hp_ux102.in | 2 +- src/config/Makefile.hp_ux110.in | 2 +- src/config/Makefile.i386_djgpp | 2 +- src/config/Makefile.i386_fbsd_42.in | 2 +- src/config/Makefile.i386_linux22.in | 5 +- src/config/Makefile.i386_linux24.in | 4 +- src/config/Makefile.in | 178 +++++++++++++------------ src/config/Makefile.ppc_darwin_12.in | 2 +- src/config/Makefile.ppc_darwin_13.in | 2 +- src/config/Makefile.ppc_linux24.in | 2 +- src/config/Makefile.rs_aix42.in | 2 +- src/config/Makefile.s390_linux22.in | 2 +- src/config/Makefile.s390_linux24.in | 2 +- src/config/Makefile.sgi_62.in | 2 +- src/config/Makefile.sgi_63.in | 2 +- src/config/Makefile.sgi_64.in | 2 +- src/config/Makefile.sgi_65.in | 2 +- src/config/Makefile.sparc64_linux22.in | 2 +- src/config/Makefile.sparc64_linux24.in | 2 +- src/config/Makefile.sparc_linux22.in | 2 +- src/config/Makefile.sun4x_55.in | 2 +- src/config/Makefile.sun4x_56.in | 2 +- src/config/Makefile.sun4x_57.in | 2 +- src/config/Makefile.sun4x_58.in | 2 +- src/config/Makefile.sunx86_54.in | 2 +- src/dauth/Makefile.in | 6 +- src/des/Makefile.in | 7 +- src/des/test/Makefile.in | 4 +- src/des_stub/Makefile.in | 30 +---- src/dir/Makefile.in | 11 +- src/dir/test/Makefile.in | 2 +- src/export/Makefile.in | 10 +- src/finale/Makefile.in | 30 +++-- src/fsint/Makefile.in | 27 ++-- src/fsprobe/Makefile.in | 8 +- src/ftpd43+/Makefile.in | 4 +- src/gtx/Makefile.in | 8 +- src/inetd/Makefile.in | 2 +- src/kauth/Makefile.in | 38 +++--- src/kauth/test/Makefile.in | 2 +- src/libacl/Makefile.in | 4 +- src/libacl/test/Makefile.in | 23 ++-- src/libadmin/adminutil/Makefile.in | 52 ++++---- src/libadmin/bos/Makefile.in | 8 +- src/libadmin/cfg/Makefile.in | 8 +- src/libadmin/cfg/test/Makefile.in | 2 +- src/libadmin/client/Makefile.in | 8 +- src/libadmin/kas/Makefile.in | 8 +- src/libadmin/pts/Makefile.in | 8 +- src/libadmin/samples/Makefile.in | 2 +- src/libadmin/test/Makefile.in | 2 +- src/libadmin/vos/Makefile.in | 8 +- src/libafs/Makefile.common | 4 +- src/libafs/MakefileProto.AIX.in | 8 +- src/libafs/MakefileProto.DARWIN.in | 4 +- src/libafs/MakefileProto.DUX.in | 4 +- src/libafs/MakefileProto.FBSD.in | 4 +- src/libafs/MakefileProto.HPUX.in | 8 +- src/libafs/MakefileProto.IRIX.in | 30 ++--- src/libafs/MakefileProto.LINUX.in | 18 +-- src/libafs/MakefileProto.SOLARIS.in | 6 +- src/libafsauthent/Makefile.in | 84 ++++++------ src/libafsrpc/Makefile.in | 20 +-- src/libuafs/Makefile.common | 26 ++-- src/libuafs/MakefileProto.AIX.in | 26 ++-- src/libuafs/MakefileProto.DARWIN.in | 26 ++-- src/libuafs/MakefileProto.DUX.in | 26 ++-- src/libuafs/MakefileProto.FBSD.in | 26 ++-- src/libuafs/MakefileProto.HPUX.in | 26 ++-- src/libuafs/MakefileProto.IRIX.in | 26 ++-- src/libuafs/MakefileProto.LINUX.in | 26 ++-- src/libuafs/MakefileProto.SOLARIS.in | 26 ++-- src/log/Makefile.in | 2 +- src/log/test/Makefile.in | 22 +-- src/login/Makefile.in | 10 +- src/lwp/Makefile.in | 20 +-- src/lwp/test/Makefile.in | 4 +- src/mpp/Makefile.in | 2 +- src/ntp/Makefile.in | 10 +- src/null/Makefile.in | 4 +- src/package/Makefile.in | 2 +- src/pam/Makefile.in | 28 ++-- src/pinstall/Makefile.in | 2 +- src/pinstall/test/Makefile.in | 17 +-- src/procmgmt/Makefile.in | 6 +- src/procmgmt/test/Makefile.in | 2 +- src/ptserver/Makefile.in | 164 +++++++++++++++-------- src/rcp/Makefile.in | 4 +- src/rlogind/Makefile.in | 4 +- src/rsh/Makefile.in | 6 +- src/rx/Makefile.in | 12 +- src/rx/test/Makefile.in | 2 +- src/rxgen/Makefile.in | 9 +- src/rxkad/Makefile.in | 10 +- src/rxkad/test/Makefile.in | 6 +- src/rxstat/Makefile.in | 7 +- src/scout/Makefile.in | 31 ++--- src/sgistuff/Makefile.in | 6 +- src/sia/Makefile.in | 6 +- src/sys/Makefile.in | 26 ++-- src/tbutc/Makefile.in | 12 +- src/tsm41/Makefile.in | 8 +- src/tviced/Makefile.in | 4 +- src/ubik/Makefile.in | 105 ++++++++++----- src/update/Makefile.in | 49 ++++--- src/usd/Makefile.in | 62 ++++----- src/usd/test/Makefile.in | 14 +- src/uss/Makefile.in | 53 ++++---- src/util/Makefile.in | 12 +- src/util/test/Makefile.in | 2 +- src/venus/Makefile.in | 6 +- src/venus/test/Makefile.in | 2 +- src/vfsck/Makefile.in | 8 +- src/viced/Makefile.in | 28 ++-- src/vlserver/Makefile.in | 19 +-- src/vol/Makefile.in | 93 +++++++++---- src/vol/test/Makefile.in | 4 +- src/volser/Makefile.in | 78 ++++++----- src/wsadmin.src/Makefile.in | 2 +- src/xstat/Makefile.in | 88 ++++++------ 146 files changed, 1312 insertions(+), 1141 deletions(-) diff --git a/Makefile.in b/Makefile.in index 263d31015..66990c81a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,11 +205,11 @@ null: project gtx: project null auth # kauth rxkad ? case ${SYS_NAME} in \ rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \ - rm -f ${DESTDIR}/lib/afs/libtermlib.a; \ + $(RM) -f ${DESTDIR}/lib/afs/libtermlib.a; \ ln -s libnull.a ${DESTDIR}/lib/afs/libtermlib.a; \ ${COMPILE_PART1} gtx ${COMPILE_PART2};; \ *) \ - rm -f ${DESTDIR}/lib/afs/libtermlib.a; \ + $(RM) -f ${DESTDIR}/lib/afs/libtermlib.a; \ ln -s /usr/lib/libtermlib.a ${DESTDIR}/lib/afs/libtermlib.a; \ ${COMPILE_PART1} gtx ${COMPILE_PART2};; \ esac diff --git a/configure.in b/configure.in index 9c54c7327..377775eaa 100644 --- a/configure.in +++ b/configure.in @@ -376,8 +376,8 @@ fi SRCDIR_PARENT=`pwd` TOP_SRCDIR="${SRCDIR_PARENT}/src" -DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/" -SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/" +DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" +SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" dnl checks for header files. AC_HEADER_STDC diff --git a/src/Makefile.djgpp b/src/Makefile.djgpp index 362b1b2c1..e0316f8d4 100644 --- a/src/Makefile.djgpp +++ b/src/Makefile.djgpp @@ -17,11 +17,11 @@ includes: afsdinc osiinc authinc libs: fsint cmd lwp osi rx rxkad vldb rxstat acl clean: - -rm -f $(SYS_NAME)/dest/include/* - -rm -f $(SYS_NAME)/dest/include/afs/* - -rm -f $(SYS_NAME)/dest/lib/* - -rm -f $(SYS_NAME)/dest/lib/afs/* - -rm -f $(SYS_NAME)/dest/bin/* + -$(RM) -f $(SYS_NAME)/dest/include/* + -$(RM) -f $(SYS_NAME)/dest/include/afs/* + -$(RM) -f $(SYS_NAME)/dest/lib/* + -$(RM) -f $(SYS_NAME)/dest/lib/afs/* + -$(RM) -f $(SYS_NAME)/dest/bin/* config: -make -C $(OBJ)/config install diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 38ea9106d..77df5c582 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -14,23 +14,19 @@ SHELL=/bin/sh KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - include ../config/Makefile.${SYS_NAME} all: install # NOTE: linux case uses --new as well to work around bug in some versions of # gencat. -kinstall: AFS_component_version_number.c - set ${KERNELDIR}afs; $(MKDIR_IF_NEEDED) +kinstall: ${KERNELDIR}/afs ${DESTDIR}/root.client/usr/vice/etc/C AFS_component_version_number.c -chmod 666 ${KERNELDIR}afs/* - ${DESTDIR}bin/compile_et -v 2 afs_trace.et + ${DESTDIR}/bin/compile_et -v 2 afs_trace.et ${INSTALL} *.[csh] ${KERNELDIR}afs ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs - set ${DESTDIR}root.client/usr/vice/etc/C; $(MKDIR_IF_NEEDED) - -rm -f afszcm.cat + -$(RM) -f afszcm.cat case ${SYS_NAME} in \ sgi_* ) \ gencat -m afszcm.cat afs_trace.msf ;; \ @@ -42,38 +38,44 @@ kinstall: AFS_component_version_number.c gencat afszcm.cat afs_trace.msf ;; \ esac +${KERNELDIR}/afs: + mkdir -p $@ +${DESTDIR}/root.client/usr/vice/etc/C: + mkdir -p $@ -ukinstall: AFS_component_version_number.c - set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED) +ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c -chmod 666 ${UKERNELDIR}afs/* - ${DESTDIR}bin/compile_et -v 2 afs_trace.et + ${DESTDIR}/bin/compile_et -v 2 afs_trace.et ${INSTALL} *.[csh] ${UKERNELDIR}afs ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs +${UKERNELDIR}/afs: + mkdir -p $@ + install: kinstall ukinstall - ${INSTALL} afs.h ${DESTDIR}include/afs - ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}include/afs - ${INSTALL} afs_stats.h exporter.h nfsclient.h ${DESTDIR}include/afs + ${INSTALL} afs.h ${DESTDIR}/include/afs + ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}/include/afs + ${INSTALL} afs_stats.h exporter.h nfsclient.h ${DESTDIR}/include/afs case ${SYS_NAME} in \ pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DESTDIR}include/afs ;; \ + ${INSTALL} longc_procs.h ${DESTDIR}/include/afs ;; \ esac case ${SYS_NAME} in \ next_mach30 | vax_ul43 | ppc_darwin* | i386_fbsd* ) \ echo skipping afszcm.cat install for ${SYS_NAME} ;; \ * ) \ - ${INSTALL} afszcm.cat ${DESTDIR}root.client/usr/vice/etc/C ;; \ + ${INSTALL} afszcm.cat ${DESTDIR}/root.client/usr/vice/etc/C ;; \ esac case ${SYS_NAME} in \ *linux* ) \ - ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}include/afs ;;\ + ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}/include/afs ;;\ * ) \ echo No vfs headers to install for ${SYS_NAME};; \ esac clean: - rm -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat + -$(RM) -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat include ../config/Makefile.version diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index bbb13e5cb..1dd420d89 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -52,56 +52,56 @@ afsd.o: afsd.c AFS_component_version_number.c vsys.o: vsys.c AFS_component_version_number.c clean: - rm -f *.o vsys afsd core AFS_component_version_number.c + $(RM) -f *.o vsys afsd core AFS_component_version_number.c system: install install: all ${INSTALL} vsys ${DESTDIR}/etc - ${INSTALL} afsd ${DESTDIR}root.client/usr/vice/etc + ${INSTALL} afsd ${DESTDIR}/root.client/usr/vice/etc case ${SYS_NAME} in \ rs_aix*) \ - ${INSTALL} -f rc.afs.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.afs ; \ - ${INSTALL} -f rc.dkload.client.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.client ; \ - ${INSTALL} -f rc.dkload.server.rs_aix ${DESTDIR}root.client/usr/vice/etc/dkload/rc.dkload.server ;; \ + ${INSTALL} -f rc.afs.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.afs ; \ + ${INSTALL} -f rc.dkload.client.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \ + ${INSTALL} -f rc.dkload.server.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \ sgi_65 ) \ - ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\ - ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}root.server/etc/init.d/afs.rc ;;\ + ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}/root.client/usr/vice/etc/sgiload/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}/root.server/etc/init.d/afs.rc ;;\ sgi_* ) \ - ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.client/usr/vice/etc/sgiload/afs.rc ;\ - ${INSTALL} -f afs.rc.sgi ${DESTDIR}root.server/etc/init.d/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi ${DESTDIR}/root.client/usr/vice/etc/sgiload/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi ${DESTDIR}/root.server/etc/init.d/afs.rc ;\ case ${SYS_NAME} in \ sgi_53 | sgi_61 ) \ - ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DESTDIR}root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\ + ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DESTDIR}/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 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_57 ) \ - ${INSTALL} -f afs.rc.solaris.2.7 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2.7 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_58 ) \ - ${INSTALL} -f afs.rc.solaris.2.8 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2.8 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_5? ) \ - ${INSTALL} -f afs.rc.solaris.2_5 ${DESTDIR}root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2_5 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ alpha_osf* ) \ - ${INSTALL} -f afs.rc.alpha ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.alpha ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp_ux10? | hp_ux11? ) \ - ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;\ - ${INSTALL} -f afs.hpux102.driver ${DESTDIR}root.client/usr/vice/etc/afs.driver ;;\ + ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;\ + ${INSTALL} -f afs.hpux102.driver ${DESTDIR}/root.client/usr/vice/etc/afs.driver ;;\ alpha_dux* ) \ - ${INSTALL} -f afs.rc.alpha_dux40 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.alpha_dux40 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp?00_ux10? ) \ - ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ *linux* ) \ - ${INSTALLex} -f afs.rc.linux ${DESTDIR}root.client/usr/vice/etc/afs.rc; \ - ${INSTALL} -f afs.conf.linux ${DESTDIR}root.client/usr/vice/etc/afs.conf ;; \ + ${INSTALLex} -f afs.rc.linux ${DESTDIR}/root.client/usr/vice/etc/afs.rc; \ + ${INSTALL} -f afs.conf.linux ${DESTDIR}/root.client/usr/vice/etc/afs.conf ;; \ ppc_darwin*) \ - mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\ - ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \ - ${INSTALLex} -f afs.rc.darwin ${DESTDIR}root.client/usr/vice/etc/afs.rc ; \ - ${INSTALL} -f afs.rc.darwin.plist ${DESTDIR}root.client/usr/vice/etc/StartupParameters.plist ;; \ + mkdir -p ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\ + ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \ + ${INSTALLex} -f afs.rc.darwin ${DESTDIR}/root.client/usr/vice/etc/afs.rc ; \ + ${INSTALL} -f afs.rc.darwin.plist ${DESTDIR}/root.client/usr/vice/etc/StartupParameters.plist ;; \ *fbsd*) \ - mkdir -p ${DESTDIR}root.client/usr/vice/etc/afs.rc; \ - ${INSTALL} -f afs.rc.fbsd ${DESTDIR}root.client/usr/vice/etc/afs.rc.fbsd ;; \ + mkdir -p ${DESTDIR}/root.client/usr/vice/etc/afs.rc; \ + ${INSTALL} -f afs.rc.fbsd ${DESTDIR}/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 2f546f627..0e258a760 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -72,6 +72,6 @@ install: all ${INSTALL} afsmonitor ${DESTDIR}/bin clean: - rm -f *.o afsmonitor AFS_component_version_number.c + $(RM) -f *.o afsmonitor AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 7984986db..d9e112ae2 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -18,8 +18,6 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ COMPILE_ET=${SRCDIR}/bin/compile_et -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - UKSRCS=nsafs.h nsafs.c securehash.c # @@ -47,77 +45,77 @@ system apache_afs_web_secure: echo Clean, make, and install the lib for 1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) ; \ - ${INSTALL} ${APACHE_AFS_LIB} ${DESTDIR}root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} ${APACHE_AFS_LIB} ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ echo Make and install source for 1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ echo Make and install the lib for 1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ echo Make and install source for 1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ echo Clean, make, and install the lib for 1.3.6 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6"; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ echo Make and install source for 1.3.1 ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ echo Do the binaries ; \ $(MAKE) AUX_CFLAGS=-DAIX $(BINARIES) ;; \ sun*) \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ $(MAKE) AUX_CFLAGS=-DSOLARIS "XLIBS=-lsocket -lnsl" $(BINARIES) ;; \ *linux*) \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ $(MAKE) AUX_CFLAGS=-DLINUX "XLIBS=-lnsl" $(BINARIES) ;; \ * ) \ echo "NOT BUILT FOR ${SYS_NAME}"; ;; \ esac - ${INSTALL} ${APACHEAFS_DOC} ${DESTDIR}root.afsweb/doc - ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DESTDIR}root.afsweb/install - chmod a+x ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT} - chmod a+w ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT} - ${INSTALL} $(BINARIES) ${DESTDIR}root.afsweb/bin + ${INSTALL} ${APACHEAFS_DOC} ${DESTDIR}/root.afsweb/doc + ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DESTDIR}/root.afsweb/install + chmod a+x ${DESTDIR}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} + chmod a+w ${DESTDIR}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} + ${INSTALL} $(BINARIES) ${DESTDIR}/root.afsweb/bin all: @@ -127,10 +125,12 @@ kinstall: @echo No $@ source here. -webinstall:${UKSRCS} - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) +webinstall: ${UKERNELDIR}/afs ${UKSRCS} ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs +${UKERNELDIR}/afs: + mkdir -p $@ + ukinstall: @echo No $@ source here. diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index 9eaf4ae18..db687d560 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -23,7 +23,7 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR = ../libuafs/ -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I$(SRCDIR)include ${XCFLAGS} +CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} all: install @@ -52,7 +52,7 @@ ${DESTDIR}/lib/afs/libaudit.a: libaudit.a ${INSTALL} $? $@ libaudit.a: audit.o AFS_component_version_number.o - rm -f libaudit.a + $(RM) -f libaudit.a ar r libaudit.a audit.o AFS_component_version_number.o $(RANLIB) libaudit.a @@ -60,6 +60,6 @@ audit.o: audit.c audit.h ${CC} ${CFLAGS} -c audit.c clean: - rm -f *.a *.o core AFS_component_version_number.c + $(RM) -f *.a *.o core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 1c8bfe4aa..16cc39aef 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -47,12 +47,12 @@ ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}/include/afs/vice.h ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o libauth.a: $(OBJS) AFS_component_version_number.o - -rm -f libauth.a + -$(RM) -f libauth.a ar rv libauth.a $(OBJS) AFS_component_version_number.o $(RANLIB) libauth.a libauth.krb.a: $(KOBJS) AFS_component_version_number.o - -rm -f libauth.krb.a + -$(RM) -f libauth.krb.a ar rv libauth.krb.a $(KOBJS) AFS_component_version_number.o $(RANLIB) libauth.krb.a @@ -65,12 +65,12 @@ 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} 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} ktc_errors -h auth # # Install targets @@ -148,7 +148,7 @@ test: cd test; $(MAKE) clean: - rm -f *.o *.a copyauth setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\ + $(RM) -f *.o *.a copyauth setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\ AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 0c403ccfd..312b67db5 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -31,4 +31,4 @@ ktctest: ktctest.o $(CC) $(CFLAGS) -o ktctest ktctest.o ${LIBS} clean: - rm -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core + $(RM) -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 8a29d8f36..51fa83aba 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -14,35 +14,42 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET=$(SRCDIR)bin/compile_et +COMPILE_ET=${SRCDIR}/bin/compile_et CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h -INCLS=bnode.h ${RPCINCLS} ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/keys.h ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h ${SRCDIR}/include/afs/ktime.h + +INCLS= bnode.h \ + ${RPCINCLS} \ + ${SRCDIR}/include/afs/auth.h \ + ${SRCDIR}/include/afs/keys.h \ + ${SRCDIR}/include/afs/cellconfig.h \ + ${SRCDIR}/include/afs/cmd.h \ + ${SRCDIR}/include/afs/ktime.h # EH 12/18/90 - have to search librx.a twice on Ultrix 4.0 -LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libprocmgmt.a +LIBS= ${SRCDIR}/lib/librx.a \ + ${SRCDIR}/lib/liblwp.a \ + ${SRCDIR}/lib/afs/libcmd.a \ + ${SRCDIR}/lib/afs/libkauth.a \ + ${SRCDIR}/lib/afs/libvolser.a \ + ${SRCDIR}/lib/afs/libvldb.a \ + ${SRCDIR}/lib/afs/libauth.a \ + ${SRCDIR}/lib/librxstat.a \ + ${SRCDIR}/lib/librxkad.a \ + ${SRCDIR}/lib/libdes.a \ + ${SRCDIR}/lib/librx.a \ + ${SRCDIR}/lib/libubik.a \ + ${SRCDIR}/lib/afs/libcom_err.a \ + ${SRCDIR}/lib/afs/util.a \ + ${SRCDIR}/lib/afs/libsys.a \ + ${SRCDIR}/lib/afs/libprocmgmt.a OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \ bosoprocs.o cronbnodeops.o -LIBOBJS=bosint.xdr.o bosint.cs.o boserr.o - all: install -$(OBJS) $(LIBOBJS): $(INCLS) +$(OBJS) bosint.xdr.o bosint.cs.o boserr.o: $(INCLS) bosint.ss.o: bosint.ss.c ${RPCINCLS} bosint.xdr.o: bosint.xdr.c ${RPCINCLS} @@ -52,7 +59,7 @@ bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg ${SRCDIR}/bin/rxgen -x 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) boserr -h bnode bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o @@ -71,10 +78,10 @@ ezbnodeops.o: ezbnodeops.c ${INCLS} fsbnodeops.o: fsbnodeops.c ${INCLS} -libbos.a: $(LIBOBJS) AFS_component_version_number.o - -rm -f libbos.a - ${AR} r libbos.a ${LIBOBJS} AFS_component_version_number.o - $(RANLIB) libbos.a +libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crv $@ bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o + $(RANLIB) $@ bosserver: $(OBJS) $(LIBS) ${CC} $(CFLAGS) -o bosserver $(OBJS) ${SRCDIR}/lib/afs/libaudit.a $(LIBS) ${XLIBS} @@ -111,8 +118,8 @@ ${DESTDIR}/include/afs/bnode.h: bnode.h # Misc. targets # clean: - rm -f *.a *.o bos bosserver testproc bosint.cs.c bosint.ss.c bosint.xdr.c bosint.h core boserr.c bnode.h\ - AFS_component_version_number.c + $(RM) -f *.a *.o bos bosserver testproc bosint.cs.c bosint.ss.c bosint.xdr.c \ + bosint.h core boserr.c bnode.h AFS_component_version_number.c test: cd test; $(MAKE) diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index 0b21882b1..b783733b1 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -10,24 +10,29 @@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ -SRCDIR= - -BACKDIR=../../../../PARENT/dest/ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs +INCDIRS= -I${DESTDIR}/include -I.. +LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -system: testproc smail-notifier +all: install + +install: testproc smail-notifier +# +# Build targets +# testproc: testproc.c $(CC) $(CFLAGS) -o testproc testproc.c smail-notifier: smail-notifier.c $(CC) $(CFLAGS) -o smail-notifier smail-notifier.c +# +# Misc targets +# clean: - rm -f *.a *.o testproc smail-notifier core + $(RM) -f *.a *.o testproc smail-notifier core diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index c452fa3d2..5ca0321a4 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -21,9 +21,9 @@ all: install FMSLIBS=${DESTDIR}/lib/afs/libcmd.a \ ${TXLIBS} \ - $(SRCDIR)lib/afs/libusd.a \ - $(SRCDIR)lib/afs/libtermlib.a ${XLIBS} \ - $(SRCDIR)lib/afs/util.a + ${SRCDIR}/lib/afs/libusd.a \ + ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} \ + ${SRCDIR}/lib/afs/util.a fms: fms.o ${CC} ${LDFLAGS} -o fms fms.o ${FMSLIBS} @@ -36,6 +36,6 @@ ${DESTDIR}/etc/fms: fms ${INSTALL} $? $@ clean: - rm -f *.o fms AFS_component_version_number.c + $(RM) -f *.o fms AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index 5eb95835d..a471220e0 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -14,17 +14,17 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -RXGEN=${SRCDIR}bin/rxgen -COMPILE_ET = ${SRCDIR}bin/compile_et +RXGEN=${SRCDIR}/bin/rxgen +COMPILE_ET = ${SRCDIR}/bin/compile_et -CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} +CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} all: install OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o libbubasics.a: $(OBJS) AFS_component_version_number.o - -rm -f libbubasics.a + -$(RM) -f libbubasics.a ar r libbubasics.a ${OBJS} AFS_component_version_number.o ${RANLIB} libbubasics.a @@ -35,15 +35,15 @@ bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg ${RXGEN} bumon.xg butm_errs.c butm.h: butm_errs.et butm.p.h - rm -f butm.h butm_errs.c + $(RM) -f butm.h butm_errs.c ${COMPILE_ET} butm_errs -h butm butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h - rm -f tcdata.h butc_errs.c + $(RM) -f tcdata.h butc_errs.c ${COMPILE_ET} butc_errs -h tcdata butx_errs.c butx.h: butx_errs.et - rm -f butx.h butx_errs.c + $(RM) -f butx.h butx_errs.c ${COMPILE_ET} butx_errs -h butx # @@ -83,7 +83,7 @@ ${DESTDIR}/include/afs/butx.h: butx.h # clean: - rm -f *.o *.a *.xdr.c *.ss.c *.cs.c butc.h butx.h butm.h bumon.h tcdata.h \ + $(RM) -f *.o *.a *.xdr.c *.ss.c *.cs.c butc.h butx.h butm.h bumon.h tcdata.h \ butc_errs.c butx_errs.c butm_errs.c core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 30e1d12f8..3ce9fd266 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -33,10 +33,9 @@ LIBS=${SRCDIR}/lib/afs/libbudb.a ${SRCDIR}/lib/afs/libbubasics.a \ all: install libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o - -rm -f libbxdb.a - ${AR} r libbxdb.a dsstub.o ubik_db_if.o status.o dlq.o \ - bucoord_errs.o volstub.o AFS_component_version_number.o - ${RANLIB} libbxdb.a + -$(RM) -f $@ + $(AR) crv $@ dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o + $(RANLIB) $@ ttest: ttest.o ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a libbxdb.a ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \ @@ -69,7 +68,7 @@ backup: $(BACKOBJS) ${LIBS} ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS} bucoord_errs.c bc.h: bucoord_errs.et bc.p.h - rm -f bc.h bucoord_errs.c + $(RM) -f bc.h bucoord_errs.c ${COMPILE_ET} bucoord_errs -h bc # @@ -90,6 +89,6 @@ ${DESTDIR}/etc/backup: backup # clean: - rm -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c + $(RM) -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c include ../config/Makefile.version diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index d49cd7972..9051616ec 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -56,14 +56,12 @@ COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o \ procs.o server.o budb_errs.o -LIB_BUDB_OBJS = budb_errs.o budb.cs.o budb.xdr.o struct_ops.o - all: install 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} budb_errs -h budb_client budb_errs.h: budb_errs.et ${COMPILE_ET} budb_errs @@ -85,15 +83,14 @@ budb_server: $(SERVER_OBJS) ${LIBS} budb.xdr.c budb.cs.c budb.ss.c budb.h: budb.rg ${RXGEN} budb.rg -libbudb.a: ${LIB_BUDB_OBJS} AFS_component_version_number.o - -rm -f libbudb.a - ${AR} rv libbudb.a $(LIB_BUDB_OBJS) AFS_component_version_number.o - ${RANLIB} libbudb.a +libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crv $@ budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_number.o + $(RANLIB) $@ # # Install targets # - install: ${DESTDIR}/lib/afs/libbudb.a \ ${DESTDIR}/include/afs/budb.h \ ${DESTDIR}/include/afs/budb_errs.h \ @@ -119,7 +116,7 @@ ${DESTDIR}/root.server/usr/afs/bin/buserver: budb_server # Misc targets # clean: - rm -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \ + $(RM) -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \ *.ss.c *.cs.c core budb_server AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index f45e05389..4d6e61937 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -63,7 +63,7 @@ SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \ all: install butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS} - ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test + ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test tdump: tdump.c AFS_component_version_number.c ${CC} ${CFLAGS} tdump.c -o tdump @@ -92,7 +92,7 @@ read_tape: read_tape.c ${INSTALL} read_tape ${SRCDIR}/etc clean: - rm -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c + $(RM) -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c install: butc read_tape @case ${SYS_NAME} in \ diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index dc09fd83e..f19d203ef 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -35,9 +35,9 @@ ${DESTDIR}/lib/afs/libbutm.a: libbutm.a ${INSTALL} $? $@ libbutm.a: file_tm.o AFS_component_version_number.o - -rm -f libbutm.a - ${AR} rv libbutm.a file_tm.o AFS_component_version_number.o - ${RANLIB} libbutm.a + -$(RM) -f $@ + $(AR) crv $@ file_tm.o AFS_component_version_number.o + $(RANLIB) $@ file_tm.o: file_tm.c ${INCLS} AFS_component_version_number.c @@ -50,6 +50,6 @@ test: test_ftm echo 'Usage: ./test_ftm -conf config -tape xxx *' clean: - rm -f *.o *.a core test_ftm AFS_component_version_number.c + $(RM) -f *.o *.a core test_ftm AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index e86b0fa72..42dbcccc0 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -14,17 +14,17 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET = ${SRCDIR}bin/compile_et +COMPILE_ET = ${SRCDIR}/bin/compile_et LIBOBJS=cmd_errors.o cmd.o LIB64OBJS=cmd_errors64.o cmd64.o -CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} +CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} all: install cmd.h cmd_errors.c: cmd_errors.et cmd.p.h - rm -f cmd.h cmd_errors.c + $(RM) -f cmd.h cmd_errors.c ${COMPILE_ET} cmd_errors -h cmd cmd_errors.o: cmd_errors.c @@ -32,24 +32,24 @@ 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${SRCDIR}include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c + ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c cmd64.o: cmd.c cmd.h - ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd64.o cmd.c + ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -c -o cmd64.o cmd.c libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o - -rm -f libcmd64.a - $(AR) r libcmd64.a ${LIB64OBJS} AFS_component_version_number64.o - $(RANLIB) libcmd64.a + -$(RM) -f $@ + $(AR) crv $@ ${LIB64OBJS} AFS_component_version_number64.o + $(RANLIB) $@ libcmd.a: ${LIBOBJS} AFS_component_version_number.o - -rm -f libcmd.a - $(AR) r libcmd.a ${LIBOBJS} AFS_component_version_number.o - $(RANLIB) libcmd.a + -$(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o + $(RANLIB) $@ AFS_component_version_number64.o: AFS_component_version_number.c - ${CC} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c + ${CC} ${OPTMZ} -I${SRCDIR}/include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c # # Install targets @@ -74,6 +74,6 @@ test tests: (cd test; $(MAKE) ) clean: - rm -f *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c + $(RM) -f *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index 1a49e2919..c27c9a3c1 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -41,5 +41,5 @@ kinstall: @echo No kernel source here. clean: - rm -f *.a *.o ctest dtest itest core + $(RM) -f *.a *.o ctest dtest itest core diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 5347fdbd2..412a9db09 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -12,11 +12,10 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 UKERNELDIR=../libuafs/ -CFLAGS= ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS= ${OPTMZ} -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} all: install @@ -33,10 +32,9 @@ compile_et: compile_et.o error_table.o esac libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o - rm -f libcom_err.a - $(AR) cruv libcom_err.a error_msg.o et_name.o com_err.o AFS_component_version_number.o - $(RANLIB) libcom_err.a - + $(RM) -f $@ + $(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o + $(RANLIB) $@ # # Installation targets # @@ -58,7 +56,7 @@ install: ukinstall \ ${DESTDIR}/lib/afs/libcom_err.a ${UKERNELDIR}/afs: - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) + mkdir -p $@ ${UKERNELDIR}/afs/com_err.c: com_err.c ${INSTALL} $? $@ @@ -97,7 +95,7 @@ ${DESTDIR}/lib/afs/libcom_err.a: libcom_err.a ${INSTALL} $? $@ clean: - rm -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ + $(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libcom_err.a \ com_err.o compile_et et.ar TAGS y.tab.c lex.yy.c error_table.c \ et_lex.lex.c test1.h test1.c test2.h test2.c \ diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 3b1063cff..29eaaab6d 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -3,38 +3,37 @@ SRCDIR=@SRCDIR@ TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ - - -BACKDIR=../../../../PARENT/dest/ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs -LIBS= -lcom_err +INCDIRS= -I${DESTDIR}/include -I.. +LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} +CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} -lcom_err ${XCFLAGS} -system: test +all: install -clean: - rm -f *.o *.a test core +install: test +# +# Build targets +# test: test.o test1.o test2.o $(CC) ${CFLAGS} -o test test.o test1.o test2.o + test.o: test1.h test2.h test1.o : test1.c test1.c : test1.et test2.o : test2.c test2.c : test2.et -kinstall: - @echo No kernel source here. - +# +# Misc targets +# clean: - rm -f *~ \#* *.bak \ + $(RM) -f *~ \#* *.bak \ *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ *.cp *.fn *.ky *.log *.pg *.tp *.vr \ - *.o libcom_err.a \ + *.o *.a libcom_err.a \ com_err.o compile_et \ et.ar TAGS y.tab.c lex.yy.c error_table.c \ et_lex.lex.c \ diff --git a/src/config/Makefile.alpha_dux40.in b/src/config/Makefile.alpha_dux40.in index 10b6780e6..6a3fe56e4 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install 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 000238df6..e72e5f9cd 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install #this is for the vol package FS_CONV_OSF40D= $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D diff --git a/src/config/Makefile.alpha_linux_22.in b/src/config/Makefile.alpha_linux_22.in index 634d52ca6..cc1f544a6 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=${SRCDIR}bin/install +INSTALL=${SRCDIR}/bin/install LD=ld MT_CC=cc MV=mv diff --git a/src/config/Makefile.djgpp.common b/src/config/Makefile.djgpp.common index a315d51e1..7fcaa6f85 100644 --- a/src/config/Makefile.djgpp.common +++ b/src/config/Makefile.djgpp.common @@ -117,7 +117,7 @@ depends : # Removes all built files # clean : - -rm -f $(TARGETS) *.o *.ss core + -$(RM) -f $(TARGETS) *.o *.ss core # # IMPLICIT RULES @@ -159,7 +159,7 @@ $(DESTBIN)/%.exe : %.exe # %.a : -$(RM) $@ - $(AR) rv $@ $^ + $(AR) crv $@ $^ $(RANLIB) $@ # new implicit rule to create executables diff --git a/src/config/Makefile.hp_ux102.in b/src/config/Makefile.hp_ux102.in index 838409394..fd7a25aa6 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install 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 40d9eda56..e5c87b25b 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install RM=/bin/rm CP=/bin/cp AR=/bin/ar diff --git a/src/config/Makefile.i386_djgpp b/src/config/Makefile.i386_djgpp index 39f3c1bc7..7206ea95f 100644 --- a/src/config/Makefile.i386_djgpp +++ b/src/config/Makefile.i386_djgpp @@ -31,7 +31,7 @@ XLIBS= AR=dos-ar AS=dos-as CP=cp -INSTALL=${SRCDIR}bin/install +INSTALL=${SRCDIR}/bin/install LD=dos-ld CC=dos-gcc -bmmap RANLIB=dos-ranlib diff --git a/src/config/Makefile.i386_fbsd_42.in b/src/config/Makefile.i386_fbsd_42.in index a8e224515..b1a8446a5 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=${SRCDIR}bin/install +INSTALL=${SRCDIR}/bin/install LD=ld MT_CC=cc MV=mv diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in index ea852329c..c6c3415bb 100644 --- a/src/config/Makefile.i386_linux22.in +++ b/src/config/Makefile.i386_linux22.in @@ -15,9 +15,8 @@ AFS_OSTYPE = LINUX LINUX_SRCDIR = /usr/src/linux- # Default list of Linux kernels to build. Build will run only if all # can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.2.5-15 2.2.10 2.2.12 2.2.12-20 2.2.13 2.2.14 +LINUX_VERS = @LINUX_VERSION@ -# # compilation and link editor flags DBG=-g OPTMZ=-O2 @@ -44,7 +43,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in index 6c3f05503..c994a512c 100644 --- a/src/config/Makefile.i386_linux24.in +++ b/src/config/Makefile.i386_linux24.in @@ -6,7 +6,7 @@ AFS_OSTYPE = LINUX LINUX_SRCDIR = /usr/src/linux- # Default list of Linux kernels to build. Build will run only if all # can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = 2.3.99-pre3 +LINUX_VERS = @LINUX_VERSION@ # # compilation and link editor flags @@ -35,7 +35,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 5de7b3edf..c12c266ab 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -16,136 +16,135 @@ SHELL=/bin/sh include Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 +CFLAGS=-g -I${DESTDIR}/include ${XCFLAGS} -CFLAGS=-g -I${DESTDIR}include ${XCFLAGS} +INST=$(RM) -f $@; $(CP) $? $@ -noversion: install.noversion - -KDIRS = ${KERNELDIR}/afs ${KERNELDIR}/rx ${KERNELDIR}/afsint \ - ${DESTDIR}include/afs ${KERNELDIR}/config - -UKDIRS = ${UKERNELDIR}/afs ${UKERNELDIR}/rx ${UKERNELDIR}/afsint \ - ${UKERNELDIR}/config - -noversionMakef: $(KDIRS) - -if [ ! -f Makefile.version ] ; \ - then \ - $(CP) Makefile.version-NOCML Makefile.version; \ - $(MAKE) -f Makefile.version AFS_component_version_number.c; \ - fi; - -version: ${DESTDIR}bin/mkvers Makefile.version - $(MAKE) -f Makefile.version AFS_component_version_number.c - -${DESTDIR}bin/mkvers: mkvers.c - set ${DESTDIR}bin; $(MKDIR_IF_NEEDED) - $(CC) -o ${DESTDIR}bin/mkvers mkvers.c +all: install Makefile.version: Makefile.version-CML Makefile.version-NOCML $(RM) -f Makefile.version - set -x ; \ if [ -r SRC/../CML/state ] ; \ then $(CP) Makefile.version-CML Makefile.version ; \ else $(CP) Makefile.version-NOCML Makefile.version ; \ fi -all: config +# +# AFS component version string file generation targets +# +AFS_component_version_number.c: Makefile.version + $(MAKE) -f Makefile.version AFS_component_version_number.c -mc.o: mc.c +${KERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c + $(INST) -config.o: config.c AFS_component_version_number.c +${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c + $(INST) +# +# App build/install targets +# config: config.o mc.o - $(SPEW) $(CC) $(CFLAGS) -o config config.o mc.o + $(CC) $(CFLAGS) -o config config.o mc.o -param.xxx: +mkvers: mkvers.c + $(CC) $(CFLAGS) -o mkvers mkvers.c -$(KDIRS): - set $@; $(MKDIR_IF_NEEDED) - -${KERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c - -$(RM) -f $@; $(CP) $? $@ +mc.o: mc.c +config.o: config.c AFS_component_version_number.c -${KERNELDIR}/afs/param.h ${DESTDIR}include/afs/param.h :: param.${SYS_NAME}.h - -$(RM) -f $@; $(CP) $? $@ +${DESTDIR}/bin: + mkdir -p $@ -${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}include/afs/afs_sysnames.h :: afs_sysnames.h - $(RM) -f $@; $(CP) $? $@ +${DESTDIR}/bin/mkvers: mkvers + $(INST) -DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h ${DESTDIR}include/afs/param.h ${DESTDIR}include/afs/stds.h ${DESTDIR}include/afs/icl.h +# +# Include installation targets +# +KDIRS = ${KERNELDIR}/afs \ + ${KERNELDIR}/rx \ + ${KERNELDIR}/afsint \ + ${DESTDIR}/include/afs \ + ${KERNELDIR}/config -${KERNELDIR}/afs/stds.h ${DESTDIR}include/afs/stds.h :: stds.h - $(RM) -f $@; $(CP) $? $@ +$(KDIRS): + mkdir -p $@ -${KERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME} - $(RM) -f $@; $(CP) $? $@ +${KERNELDIR}/afs/param.h ${DESTDIR}/include/afs/param.h: param.${SYS_NAME}.h + -$(INST) -${KERNELDIR}/afs/icl.h ${DESTDIR}include/afs/icl.h :: icl.h - $(RM) -f $@; $(CP) $? $@ +${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}/include/afs/afs_sysnames.h: afs_sysnames.h + $(INST) -${KERNELDIR}/afs/afs_args.h ${DESTDIR}include/afs/afs_args.h :: afs_args.h - $(RM) -f $@; $(CP) $? $@ +${KERNELDIR}/afs/stds.h ${DESTDIR}/include/afs/stds.h: stds.h + $(INST) -${DESTDIR}include/afs/venus.h :: venus.h - $(RM) -f $@; $(CP) $? $@ +${KERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME} + $(INST) -${DESTDIR}include/afs/debug.h :: debug.h - $(RM) -f $@; $(CP) $? $@ +${KERNELDIR}/afs/icl.h ${DESTDIR}/include/afs/icl.h: icl.h + $(INST) -$(UKDIRS): - set $@; $(MKDIR_IF_NEEDED) +${KERNELDIR}/afs/afs_args.h ${DESTDIR}/include/afs/afs_args.h: afs_args.h + $(INST) -${UKERNELDIR}/afs/AFS_component_version_number.c: AFS_component_version_number.c - -$(RM) -f $@; $(CP) $? $@ +${DESTDIR}/include/afs/venus.h: venus.h + $(INST) -${UKERNELDIR}/afs/param.h :: param.${SYS_NAME}_usr.h - -$(RM) -f $@; $(CP) $? $@ +${DESTDIR}/include/afs/debug.h: debug.h + $(INST) -${UKERNELDIR}/afs/afs_sysnames.h :: afs_sysnames.h - $(RM) -f $@; $(CP) $? $@ +UKDIRS = ${UKERNELDIR}/afs \ + ${UKERNELDIR}/rx \ + ${UKERNELDIR}/afsint \ + ${UKERNELDIR}/config -${UKERNELDIR}/afs/stds.h :: stds.h - $(RM) -f $@; $(CP) $? $@ +$(UKDIRS): + mkdir -p $@ -${UKERNELDIR}/config/Makefile.${SYS_NAME} :: Makefile.${SYS_NAME} - $(RM) -f $@; $(CP) $? $@ +${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h + $(INST) -${UKERNELDIR}/afs/icl.h :: icl.h - $(RM) -f $@; $(CP) $? $@ +${UKERNELDIR}/afs/afs_sysnames.h: afs_sysnames.h + $(INST) -${UKERNELDIR}/afs/venus.h :: venus.h - $(RM) -f $@; $(CP) $? $@ +${UKERNELDIR}/afs/stds.h: stds.h + $(INST) -${UKERNELDIR}/afs/afs_args.h :: afs_args.h - $(RM) -f $@; $(CP) $? $@ +${UKERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME} + $(INST) -# lkversion is the target the Linux build uses to verify the build machine -# has headers in the right place for the requested kernel builds. -# -# To add AFS support to a new Linux kernel rev, see comments in the file -# ./linux-version. -# -lkversion: - case ${SYS_NAME} in \ - *linux* ) \ - LINUX_SRCDIR="$(LINUX_SRCDIR)"; export LINUX_SRCDIR; \ - LINUX_VERS="$(LINUX_VERS)"; export LINUX_VERS; \ - sh ./linux-version ; \ - esac +${UKERNELDIR}/afs/icl.h: icl.h + $(INST) -install.noversion: $(KDIRS) noversionMakef all $(DESTINCLS) venus.h +${UKERNELDIR}/afs/venus.h: venus.h + $(INST) -system: install -install: version install.noversion kinstall ukinstall +${UKERNELDIR}/afs/afs_args.h: afs_args.h + $(INST) # these are needed to compile the kernel. Config is necessary to # convert the MakefileProto in libafs and the kernel links provide the # kernel include environment. param.h is, well, param.h. The afs_sysnames.h # file is needed by param.h to create unique identifiers for each SYS_TYPE. -# lkversion -kinstall: config $(KDIRS) ${KERNELDIR}/afs/param.h \ +install: config \ + $(DESTDIR)/bin \ + $(DESTDIR)/bin/mkvers \ + ${DESTDIR}/include/afs/param.h \ + ${DESTDIR}/include/afs/stds.h \ + ${DESTDIR}/include/afs/afs_sysnames.h \ + ${DESTDIR}/include/afs/afs_args.h \ + ${DESTDIR}/include/afs/icl.h \ + ${DESTDIR}/include/afs/venus.h \ + ${DESTDIR}/include/afs/debug.h \ + ukinstall \ + kinstall + +kinstall: \ + $(KDIRS) \ + ${KERNELDIR}/afs/param.h \ ${KERNELDIR}/afs/stds.h \ ${KERNELDIR}/afs/afs_sysnames.h \ ${KERNELDIR}/config/Makefile.${SYS_NAME} \ @@ -153,7 +152,10 @@ kinstall: config $(KDIRS) ${KERNELDIR}/afs/param.h \ ${KERNELDIR}/afs/icl.h \ ${KERNELDIR}/afs/AFS_component_version_number.c -ukinstall webinstall: $(DESTINCLS) config $(UKDIRS) ${UKERNELDIR}/afs/param.h ${UKERNELDIR}/afs/stds.h \ +ukinstall: \ + $(UKDIRS) \ + ${UKERNELDIR}/afs/param.h \ + ${UKERNELDIR}/afs/stds.h \ ${UKERNELDIR}/afs/afs_sysnames.h \ ${UKERNELDIR}/config/Makefile.${SYS_NAME} \ ${UKERNELDIR}/afs/afs_args.h \ diff --git a/src/config/Makefile.ppc_darwin_12.in b/src/config/Makefile.ppc_darwin_12.in index 3b8ca52b6..9ab147278 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=${DESTDIR}bin/pinstall +INSTALL=${DESTDIR}/bin/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 3b8ca52b6..9ab147278 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=${DESTDIR}bin/pinstall +INSTALL=${DESTDIR}/bin/pinstall LEX=lex -l LD= ld LORDER = lorder diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in index d50e1f992..415011c92 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in index 1e96eccf2..68062f73a 100644 --- a/src/config/Makefile.rs_aix42.in +++ b/src/config/Makefile.rs_aix42.in @@ -34,7 +34,7 @@ LEX=lex MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # This is the XBSA make flag and pathname to XBSA header files (xbsa.h) XBSA_FLAGS=-Dxbsa diff --git a/src/config/Makefile.s390_linux22.in b/src/config/Makefile.s390_linux22.in index 2953d711c..c30e13a38 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.s390_linux24.in b/src/config/Makefile.s390_linux24.in index 7805f0544..fa33d990b 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.sgi_62.in b/src/config/Makefile.sgi_62.in index 2de0753d6..9c6109634 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # This is for the vol package XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_63.in b/src/config/Makefile.sgi_63.in index e427a36ad..836ed4010 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install diff --git a/src/config/Makefile.sgi_64.in b/src/config/Makefile.sgi_64.in index dc7e30f9c..b09e3efc2 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # This is for the vol package XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_65.in b/src/config/Makefile.sgi_65.in index 2bdd7edf9..1f5608f9c 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # This is for the vol package XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sparc64_linux22.in b/src/config/Makefile.sparc64_linux22.in index 391139a6f..083605df9 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in index 391139a6f..083605df9 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.sparc_linux22.in b/src/config/Makefile.sparc_linux22.in index 391139a6f..083605df9 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # Other OS specific requirements # diff --git a/src/config/Makefile.sun4x_55.in b/src/config/Makefile.sun4x_55.in index 89ae2929a..e082e2fe7 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # this is for the vol package FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in index c35b019ab..59bdddaae 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # this is for the vol package FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in index b669ee3d1..e4f0579cd 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # this is for the vol package FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in index fac5d1964..223389097 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install # # this is for the vol package FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sunx86_54.in b/src/config/Makefile.sunx86_54.in index 7f71a1bf8..d0555e837 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=${DESTDIR}bin/install +INSTALL=${DESTDIR}/bin/install diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index f8e868a9e..737f4ea3f 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -55,7 +55,7 @@ noversion: install all: dlog dpass clean: - rm -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c + $(RM) -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c adkint.cs.o: adkint.cs.c adkint.xdr.o: adkint.xdr.c adkint.h @@ -79,10 +79,10 @@ dlog_test: dlog.c $(OBJS) $(LIBS) system: install ${DESTDIR}/bin/dlog: dlog - ${INSTALL} $? $@ + ${INSTALL} $? $@ ${DESTDIR}/bin/dpass: dpass - ${INSTALL} $? $@ + ${INSTALL} $? $@ install: all ${DESTDIR}/bin/dlog ${DESTDIR}/bin/dpass diff --git a/src/des/Makefile.in b/src/des/Makefile.in index c29d12610..946d783ea 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -60,7 +60,7 @@ all: install ${CC} -c -I. -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} $< libdes.a: ${OBJS} AFS_component_version_number.o - rm -f libdes.a + $(RM) -f libdes.a ar r libdes.a ${OBJS} AFS_component_version_number.o $(RANLIB) libdes.a @@ -200,10 +200,11 @@ test: libdes.a cd test; $(MAKE) clean: - rm -f *.a *.s *.o *.b core *~ *.com *.ld - rm -f make_fp make_ip make_keyperm make_odd make_p \ + $(RM) -f *.a *.s *.o *.b core *~ *.com *.ld + $(RM) -f make_fp make_ip make_keyperm make_odd make_p \ make_p_table make_s_table key_perm.h p_table.h \ s_table.h odd.h p.c s.c fp.c ip.c AFS_component_version_number.c + cd test; $(MAKE) clean include ../config/Makefile.version diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in index 59b34592d..7cd69f4e0 100644 --- a/src/des/test/Makefile.in +++ b/src/des/test/Makefile.in @@ -21,7 +21,7 @@ CFLAGS = ${INCDIRS} ${XCFLAGS} all system test: $(PROGS) clean: - rm -f *.o *.a testit verify key_test core + $(RM) -f *.o *.a testit verify key_test core install: @@ -33,5 +33,5 @@ testit: testit.o verify: verify.o ../libdes.a ${CC} ${CFLAGS} verify.o ${LIBS} -o verify key_test: key_test.o ../libdes.a - ${CC} ${CFLAGS} key_test.o ${LIBS} -o key_test + ${CC} ${CFLAGS} key_test.o ${LIBS} -o key_test diff --git a/src/des_stub/Makefile.in b/src/des_stub/Makefile.in index 7c850bf1f..067e70b12 100644 --- a/src/des_stub/Makefile.in +++ b/src/des_stub/Makefile.in @@ -5,9 +5,6 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# Install the des libraries and header files from the -# PARENT link instead of building them. -# DESTDIR=@DESTDIR@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ @@ -16,28 +13,9 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -RM = /bin/rm -UKERNELDIR=../libuafs/ -SRC =. -DESPAR =../../../DESLIB/dest/ -DESINC =${DESPAR}/include/ -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 -all: - -kinstall: - @echo No $@ source here. - -ukinstall webinstall: ${DESINC}des.h ${DESINC}mit-cpyright.h - set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED) - ${INSTALL} ${DESINC}des.h ${UKERNELDIR}des/des.h - ${INSTALL} ${DESINC}mit-cpyright.h ${UKERNELDIR}des/mit-cpyright.h - ${INSTALL} ${DESPAR}/lib/libdes.a ${UKERNELDIR}des/libdes.a - -install install.noversion noversion system: ukinstall - echo "Installing des stubs from ${DESPAR}:" `cd ${DESPAR};/bin/pwd` - ${RM} -f ${DESTDIR}/lib/libdes.a - ${INSTALL} ${DESPAR}/lib/libdes.a ${DESTDIR}/lib/libdes.a - ${INSTALL} ${DESINC}des.h ${DESINC}des_conf.h ${DESINC}mit-cpyright.h ${DESTDIR}/include - ${INSTALL} ${DESINC}des_odd.h ${DESTDIR}/include/des_odd.h +# +# Makefile is a no op, we don't do des stubs any more +# +all: clean: diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index c8fa3067a..8634070ee 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -16,7 +16,6 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} @@ -31,7 +30,7 @@ cmdall: all test all: libdir.a libdir.a: ${OBJS} AFS_component_version_number.o - rm -f libdir.a + $(RM) -f libdir.a ar rv libdir.a $(OBJS) AFS_component_version_number.o $(RANLIB) libdir.a @@ -39,11 +38,13 @@ kinstall: ${INSTALL} dir.h ${KERNELDIR}/afs ${INSTALL} dir.c ${KERNELDIR}/afs/afs_dir.c -ukinstall webinstall: - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) +ukinstall webinstall: ${UKERNELDIR}/afs ${INSTALL} dir.h ${UKERNELDIR}/afs ${INSTALL} dir.c ${UKERNELDIR}/afs/afs_dir.c +${UKERNELDIR}/afs: + mkdir -p $@ + install: all kinstall ukinstall ${INSTALL} libdir.a ${DESTDIR}/lib/afs ${INSTALL} dir.h ${DESTDIR}/include/afs @@ -58,4 +59,4 @@ dir.o: dir.c dir.h salvage.o: salvage.c dir.h clean: - rm -f *.o *.a core AFS_component_version_number.c + $(RM) -f *.o *.a core AFS_component_version_number.c diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index f79b9934f..0959eec08 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -26,7 +26,7 @@ OBJS=test-salvage.o physio.o dtest.o install: dtest clean: - rm -f *.o *.a test dtest core + $(RM) -f *.o *.a test dtest core dtest: dtest.o $(CC) $(LDFLAGS) -o dtest dtest.o $(LIBS) diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 16cc6a9dd..78334509d 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -33,12 +33,12 @@ all: export.ext export.ext.nonfs cfgexport cfgafs noversion system: install install: all kinstall ukinstall - ${INSTALL} export.ext ${DESTDIR}root.client/usr/vice/etc/dkload - ${INSTALL} export.ext.nonfs ${DESTDIR}root.client/usr/vice/etc/dkload + ${INSTALL} export.ext ${DESTDIR}/root.client/usr/vice/etc/dkload + ${INSTALL} export.ext.nonfs ${DESTDIR}/root.client/usr/vice/etc/dkload ${INSTALL} export.exp ${DESTDIR}/lib/afs/export.exp ${INSTALL} extras.exp ${DESTDIR}/lib/afs/extras.exp - ${INSTALL} cfgexport ${DESTDIR}root.client/usr/vice/etc/dkload/cfgexport - ${INSTALL} cfgafs ${DESTDIR}root.client/usr/vice/etc/dkload/cfgafs + ${INSTALL} cfgexport ${DESTDIR}/root.client/usr/vice/etc/dkload/cfgexport + ${INSTALL} cfgafs ${DESTDIR}/root.client/usr/vice/etc/dkload/cfgafs kinstall: ${INSTALL} export.h ${DESTDIR}/include @@ -70,4 +70,4 @@ cfgexport.o: cfgexport.c AFS_component_version_number.c cfgafs.o: cfgafs.c AFS_component_version_number.c clean: - rm -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c + $(RM) -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index f76791777..3d4d6102d 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -5,8 +5,6 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# */ - DESTDIR=@DESTDIR@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ @@ -49,12 +47,7 @@ LIBS=${SRCDIR}/lib/libubik.a \ ${SRCDIR}/lib/libdes.a \ ${XLIBS} -include ../config/Makefile.version - -all: translate_et - -clean: - rm -f *.o translate_et core AFS_component_version_number.c +all: install translate_et: translate_et.o ${INCLS} ${CC} ${LDFLAGS} -o translate_et translate_et.o ${LIBS} @@ -73,9 +66,22 @@ test: translate_et ./translate_et 19270407 >> /tmp/translate_et.output ./translate_et 180511 >> /tmp/translate_et.output diff test.output /tmp/translate_et.output - rm /tmp/translate_et.output + $(RM) /tmp/translate_et.output + +# +# Install targets +# +install: ${DESTDIR}/bin/translate_et -system: install +${DESTDIR}/bin/translate_et: translate_et + ${INSTALL} $? $@ + +# +# Misc. targets +# + +clean: + $(RM) -f *.o translate_et core AFS_component_version_number.c + +include ../config/Makefile.version -noversion install.noversion install: all - ${INSTALL} translate_et ${DESTDIR}/bin/translate_et diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index c046570d4..de983f8b4 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -15,7 +15,6 @@ include ../config/Makefile.${SYS_NAME} SHELL = /bin/sh KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 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${SRCDIR}/include ${XCFLAGS} @@ -32,8 +31,8 @@ noversion: install all: libafsint.a $(KSRCS) libafsint.a: ${OBJS} AFS_component_version_number.o - -rm -f $@ - $(AR) rv $@ ${OBJS} AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crv $@ ${OBJS} AFS_component_version_number.o $(RANLIB) $@ afsaux.o: afsaux.c afsint.h @@ -88,24 +87,28 @@ afscbint.h: common.xg afscbint.xg $(UTILS) system: install -kinstall: ${KSRCS} - set ${KERNELDIR}/afsint; $(MKDIR_IF_NEEDED) +kinstall: ${KSRCS} ${KERNELDIR}/afsint ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint - ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${KERNELDIR}/afsint - -${INSTALL} ${KERNELDIR}rx/rx.h ${KERNELDIR}/afsint/rx.h + ${INSTALL} ${SRCDIR}/include/afs/rxgen_consts.h ${KERNELDIR}/afsint + -${INSTALL} ${KERNELDIR}/rx/rx.h ${KERNELDIR}/afsint/rx.h ${INSTALL} afscbint.h ${KERNELDIR}/afs -ukinstall webinstall: ${UKSRCS} - set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED) +${KERNELDIR}/afsint: + mkdir -p $@ + +ukinstall webinstall: ${UKERNELDIR}/afsint ${UKSRCS} ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint - ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${UKERNELDIR}/afsint - -${INSTALL} ${UKERNELDIR}rx/rx.h ${UKERNELDIR}/afsint/rx.h + ${INSTALL} ${SRCDIR}/include/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: all kinstall ukinstall ${INSTALL} libafsint.a ${DESTDIR}/lib/afs ${INSTALL} afsint.h ${DESTDIR}/include/afs ${INSTALL} afscbint.h ${DESTDIR}/include/afs 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 + $(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 diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index c1220d587..6aade257d 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -47,9 +47,9 @@ all: install # Build targets # libfsprobe.a: fsprobe.o fsprobe_callback.o AFS_component_version_number.o - -rm -f libfsprobe.a - ${AR} rv libfsprobe.a fsprobe.o fsprobe_callback.o AFS_component_version_number.o - ${RANLIB} libfsprobe.a + -$(RM) -f $@ + $(AR) crv $@ fsprobe.o fsprobe_callback.o AFS_component_version_number.o + $(RANLIB) $@ fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c @@ -76,7 +76,7 @@ ${DESTDIR}/lib/afs/libfsprobe.a: libfsprobe.a # Misc others # clean: - rm -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c + $(RM) -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index 68afe2dfc..b380761ea 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -62,10 +62,10 @@ vers.o: ftpd.c ftpcmd.y ${CC} ${CFLAGS} -c vers.c clean: - rm -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c + $(RM) -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c cleandir: clean - rm -f ${MAN} .depend + $(RM) -f ${MAN} .depend depend: ${SRCS} mkdep ${CFLAGS} ${SRCS} diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index 98052054b..7a680ad53 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -16,7 +16,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET=$(SRCDIR)bin/compile_et +COMPILE_ET=${SRCDIR}/bin/compile_et CFLAGS= ${DBUG} -I. -I${TOP_SRCDIR}/config \ -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} @@ -103,7 +103,7 @@ ${LIBSRCS}: ${INCLS} $(LIBOBJS): ${INCLS} err.c: err.et - rm -f err.h err.c; $(COMPILE_ET) err -h err + $(RM) -f err.h err.c; $(COMPILE_ET) err -h err keymap.o: keymap.c ${INCLS} @@ -159,7 +159,7 @@ object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} system: install libgtx.a: ${LIBOBJS} AFS_component_version_number.o - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} AFS_component_version_number.o ${RANLIB} $@ @@ -168,4 +168,4 @@ install: all ${INSTALL} libgtx.a ${DESTDIR}/lib/afs 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 err.c core cb_test gtxtest AFS_component_version_number.c diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in index 7d43a5b06..98fad8897 100644 --- a/src/inetd/Makefile.in +++ b/src/inetd/Makefile.in @@ -47,7 +47,7 @@ inetd.o: inetd.c AFS_component_version_number.c ta-rauth.o: ta-rauth.c clean: - rm -f inetd *.o *.BAK *~ core AFS_component_version_number.c + $(RM) -f inetd *.o *.BAK *~ core AFS_component_version_number.c install: all ${INSTALL} -s -m 755 inetd ${DESTDIR}/etc/inetd diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 96174720e..275884596 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -17,7 +17,6 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR = ../libuafs/ COMPILE_ET = ${SRCDIR}/bin/compile_et -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} @@ -74,7 +73,7 @@ test tests: install 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 + $(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} ${SRCDIR}/lib/afs/libaudit.a @@ -99,7 +98,7 @@ authclient.o: authclient.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} kaerrors -h kautils kauth.ss.o: kauth.ss.c kauth.cs.o: kauth.cs.c @@ -118,13 +117,13 @@ Kkauth.h: kauth.rg ${SRCDIR}/bin/rxgen -x -k -h -o Kkauth.h kauth.rg libkauth.a: $(OBJS) AFS_component_version_number.o - -rm -f libkauth.a + -$(RM) -f libkauth.a ar rv libkauth.a $(OBJS) AFS_component_version_number.o $(RANLIB) libkauth.a libkauth.krb.a: $(KOBJS) AFS_component_version_number.o - -rm -f libkauth.krb.a + -$(RM) -f libkauth.krb.a ar rv libkauth.krb.a $(KOBJS) AFS_component_version_number.o $(RANLIB) libkauth.krb.a @@ -208,20 +207,20 @@ rebuild: rebuild.o kautils.o ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/ut system: install -${DESTDIR}root.server/usr/afs/bin/kaserver: kaserver +${DESTDIR}/root.server/usr/afs/bin/kaserver: kaserver ${INSTALL} -s $? $@ -${DESTDIR}/etc/kas ${DESTDIR}root.server/usr/afs/bin/kas: kas +${DESTDIR}/etc/kas ${DESTDIR}/root.server/usr/afs/bin/kas: kas ${INSTALL} -s $? $@ ${DESTDIR}/bin/kpwvalid ${DESTDIR}/etc/kpwvalid \ -${DESTDIR}root.server/usr/afs/bin/kpwvalid: kpwvalid +${DESTDIR}/root.server/usr/afs/bin/kpwvalid: kpwvalid ${INSTALL} $? $@ -${DESTDIR}/bin/klog ${DESTDIR}root.server/usr/afs/bin/klog: klog +${DESTDIR}/bin/klog ${DESTDIR}/root.server/usr/afs/bin/klog: klog ${INSTALL} -s $? $@ -${DESTDIR}/bin/klog.krb ${DESTDIR}root.server/usr/afs/bin/klog.krb: klog.krb +${DESTDIR}/bin/klog.krb ${DESTDIR}/root.server/usr/afs/bin/klog.krb: klog.krb ${INSTALL} -s $? $@ ${DESTDIR}/bin/knfs: knfs @@ -239,22 +238,25 @@ ${DESTDIR}/lib/afs/libkauth.krb.a: libkauth.krb.a ${DESTDIR}/etc/kdb: kdb ${INSTALL} -s $? $@ -ukinstall webinstall: ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) - set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED) +ukinstall webinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h ${INSTALL} Kkauth.h ${UKERNELDIR}/afsint/kauth.h ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}/afsint/kauth.xdr.c ${INSTALL} Kkauth.cs.c ${UKERNELDIR}/afsint/kauth.cs.c ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs +${UKERNELDIR}/afs: + mkdir -p $@ -install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/kaserver \ +${UKERNELDIR}/afsint: + mkdir -p $@ + +install: all ukinstall ${DESTDIR}/root.server/usr/afs/bin/kaserver \ ${DESTDIR}/etc/kas ${DESTDIR}/etc/kpwvalid \ - ${DESTDIR}root.server/usr/afs/bin/kas \ - ${DESTDIR}root.server/usr/afs/bin/kpwvalid \ + ${DESTDIR}/root.server/usr/afs/bin/kas \ + ${DESTDIR}/root.server/usr/afs/bin/kpwvalid \ ${DESTDIR}/bin/klog ${DESTDIR}/bin/klog.krb \ - ${DESTDIR}root.server/usr/afs/bin/klog \ - ${DESTDIR}root.server/usr/afs/bin/klog.krb \ + ${DESTDIR}/root.server/usr/afs/bin/klog \ + ${DESTDIR}/root.server/usr/afs/bin/klog.krb \ ${DESTDIR}/bin/knfs ${DESTDIR}/bin/kpasswd \ ${DESTDIR}/bin/kpwvalid ${DESTDIR}/lib/afs/libkauth.a \ ${DESTDIR}/lib/afs/libkauth.krb.a ${DESTDIR}/etc/kdb diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 0094e64a8..4cd77008b 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -28,7 +28,7 @@ system: all all test tests: multiklog clean: - rm -f *.o core + $(RM) -f *.o core multiklog: multiklog.o cc -o multiklog ${CFLAGS} multiklog.o -lafsutil diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 6152982cb..0be2fbf4f 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -28,7 +28,7 @@ include ../config/Makefile.version all: libacl.a libacl.a: $(LIBOBJS) AFS_component_version_number.o - rm -f libacl.a + $(RM) -f libacl.a ar rv libacl.a $(LIBOBJS) AFS_component_version_number.o $(RANLIB) libacl.a @@ -37,7 +37,7 @@ aclprocs.o: aclprocs.c acl.h netprocs.o: netprocs.c acl.h clean: - rm -f acltest *.o libacl.a core AFS_component_version_number.c + $(RM) -f acltest *.o libacl.a core AFS_component_version_number.c system: install diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index 9db796ff6..1b8699b20 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -10,28 +10,29 @@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ - - -BACKDIR=../../../../PARENT/dest/ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs +INCDIRS= -I${DESTDIR}/include -I.. +LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS} CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -system: acltest +all: install -clean: - rm -f *.o *.a acltest core +install: acltest +# +# Build targets +# acltest: acltest.o $(CC) -o acltest acltest.o $(CFLAGS) acltest.o: acltest.c -kinstall: - @echo No kernel source here. - +# +# Misc. targets +# +clean: + $(RM) -f *.o *.a acltest core diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 648cc373d..7c87fd14c 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -14,9 +14,9 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? -COMPILE_ET = ${SRCDIR}bin/compile_et +COMPILE_ET = ${SRCDIR}/bin/compile_et RXKAD = ../../rxkad AUTH = ../../auth BOZO = ../../bozo @@ -28,48 +28,48 @@ VLSERVER = ../../vlserver VOLSER = ../../volser afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et - ${INSTALL} afs_AdminErrors.h ${DESTDIR}include/afs - rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h + ${INSTALL} afs_AdminErrors.h ${DESTDIR}/include/afs + $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h ${COMPILE_ET} afs_AdminBosErrors.et -h afs_AdminBosErrors cp afs_AdminBosErrors.h ${DESTDIR}/include/afs/afs_AdminBosErrors.h afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.et - rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h + $(RM) -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h ${COMPILE_ET} afs_AdminCfgErrors.et -h afs_AdminCfgErrors cp afs_AdminCfgErrors.h ${DESTDIR}/include/afs/afs_AdminCfgErrors.h afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et - rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h + $(RM) -f afs_AdminClientErrors.c afs_AdminClientErrors.h ${COMPILE_ET} afs_AdminClientErrors.et -h afs_AdminClientErrors cp afs_AdminClientErrors.h ${DESTDIR}/include/afs/afs_AdminClientErrors.h afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et - rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h + $(RM) -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h ${COMPILE_ET} afs_AdminMiscErrors.et -h afs_AdminMiscErrors cp afs_AdminMiscErrors.h ${DESTDIR}/include/afs/afs_AdminMiscErrors.h afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et - rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h + $(RM) -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h ${COMPILE_ET} afs_AdminCommonErrors.et -h afs_AdminCommonErrors cp afs_AdminCommonErrors.h ${DESTDIR}/include/afs/afs_AdminCommonErrors.h afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et - rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h + $(RM) -f afs_AdminKasErrors.c afs_AdminKasErrors.h ${COMPILE_ET} afs_AdminKasErrors.et -h afs_AdminKasErrors cp afs_AdminKasErrors.h ${DESTDIR}/include/afs/afs_AdminKasErrors.h afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et - rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h + $(RM) -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h ${COMPILE_ET} afs_AdminPtsErrors.et -h afs_AdminPtsErrors cp afs_AdminPtsErrors.h ${DESTDIR}/include/afs/afs_AdminPtsErrors.h afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et - rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h + $(RM) -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h ${COMPILE_ET} afs_AdminUtilErrors.et -h afs_AdminUtilErrors cp afs_AdminUtilErrors.h ${DESTDIR}/include/afs/afs_AdminUtilErrors.h afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et - rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h + $(RM) -f afs_AdminVosErrors.c afs_AdminVosErrors.h ${COMPILE_ET} afs_AdminVosErrors.et -h afs_AdminVosErrors cp afs_AdminVosErrors.h ${DESTDIR}/include/afs/afs_AdminVosErrors.h @@ -104,11 +104,11 @@ LIBADMINUTIL = ${DESTDIR}/lib/afs/libafsadminutil.a system install: ${LIBADMINUTIL} ${LIBADMINUTIL}: libafsadminutil.a - ${INSTALL} afs_utilAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_utilAdmin.h ${DESTDIR}/include/afs ${INSTALL} libafsadminutil.a ${LIBADMINUTIL} libafsadminutil.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -116,10 +116,10 @@ afs_utilAdmin.o: afs_utilAdmin.h ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} - + acfg_errors.o: ${AUTH}/acfg_errors.c ${CCRULE} - + boserr.o: ${BOZO}/boserr.c ${CCRULE} @@ -145,13 +145,13 @@ volerr.o: ${VOLSER}/volerr.c ${CCRULE} clean: - rm -f *.o libafsadminutil* - rm -f afs_AdminBosErrors.c afs_AdminBosErrors.h - rm -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h - rm -f afs_AdminClientErrors.c afs_AdminClientErrors.h - rm -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h - rm -f afs_AdminKasErrors.c afs_AdminKasErrors.h - rm -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h - rm -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h - rm -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h - rm -f afs_AdminVosErrors.c afs_AdminVosErrors.h + $(RM) -f *.o libafsadminutil* + $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h + $(RM) -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h + $(RM) -f afs_AdminClientErrors.c afs_AdminClientErrors.h + $(RM) -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h + $(RM) -f afs_AdminKasErrors.c afs_AdminKasErrors.h + $(RM) -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h + $(RM) -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h + $(RM) -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h + $(RM) -f afs_AdminVosErrors.c afs_AdminVosErrors.h diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index f045fa490..7ab600109 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? BOZO = ../../bozo/ @@ -30,11 +30,11 @@ LIBBOSADMIN = ${DESTDIR}/lib/afs/libbosadmin.a system install: ${LIBBOSADMIN} ${LIBBOSADMIN}: libbosadmin.a - ${INSTALL} afs_bosAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_bosAdmin.h ${DESTDIR}/include/afs ${INSTALL} libbosadmin.a ${LIBBOSADMIN} libbosadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -47,4 +47,4 @@ bosint.cs.o: ${BOZO}/bosint.cs.c ${CCRULE} clean: - rm -f *.o libbosadmin* + $(RM) -f *.o libbosadmin* diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index 34c027bfd..3d5c42fcc 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -13,7 +13,7 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? UBIKOBJS=\ @@ -37,11 +37,11 @@ LIBCFGADMIN = ${DESTDIR}/lib/afs/libcfgadmin.a system install: ${LIBCFGADMIN} ${LIBCFGADMIN}: libcfgadmin.a - ${INSTALL} afs_cfgAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_cfgAdmin.h ${DESTDIR}/include/afs ${INSTALL} libcfgadmin.a ${LIBCFGADMIN} libcfgadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -56,4 +56,4 @@ ubik_int.xdr.o: ${UBIKDIR}/ubik_int.xdr.c ${CFGOBJS}: afs_cfgAdmin.h clean: - rm -f *.o libcfgadmin* + $(RM) -f *.o libcfgadmin* diff --git a/src/libadmin/cfg/test/Makefile.in b/src/libadmin/cfg/test/Makefile.in index ee649ab51..a4a04a9d1 100644 --- a/src/libadmin/cfg/test/Makefile.in +++ b/src/libadmin/cfg/test/Makefile.in @@ -13,7 +13,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -DAFS_PTHREAD_ENV -I${SRCDIR}/include ${MT_CFLAGS} ######################################################################## diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index a92c2fe26..ab995c582 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} ADMINOBJS = afs_clientAdmin.o @@ -25,15 +25,15 @@ LIBCLIENTADMIN = ${DESTDIR}/lib/afs/libclientadmin.a system install: ${LIBCLIENTADMIN} ${LIBCLIENTADMIN}: libclientadmin.a - ${INSTALL} afs_clientAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_clientAdmin.h ${DESTDIR}/include/afs ${INSTALL} libclientadmin.a ${LIBCLIENTADMIN} libclientadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ afs_clientAdmin.o: afs_clientAdmin.h clean: - rm -f *.o libclientadmin* + $(RM) -f *.o libclientadmin* diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index db18a1693..3c7e4050e 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? KAUTH= ../../kauth/ @@ -33,11 +33,11 @@ LIBKASADMIN = ${DESTDIR}/lib/afs/libkasadmin.a system install: ${LIBKASADMIN} ${LIBKASADMIN}: libkasadmin.a - ${INSTALL} afs_kasAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_kasAdmin.h ${DESTDIR}/include/afs ${INSTALL} libkasadmin.a ${LIBKASADMIN} libkasadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -53,4 +53,4 @@ kaaux.o: ${KAUTH}/kaaux.c ${CCRULE}; clean: - rm -f *.o libkasadmin* + $(RM) -f *.o libkasadmin* diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index 875060f70..caa8c2b38 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? PTSERVER = ../../ptserver/ @@ -33,11 +33,11 @@ LIBPTSADMIN = ${DESTDIR}/lib/afs/libptsadmin.a system install: ${LIBPTSADMIN} ${LIBPTSADMIN}: libptsadmin.a - ${INSTALL} afs_ptsAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_ptsAdmin.h ${DESTDIR}/include/afs ${INSTALL} libptsadmin.a ${LIBPTSADMIN} libptsadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -50,4 +50,4 @@ ptint.cs.o: ${PTSERVER}/ptint.cs.c ${CCRULE}; clean: - rm -f *.o libptsadmin* + $(RM) -f *.o libptsadmin* diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 5be8f3e60..f26f216d4 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -13,7 +13,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} ######################################################################## diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index 2ad9c9eca..b2d43da14 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -13,7 +13,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} ######################################################################## diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index 05876f92a..4d7afabfb 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? VLSERVER = ../../vlserver/ @@ -46,11 +46,11 @@ LIBVOSADMIN = ${DESTDIR}/lib/afs/libvosadmin.a system install: ${LIBVOSADMIN} ${LIBVOSADMIN}: libvosadmin.a - ${INSTALL} afs_vosAdmin.h ${DESTDIR}include/afs + ${INSTALL} afs_vosAdmin.h ${DESTDIR}/include/afs ${INSTALL} libvosadmin.a ${LIBVOSADMIN} libvosadmin.a: ${LIBOBJS} - -rm -f $@ + -$(RM) -f $@ ar rv $@ ${LIBOBJS} ${RANLIB} $@ @@ -75,4 +75,4 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c ${CCRULE}; clean: - rm -f *.o libvosadmin* + $(RM) -f *.o libvosadmin* diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common index 385afd216..30f92a481 100644 --- a/src/libafs/Makefile.common +++ b/src/libafs/Makefile.common @@ -338,7 +338,7 @@ afs_pioctl_nfs.o: $(AFS)/afs_pioctl.c clean: - -rm -rf STATIC* MODLOAD* - -rm -rf h net netinet rpc ufs machine inet nfs sys afs afsint asm asm-generic config rx linux + -$(RM) -rf STATIC* MODLOAD* + -$(RM) -rf h net netinet rpc ufs machine inet nfs sys afs afsint asm asm-generic config rx linux diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index b95ffb1d6..1743b552f 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -76,11 +76,11 @@ include Makefile.common setup: -mkdir $(KOBJ) - -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config ln -s ../Makefile $(KOBJ)/Makefile ln -s ../Makefile.common $(KOBJ)/Makefile.common ln -s ../config $(KOBJ)/config - -rm -f h net netinet rpc ufs nfs machine sys + -$(RM) -f h net netinet rpc ufs nfs machine sys ln -s /usr/include/sys h ln -s /usr/include/net net ln -s /usr/include/netinet netinet @@ -119,12 +119,12 @@ $(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH) $(LIBAFSIAUTH): $(AFSAOBJS) $(AFSIAUTHOBJS) - ${LD} ${LDSTUFF} -bloadmap:afs.ext.iauth.loadmap \ + ${LD} ${LDSTUFF} -bloadmap:afs.ext.iauth.loadmap \ -bmap:afs.ext.iauth.map -o afs.ext.iauth \ ${AFSAOBJS} ${AFSIAUTHOBJS} ${LIBS} ${LDFLAGS} $(LIBAFS): $(AFSAOBJS) $(AFSNOIAUTHOBJS) - ${LD} ${LDSTUFF} -bloadmap:afs.ext.loadmap \ + ${LD} ${LDSTUFF} -bloadmap:afs.ext.loadmap \ -bmap:afs.ext.map -o afs.ext \ ${AFSAOBJS} $(AFSNOIAUTHOBJS) ${LIBS} ${LDFLAGS} diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 9fb1ab3a3..51ca91686 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -54,11 +54,11 @@ include Makefile.common setup: -mkdir $(KOBJ) - -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config ln -s ../Makefile $(KOBJ)/Makefile ln -s ../Makefile.common $(KOBJ)/Makefile.common ln -s ../config $(KOBJ)/config - -rm -f h net netinet rpc ufs nfs machine sys vm mach kern + -$(RM) -f h net netinet rpc ufs nfs machine sys vm mach kern -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index 045f204dc..5b810de85 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -57,11 +57,11 @@ include Makefile.common setup: -mkdir $(KOBJ) - -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config ln -s ../Makefile $(KOBJ)/Makefile ln -s ../Makefile.common $(KOBJ)/Makefile.common ln -s ../config $(KOBJ)/config - -rm -f h net netinet rpc ufs nfs machine sys vm + -$(RM) -f h net netinet rpc ufs nfs machine sys vm -ln -s /usr/sys/include/net net -ln -s /usr/sys/include/machine machine -ln -s /usr/sys/include/netinet netinet diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index df534dd74..7e91cdc7b 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -52,11 +52,11 @@ include Makefile.common setup: -mkdir $(KOBJ) - -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config ln -s ../Makefile $(KOBJ)/Makefile ln -s ../Makefile.common $(KOBJ)/Makefile.common ln -s ../config $(KOBJ)/config - -rm -f h net netinet rpc ufs nfs machine sys vm + -$(RM) -f h net netinet rpc ufs nfs machine sys vm -ln -s /usr/src/sys/net net -ln -s /usr/src/sys/i386/include machine -ln -s /usr/src/sys/netinet netinet diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 7938cccd4..1f46a1a45 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -80,7 +80,7 @@ include Makefile.common BITS = 64 32 setup: - -rm -f h net dux machine netinet nfs rpc s200 ufs sys + -$(RM) -f h net dux machine netinet nfs rpc s200 ufs sys ln -s /usr/include/sys h ln -s /etc/conf/net net ln -s /etc/conf/dux dux @@ -96,7 +96,7 @@ setup: dir=$$t.$$b; \ echo Making directory: $$dir; \ mkdir -p $$dir; \ - rm -f $$dir/Makefile $$dir/Makefile.common $$dir/config; \ + $(RM) -f $$dir/Makefile $$dir/Makefile.common $$dir/config; \ ln -s ../Makefile $$dir/Makefile; \ ln -s ../Makefile.common $$dir/Makefile.common; \ ln -s ../config $$dir/config; \ @@ -131,8 +131,8 @@ LIBAFS = libafs$(BITSUFFIX).a LIBAFSNONFS = libafs$(BITSUFFIX).nonfs.a -DEST_LIBAFS = ${DESTDIR}root.client/bin/${LIBAFS} -DEST_LIBAFSNONFS = ${DESTDIR}root.client/bin/${LIBAFSNONFS} +DEST_LIBAFS = ${DESTDIR}/root.client/bin/${LIBAFS} +DEST_LIBAFSNONFS = ${DESTDIR}/root.client/bin/${LIBAFSNONFS} # libafs: ${DEST_LIBAFS} ${DEST_LIBAFSNONFS} diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 5fbf798c8..90097ff47 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -49,7 +49,7 @@ MPS=MP KDEFS=-D_K64U64 -D_KERNEL -DSTATIC=static -D_PAGESZ=16384 -D_MIPS3_ADDRSPACE \ -DTFP -non_shared -elf -xansi -64 -mips4 -TENV:kernel \ -TENV:misalignment=1 -OPT:space \ - -D${CPUBOARD} -D${MPSP} -D${CPUARCH} -DAFS_SGIMP_ENV ${NODYNOPT} \ + -D${CPUBOARD} -D${MPSP} -D${CPUARCH} -DAFS_SGIMP_ENV ${NODYNOPT} \ -jalr -woff 1209,1196,1496 # Turning off warnings regarding constant conditionals and not prototyped. @@ -218,12 +218,12 @@ KOBJ = STATIC MODLOAD setup: - -rm -f h net netinet rpc ufs nfs machine sys + -$(RM) -f h net netinet rpc ufs nfs machine sys -ln -s /usr/include/sys h -ln -s /usr/include/net /usr/include/netinet . -ln -s /usr/include/rpc /usr/include/sys . -ln -s /usr/include/sys/fs . - -mkdir ${DESTDIR}root.client/bin + -mkdir ${DESTDIR}/root.client/bin BUILDPROCS="${PROCESSORS}" ; \ BUILDMPS="${MPS}" ; \ @@ -237,7 +237,7 @@ setup: dir=$$t.$$n.$$p ; \ echo Making directory: $$dir; \ mkdir -p $$dir; \ - rm -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \ + $(RM) -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \ ln -s ../Makefile.common $$dir/Makefile.common; \ ln -s ../Makefile $$dir/Makefile; \ ln -s ../config $$dir/config; \ @@ -254,7 +254,7 @@ setup: dir=$$t.$$p ; \ echo Making directory: $$dir; \ mkdir -p $$dir; \ - rm -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \ + $(RM) -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \ ln -s ../Makefile.common $$dir/Makefile.common; \ ln -s ../Makefile $$dir/Makefile; \ ln -s ../config $$dir/config; \ @@ -365,8 +365,8 @@ LINKFILES = linkfiles ${INSTDIRS}: ${COPYFILES} ${LINKFILES} -STATICCLIENTDIR = ${DESTDIR}root.client/bin -MODLOADCLIENTDIR = ${DESTDIR}root.client/usr/vice/etc/sgiload +STATICCLIENTDIR = ${DESTDIR}/root.client/bin +MODLOADCLIENTDIR = ${DESTDIR}/root.client/usr/vice/etc/sgiload # Make the NFS and no-NFS clients for this directory. # STATIC.libafs: ${LIBAFSNONFSA} ${COPYFILES} ${LINKFILES} @@ -410,14 +410,14 @@ ${COPYFILES}: # If this changes, also change the kdump symlinks. ${LINKFILES}: - ln -fs libafs.IP20.a ${DESTDIR}root.client/bin/libafs.IP22.a - ln -fs libafs.IP20.a ${DESTDIR}root.client/bin/libafs.IP32.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}root.client/bin/libafs.IP22.nonfs.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}root.client/bin/libafs.IP32.nonfs.a - ln -fs libafs.IP20.o ${DESTDIR}root.client/usr/vice/etc/sgiload/libafs.IP22.o - ln -fs libafs.IP20.o ${DESTDIR}root.client/usr/vice/etc/sgiload/libafs.IP32.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}root.client/usr/vice/etc/sgiload/libafs.IP22.nonfs.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}root.client/usr/vice/etc/sgiload/libafs.IP32.nonfs.o + ln -fs libafs.IP20.a ${DESTDIR}/root.client/bin/libafs.IP22.a + ln -fs libafs.IP20.a ${DESTDIR}/root.client/bin/libafs.IP32.a + ln -fs libafs.IP20.nonfs.a ${DESTDIR}/root.client/bin/libafs.IP22.nonfs.a + ln -fs libafs.IP20.nonfs.a ${DESTDIR}/root.client/bin/libafs.IP32.nonfs.a + ln -fs libafs.IP20.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP22.o + ln -fs libafs.IP20.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP32.o + ln -fs libafs.IP20.nonfs.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP22.nonfs.o + ln -fs libafs.IP20.nonfs.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP32.nonfs.o diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 2d3eb18de..62172d7ce 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -37,7 +37,7 @@ AFS_OS_NONFSOBJS = # System specific build commands and flags -CC = gcc +CC = kgcc LD = ld # -Wall @@ -93,7 +93,7 @@ LINUX_MODULE_NAME= LOCAL_SMP_DEF= setup: - -rm -f h net netinet sys rpc + -$(RM) -f h net netinet sys rpc -ln -s rx rpc for m in ${MPS} ; do \ KDIR=$(KOBJ)-${LINUX_VERS}${LINUX_MODULE_NAME}-$$m; \ @@ -106,19 +106,19 @@ setup: # Compile SP and MP clients as requested ${COMPDIRS} ${INSTDIRS}: - rm -f h + $(RM) -f h ln -s ${LINUX_KERNEL_PATH}/include/linux h - rm -f linux + $(RM) -f linux ln -s ${LINUX_KERNEL_PATH}/include/linux linux - rm -f net + $(RM) -f net ln -s ${LINUX_KERNEL_PATH}/include/linux net - rm -f netinet + $(RM) -f netinet ln -s ${LINUX_KERNEL_PATH}/include/linux netinet - rm -f sys + $(RM) -f sys ln -s ${LINUX_KERNEL_PATH}/include/linux sys - rm -f asm-generic + $(RM) -f asm-generic ln -s ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic - rm -f asm + $(RM) -f asm ln -s ${LINUX_KERNEL_PATH}/include/asm-alpha asm diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index 40bf4c86d..4a93927dd 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -67,7 +67,7 @@ include Makefile.common setup: - -rm -f h net netinet rpc ufs nfs machine sys inet + -$(RM) -f h net netinet rpc ufs nfs machine sys inet -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -79,7 +79,7 @@ setup: for t in ${KOBJ} ; do \ echo Making directory: $$t; \ mkdir -p $$t; \ - rm -f $$t/Makefile.common $$t/Makefile $$t/config ; \ + $(RM) -f $$t/Makefile.common $$t/Makefile $$t/config ; \ ln -s ../Makefile.common $$t/Makefile.common ; \ ln -s ../Makefile $$t/Makefile ;\ ln -s ../config $$t/config ;\ @@ -145,7 +145,7 @@ ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) $(LD) -r -o $@ $(AFSAOBJS) ${AFSNONFSOBJS} -MODLOADDIR = ${DESTDIR}root.client/usr/vice/etc/modload +MODLOADDIR = ${DESTDIR}/root.client/usr/vice/etc/modload libafs: ${LIBAFSNONFS} install_libafs: ${LIBAFSNONFS} diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index c5d360597..5cb871211 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -100,99 +100,99 @@ ${DESTDIR}/lib/libafsauthent.a: libafsauthent.a ${INSTALL} libafsauthent.a ${DESTDIR}/lib/libafsauthent.a libafsauthent.a: ${LIBOBJS} - rm -f libafsauthent.a - ${AR} -r libafsauthent.a ${LIBOBJS} - ${RANLIB} libafsauthent.a + $(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} + $(RANLIB) $@ audit.o: ${AUDIT}/audit.c - ${CCRULE}; + ${CCRULE} cellconfig.o: ${AUTH}/cellconfig.c - ${CCRULE}; + ${CCRULE} ktc.o: ${AUTH}/ktc.c - ${CCRULE}; + ${CCRULE} userok.o: ${AUTH}/userok.c - ${CCRULE}; + ${CCRULE} writeconfig.o: ${AUTH}/writeconfig.c - ${CCRULE}; + ${CCRULE} authcon.o: ${AUTH}/authcon.c - ${CCRULE}; + ${CCRULE} ktc_errors.o: ${AUTH}/ktc_errors.c - ${CCRULE}; + ${CCRULE} acfg_errors.o: ${AUTH}/acfg_errors.c - ${CCRULE}; + ${CCRULE} kauth.xdr.o: ${KAUTH}/kauth.xdr.c - ${CCRULE}; + ${CCRULE} kauth.cs.o: ${KAUTH}/kauth.cs.c - ${CCRULE}; + ${CCRULE} kaaux.o: ${KAUTH}/kaaux.c - ${CCRULE}; + ${CCRULE} client.o: ${KAUTH}/client.c - ${CCRULE}; + ${CCRULE} authclient.o: ${KAUTH}/authclient.c - ${CCRULE}; + ${CCRULE} token.o: ${KAUTH}/token.c - ${CCRULE}; + ${CCRULE} kautils.o: ${KAUTH}/kautils.c - ${CCRULE}; + ${CCRULE} kalocalcell.o: ${KAUTH}/kalocalcell.c - ${CCRULE}; + ${CCRULE} kaerrors.o: ${KAUTH}/kaerrors.c - ${CCRULE}; + ${CCRULE} user.o: ${KAUTH}/user.c - ${CCRULE}; + ${CCRULE} read_passwd.o: ${KAUTH}/read_passwd.c - ${CCRULE}; + ${CCRULE} ubikclient.o: ${UBIK}/ubikclient.c - ${CCRULE}; + ${CCRULE} uerrors.o: ${UBIK}/uerrors.c - ${CCRULE}; + ${CCRULE} ubik_int.cs.o: ${UBIK}/ubik_int.cs.c - ${CCRULE}; + ${CCRULE} ubik_int.xdr.o: ${UBIK}/ubik_int.xdr.c - ${CCRULE}; + ${CCRULE} get_krbrlm.o: ${UTIL}/get_krbrlm.c - ${CCRULE}; + ${CCRULE} dirpath.o: ${UTIL}/dirpath.c - ${CCRULE}; + ${CCRULE} fileutil.o: ${UTIL}/fileutil.c - ${CCRULE}; + ${CCRULE} casestrcpy.o: ${UTIL}/casestrcpy.c ${CCRULE} pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE}; + ${CCRULE} rxkad_errs.o: ${RXKAD}/rxkad_errs.c - ${CCRULE}; + ${CCRULE} ptclient.o: ${PTSERVER}/ptclient.c - ${CCRULE}; + ${CCRULE} # The special treatment of this file for hp_ux110 is because of a bug # in version A.11.01.00 of the HP C compiler. This bug appears to be @@ -214,31 +214,31 @@ ptuser.o: ${PTSERVER}/ptuser.c esac display.o: ${PTSERVER}/display.c - ${CCRULE}; + ${CCRULE} ptint.cs.o: ${PTSERVER}/ptint.cs.c - ${CCRULE}; + ${CCRULE} ptint.xdr.o: ${PTSERVER}/ptint.xdr.c - ${CCRULE}; + ${CCRULE} pterror.o: ${PTSERVER}/pterror.c - ${CCRULE}; + ${CCRULE} rmtsysc.o: ${SYS}/rmtsysc.c - ${CCRULE}; + ${CCRULE} rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c - ${CCRULE}; + ${CCRULE} rmtsys.cs.o: ${SYS}/rmtsys.cs.c - ${CCRULE}; + ${CCRULE} afssyscalls.o: ${SYS}/afssyscalls.c - ${CCRULE}; + ${CCRULE} rmtsysnet.o: ${SYS}/rmtsysnet.c - ${CCRULE}; + ${CCRULE} clean: - rm -f *.o libafsauthent* + $(RM) -f *.o *.a libafsauthent* diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 6c5a8f16d..96ec1a000 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -120,12 +120,12 @@ ${DESTDIR}/lib/libafsrpc.a: libafsrpc.a ${INSTALL} libafsrpc.a ${DESTDIR}/lib/libafsrpc.a libafsrpc.a: ${LIBOBJS} - rm -f libafsrpc.a - ${AR} -r libafsrpc.a ${LIBOBJS} - ${RANLIB} libafsrpc.a - case "${SYS_NAME}" in \ - rs_aix*) \ - ${AR} r libafsrpc.a ../sys/afsl.exp;; \ + $(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} + $(RANLIB) $@ + case "${SYS_NAME}" in \ + rs_aix*) \ + $(AR) crv $@ ../sys/afsl.exp;; \ esac rx_event.o: ${RX}/rx_event.c @@ -318,19 +318,19 @@ syscall.o: ${SYS}/syscall.s sun4x_5*) \ /usr/ccs/lib/cpp ${SFLAGS} ${SYS}/syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ - rm syscall.ss;; \ + $(RM) syscall.ss;; \ sgi_* | ppc_darwin* ) \ ${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \ alpha_dux?? ) \ ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ ${AS} -o syscall.o syscall.i; \ - rm -f syscall.ss syscall.i;; \ + $(RM) -f syscall.ss syscall.i;; \ *fbsd* ) \ touch syscall.o ;; \ *) \ /lib/cpp ${SFLAGS} ${SYS}/syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ - rm syscall.ss;; \ + $(RM) syscall.ss;; \ esac rxstat.o: ${RXSTAT}/rxstat.c @@ -361,4 +361,4 @@ afsaux.o: ${FSINT}/afsaux.c ${CCRULE}; clean: - rm -f *.o libafsrpc* + $(RM) -f *.o libafsrpc* diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common index 8dc837c20..fcab8c67e 100644 --- a/src/libuafs/Makefile.common +++ b/src/libuafs/Makefile.common @@ -24,25 +24,25 @@ NS_INCL =SRC/../afsweb/netscape_includes install: ukinstall webinstall: AFSWEB/$(LIBAFSWEB) AFSWEB/$(LIBAFSWEBKRB) - ${INSTALL} AFSWEB/$(LIBAFSWEB) ${DESTDIR}root.afsweb/usr/lib - ${INSTALL} AFSWEB/$(LIBAFSWEBKRB) ${DESTDIR}root.afsweb/usr/lib + ${INSTALL} AFSWEB/$(LIBAFSWEB) ${DESTDIR}/root.afsweb/usr/lib + ${INSTALL} AFSWEB/$(LIBAFSWEBKRB) ${DESTDIR}/root.afsweb/usr/lib ukinsthdrs: - ${INSTALL} afs/param.h ${DESTDIR}root.perf/include/afs - ${INSTALL} afs/stds.h ${DESTDIR}root.perf/include/afs - ${INSTALL} afs/afs_sysnames.h ${DESTDIR}root.perf/include/afs - ${INSTALL} afs/afs_stats.h ${DESTDIR}root.perf/include/afs - ${INSTALL} afs/sysincludes.h ${DESTDIR}root.perf/include/afs - ${INSTALL} afs/afs_usrops.h ${DESTDIR}root.perf/include/afs + ${INSTALL} afs/param.h ${DESTDIR}/root.perf/include/afs + ${INSTALL} afs/stds.h ${DESTDIR}/root.perf/include/afs + ${INSTALL} afs/afs_sysnames.h ${DESTDIR}/root.perf/include/afs + ${INSTALL} afs/afs_stats.h ${DESTDIR}/root.perf/include/afs + ${INSTALL} afs/sysincludes.h ${DESTDIR}/root.perf/include/afs + ${INSTALL} afs/afs_usrops.h ${DESTDIR}/root.perf/include/afs ukinstlibs: - ${INSTALL} des/libdes.a ${DESTDIR}root.perf/lib - ${INSTALL} UAFS/$(LIBUAFS) ${DESTDIR}root.perf/lib + ${INSTALL} des/libdes.a ${DESTDIR}/root.perf/lib + ${INSTALL} UAFS/$(LIBUAFS) ${DESTDIR}/root.perf/lib ukinstall: ukinsthdrs UAFS/$(LIBUAFS) linktest ukinstlibs linktest: UAFS/$(LIBUAFS) des/libdes.a - $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest linktest.c -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${DESTDIR}include/rx -I${DESTDIR}root.perf/include UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS) + $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest linktest.c -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${DESTDIR}/include/rx -I${DESTDIR}/root.perf/include UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS) CRULE1= $(CC) $(OPTF) -DKERNEL $(CFLAGS) -c $? CRULE2= $(CC) $(OPTF) $(WEBOPTS) -DKERNEL $(CFLAGS) -c $? @@ -889,6 +889,6 @@ $(WEBOBJ)/Krxstat.xdr.o: $(AFSINT)/Krxstat.xdr.c $(CRULE2); clean: - -rm -rf UAFS* AFSWEB* nsapi des afs afsint config rx - -rm -f h net netinet rpc ufs machine inet nfs sys des linktest + -$(RM) -rf UAFS* AFSWEB* nsapi des afs afsint config rx + -$(RM) -f h net netinet rpc ufs machine inet nfs sys des linktest diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index ad19125c8..93a174889 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags DEFINES= -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} @@ -42,7 +40,7 @@ WEBOPTS = -I../nsapi -qarch=com -DNETSCAPE_NSAPI -DAIX -DNET_SSL -DXP_UNIX -DMCC include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -53,18 +51,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) @@ -80,17 +82,17 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(AFS)/afsl.exp $(RANLIB) libuafs.a $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -o $(LIBAFSWEB) $(LD_FLAGS) $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc ## ## Use Kerberos authentication instead of kaservers ## $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -o $(LIBAFSWEBKRB) $(LD_FLAGS) $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index 636a0a88b..eaba8dc18 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags CC = cc DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE @@ -36,7 +34,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -47,18 +45,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}; \ @@ -75,13 +77,13 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index fd0510c53..d89e6cf80 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -17,8 +17,6 @@ DBUG=-O include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags DEFINES=-DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE -D_NO_PROTO -DOSF KOPTS= @@ -38,7 +36,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -49,18 +47,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) @@ -76,14 +78,14 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) ranlib $(LIBUAFS) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -all -shared -expect_unresolved "*" $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -all -shared -expect_unresolved "*" $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index 924f142b7..4a9c6d345 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -9,8 +9,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags CC = gcc DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE @@ -30,7 +28,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -41,18 +39,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} @@ -68,13 +70,13 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 0915f814c..cf2b93ae9 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags CC = /opt/ansic/bin/cc DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE @@ -36,7 +34,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -47,18 +45,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) @@ -74,13 +76,13 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index 993e67abf..949a95be4 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags CC = cc DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE @@ -35,7 +33,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -46,18 +44,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) @@ -73,13 +75,13 @@ AFSWEB/$(LIBAFSWEB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -shared $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index c76ba6543..939f97ca0 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # System specific build commands and flags CC = gcc DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE @@ -36,7 +34,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -47,18 +45,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} @@ -74,13 +76,13 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index f41301960..725adc9d3 100644 --- a/src/libuafs/MakefileProto.SOLARIS.in +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -15,8 +15,6 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - # 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} @@ -34,7 +32,7 @@ LIBAFSWEBKRB = nsafs.krb.so include Makefile.common setup_common: - -rm -f h net netinet rpc ufs nfs machine sys inet nsapi + -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi -ln -s /usr/include/sys h -ln -s /usr/include/net net -ln -s /usr/include/netinet netinet @@ -45,18 +43,22 @@ setup_common: -ln -s /usr/include/ufs ufs -ln -s $(NS_INCL) nsapi -setup_uafs: setup_common - set UAFS; $(MKDIR_IF_NEEDED) - -rm -f UAFS/Makefile UAFS/Makefile.common +setup_uafs: UAFS setup_common + -$(RM) -f UAFS/Makefile UAFS/Makefile.common ln -s ../Makefile UAFS/Makefile ln -s ../Makefile.common UAFS/Makefile.common -setup_nsafs: setup_common - set AFSWEB; $(MKDIR_IF_NEEDED) - -rm -f AFSWEB/Makefile AFSWEB/Makefile.common +UAFS: + mkdir -p $@ + +setup_nsafs: AFSWEB setup_common + -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common ln -s ../Makefile AFSWEB/Makefile ln -s ../Makefile.common AFSWEB/Makefile.common +AFSWEB: + mkdir -p $@ + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ $(MAKE) $(LIBUAFS) @@ -72,14 +74,14 @@ AFSWEB/$(LIBAFSWEBKRB): setup_nsafs # Below this line are targets when in the COMMON directory: $(LIBUAFS): $(UAFSOBJ) - -rm -f $(LIBUAFS) + -$(RM) -f $(LIBUAFS) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a - -rm -f $(LIBAFSWEB) + -$(RM) -f $(LIBAFSWEB) ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a - -rm -f $(LIBAFSWEBKRB) + -$(RM) -f $(LIBAFSWEBKRB) ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/log/Makefile.in b/src/log/Makefile.in index b578dfa25..d426fa35e 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -99,7 +99,7 @@ ${DESTDIR}/etc/kseal: kseal # Misc. targets # clean: - rm -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb + $(RM) -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb test: cd test; $(MAKE) diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index 2729a6887..f8933640c 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -10,26 +10,30 @@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ - - -BACKDIR=../../../../PARENT/dest/ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include -I${DESTDIR}/include/afs -I${BACKDIR}/include/afs -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs +INCDIRS= -I${DESTDIR}/include -I.. -I${DESTDIR}/include/afs +LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS} CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -# top-level options -system all test: testlog gettoktest +all: install -clean: - rm -f *.o testlog gettoktest core +install: testlog gettoktest +# +# Build targets +# testlog: testlog.o ${CC} -o testlog testlog.o ${CFLAGS} gettoktest: gettoktest.o ${CC} -o gettoktest gettoktest.o ${CFLAGS} +# +# Misc. targets +# +clean: + $(RM) -f *.o testlog gettoktest core + diff --git a/src/login/Makefile.in b/src/login/Makefile.in index d9bb698d7..85e534a1a 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -64,9 +64,9 @@ login.krb: ${KOBJS} ${KLIBS} esac ; libutil.a : ${UTILOBJS} - @rm -f $@ - ar cru $@ ${UTILOBJS} - ${RANLIB} $@ + $(RM) -f $@ + $(AR) crv $@ ${UTILOBJS} + $(RANLIB) $@ login.o: login.c AFS_component_version_number.c ${CC} ${CFLAGS} -c login.c @@ -76,10 +76,10 @@ login.krb.o: login.c mv login.o login.krb.o clean: - rm -f ${OBJS} core login AFS_component_version_number.c + $(RM) -f *.o ${OBJS} core login AFS_component_version_number.c cleandir: clean - rm -f ${MAN} tags .depend + $(RM) -f ${MAN} tags .depend depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 2131e295a..b809d5acf 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -29,9 +29,9 @@ all: install # Build rules # liblwp.a: ${LIBOBJS} - -rm -f liblwp.a - $(AR) rv liblwp.a ${LIBOBJS} - $(RANLIB) liblwp.a + -$(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} + $(RANLIB) $@ process.s: # This is required so sgi_64+ does not try to build this file. @@ -44,7 +44,7 @@ process.o : process.s process.c 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${SRCDIR}/include process.s process.ss; \ ${AS} process.ss -o process.o; \ - rm process.ss ;; \ + $(RM) process.ss ;; \ sgi_5* ) \ $(CC) -c -I${SRCDIR}/include -KPIC -G0 process.s;; \ sgi_61 | sgi_62 | sgi_63 ) \ @@ -52,19 +52,19 @@ process.o : process.s process.c s390*) \ /lib/cpp -P -I${SRCDIR}/include process.s >process.ss; \ ${AS} -ahlns process.ss -o process.o >process.lst; \ - rm process.ss ;; \ + $(RM) process.ss ;; \ ppc_darwin* ) \ $(CC) -c ${XCFLAGS} -I${SRCDIR}/include process.s;; \ i386_fbsd* ) \ /usr/bin/cpp -P process.fbsd.s > process.ss; \ ${AS} -o process.o process.ss; \ - rm process.ss ;; \ + $(RM) process.ss ;; \ hp* | *_linux* | sgi_64 | sgi_65 ) \ ${CC} ${CFLAGS} -c process.c;; \ ncrx86_*) \ /usr/ccs/lib/cpp -P -I${SRCDIR}/include process.s process.ss; \ ${AS} -o process.o process.ss; \ - rm process.ss ;; \ + $(RM) process.ss ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${SRCDIR}/include -DASSEMBLER process.s; \ ${AS} -v process.i -o process.o;; \ @@ -73,11 +73,11 @@ process.o : process.s process.c *) \ /lib/cpp -P -I${SRCDIR}/include process.s process.ss; \ ${AS} process.ss -o process.o; \ - rm process.ss ;; \ + $(RM) process.ss ;; \ esac iomgr.o : iomgr.c lwp.h timer.h - ${CC} -c ${CFLAGS} iomgr.c + ${CC} -c ${CFLAGS} iomgr.c preempt.o : preempt.c lwp.h preempt.h lwp.o : lwp.c lwp.h @@ -132,6 +132,6 @@ ${DESTDIR}/include/timer.h: timer.h # Misc. targets # clean: - rm -f *.o *.a core AFS_component_version_number.c + $(RM) -f *.o *.a core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in index fa5d5d2ec..64ea31fae 100644 --- a/src/lwp/test/Makefile.in +++ b/src/lwp/test/Makefile.in @@ -14,7 +14,7 @@ SYS_NAME=@AFS_SYSNAME@ OPTIMIZE= -g -INCDIRS= -I.. -I${DESTDIR}include +INCDIRS= -I.. -I${DESTDIR}/include LIBS= ../liblwp.a include ../../config/Makefile.${SYS_NAME} @@ -53,4 +53,4 @@ test_key: test_key.o clean: - -rm -f *.o *.a test testlwp selclient selserver core + -$(RM) -f *.o *.a test testlwp selclient selserver core diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in index 20a8dd556..32a6f08d3 100644 --- a/src/mpp/Makefile.in +++ b/src/mpp/Makefile.in @@ -30,7 +30,7 @@ installdoc: ${MANUAL} ${INSTALL} -c ${MANUAL} ${DESTDIR}man/man1 clean: - -rm -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c + -$(RM) -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c ${PROGRAM}: AFS_component_version_number.c ${CC} ${CFLAGS} $@.c -o $@ ${LIBS} diff --git a/src/ntp/Makefile.in b/src/ntp/Makefile.in index e11f7ae34..99739d108 100644 --- a/src/ntp/Makefile.in +++ b/src/ntp/Makefile.in @@ -142,11 +142,11 @@ runntp: runntp.o ${AFSLIBS} ${CC} ${LDFLAGS} -o runntp runntp.o ${AFSLIBS} ${XLIBS} install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp - ${INSTALL} ntpd ${DESTDIR}root.server/usr/afs/bin/ntpd - ${INSTALL} ntpdc ${DESTDIR}root.server/usr/afs/bin/ntpdc + ${INSTALL} ntpd ${DESTDIR}/root.server/usr/afs/bin/ntpd + ${INSTALL} ntpdc ${DESTDIR}/root.server/usr/afs/bin/ntpdc ${INSTALL} ntp ${DESTDIR}/etc/ntp ${INSTALL} ntpdc ${DESTDIR}/etc/ntpdc - ${INSTALL} runntp ${DESTDIR}root.server/usr/afs/bin/runntp + ${INSTALL} runntp ${DESTDIR}/root.server/usr/afs/bin/runntp # # If you don't want a symlink to the daemon, comment out the next line @@ -156,7 +156,7 @@ install-man: cd man; $(MAKE) ${MFLAGS} DESTDIR=${DESTDIR} install install-link: - rm -f ${BINDIR}/${LINKDIR}/ntpd + $(RM) -f ${BINDIR}/${LINKDIR}/ntpd ln -s ${BINDIR}/ntpd ${DESTDIR}/${LINKDIR}/ntpd print: @@ -172,7 +172,7 @@ test-dist: ntp.tar.Z mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp-test.tar.Z ntp.tar.Z: ${DIST} - rm -f ntp.tar ntp.tar.Z + $(RM) -f ntp.tar ntp.tar.Z tar cf ntp.tar ${DIST} compress ntp.tar diff --git a/src/null/Makefile.in b/src/null/Makefile.in index cf2623297..4770fa2d2 100644 --- a/src/null/Makefile.in +++ b/src/null/Makefile.in @@ -26,11 +26,11 @@ ${DESTDIR}/lib/afs/libnull.a: libnull.a null.o: null.c AFS_component_version_number.o libnull.a: null.o - -rm -f $@ + -$(RM) -f $@ ar rv $@ null.o $(RANLIB) $@ clean: - rm -f *.o *.a AFS_component_version_number.c + $(RM) -f *.o *.a AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/package/Makefile.in b/src/package/Makefile.in index 53f226c1f..cab24a859 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -89,7 +89,7 @@ lex.c: system : install clean : - rm -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\ + $(RM) -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\ AFS_component_version_number.c lex.c y.tab.h install: package package_test diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 54e6be550..fcf26e0d3 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -31,13 +31,9 @@ LDFLAGS = ${SHARE_LDFLAGS} OBJS = $(SHOBJS) test_pam.o INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include \ -I/usr/include -I/usr/include/sys -CFLAGS = ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} +CFLAGS = ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} -TARGETS = pam_afs.so.1 test_pam pam_afs.krb.so.1 - -include ../config/Makefile.version - -system all: $(TARGETS) +all: install 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 @@ -94,14 +90,24 @@ test_pam: test_pam.o echo No link line for system $(SYS_NAME). ;; \ esac -clean: - /bin/rm -f $(TARGETS) $(OBJS) afs_setcred.o afs_setcred_krb.o core *~ AFS_component_version_number.c +install: test_pam ${DESTDIR}/lib/pam_afs.so.1 ${DESTDIR}/lib/pam_afs.krb.so.1 + +${DESTDIR}/lib/pam_afs.so.1: pam_afs.so.1 + ${INSTALL} $? $@ -install: all - ${INSTALL} -s pam_afs.so.1 ${DESTDIR}/lib/pam_afs.so.1 - ${INSTALL} -s pam_afs.krb.so.1 ${DESTDIR}/lib/pam_afs.krb.so.1 +${DESTDIR}/lib/pam_afs.krb.so.1: pam_afs.krb.so.1 + ${INSTALL} $? $@ afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h afs_pam_msg.o: afs_pam_msg.c afs_pam_msg.h afs_message.h afs_message.o: afs_message.c afs_message.h afs_util.o: afs_util.c afs_util.h + +# +# Misc. targets +# +clean: + $(RM) -f *.a *.o *.so.1 test_pam core *~ AFS_component_version_number.c + +include ../config/Makefile.version + diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index 4c26ba73d..2d23a9525 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -48,7 +48,7 @@ install: ${DESTDIR}/bin/install @echo -n clean: - rm -f *.o pinstall AFS_component_version_number.c + $(RM) -f *.o pinstall AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/pinstall/test/Makefile.in b/src/pinstall/test/Makefile.in index e4a5bc5fb..e55d314e4 100644 --- a/src/pinstall/test/Makefile.in +++ b/src/pinstall/test/Makefile.in @@ -5,25 +5,12 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# There's really not much in here to build... -# DESTDIR=@DESTDIR@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ +all: - -BACKDIR=../../../../PARENT/dest/ -OPTIMIZE=-O - -INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include - -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} - -all test system: - @echo "nothing to do, done" - -kinstall: - @echo No kernel source here. +install: diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index deb58ac6f..5ddc1c1ba 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -20,9 +20,9 @@ all: install # Build targets # libprocmgmt.a: procmgmt_unix.o AFS_component_version_number.o - $(RM) -f libprocmgmt.a - $(AR) r libprocmgmt.a procmgmt_unix.o AFS_component_version_number.o - $(RANLIB) libprocmgmt.a + $(RM) -f $@ + $(AR) crv $@ procmgmt_unix.o AFS_component_version_number.o + $(RANLIB) $@ procmgmt_unix.o: procmgmt_unix.c procmgmt.h diff --git a/src/procmgmt/test/Makefile.in b/src/procmgmt/test/Makefile.in index 2db93947c..5659cf1ca 100644 --- a/src/procmgmt/test/Makefile.in +++ b/src/procmgmt/test/Makefile.in @@ -12,7 +12,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} -CFLAGS = $(DBUG) -I${SRCDIR}include ${XCFLAGS} +CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS} ######################################################################## # build tests diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index b452f1812..288a98ccf 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -16,7 +16,6 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ RXGEN=${SRCDIR}/bin/rxgen COMPILE_ET = ${SRCDIR}/bin/compile_et -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} INCLS=${SRCDIR}/include/ubik.h \ @@ -48,22 +47,14 @@ LIBS = ${SRCDIR}/lib/libubik.a \ ${SRCDIR}/lib/afs/util.a \ ${SRCDIR}/lib/afs/libsys.a -auditlib=${SRCDIR}/lib/afs/libaudit.a -LIBOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o - -UKSRCS=ptuser.c ptclient.h pterror.c pterror.h ptserver.h - -include ../config/Makefile.version - - -clean: - $(RM) -f *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \ - libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ - core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c +all: install -ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${auditlib} - $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${auditlib} +# +# Build targets +# +ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${SRCDIR}/lib/afs/libaudit.a + $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libaudit.a ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c @@ -87,7 +78,7 @@ Kptint.xdr.c: ptint.xg ${RXGEN} -x -k -c -o Kptint.xdr.c ptint.xg Kptint.h: ptint.xg - ${RXGEN} -x -k -h -o Kptint.h ptint.xg + ${RXGEN} -x -k -h -o Kptint.h ptint.xg display.o: display.c ${INCLS} @@ -104,12 +95,13 @@ ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c ptuser.o: ptuser.c ${LINCLS} pterror.h pterror.c: pterror.et - $(RM) -f pterror.h pterror.c; ${COMPILE_ET} pterror + $(RM) -f pterror.h pterror.c + ${COMPILE_ET} pterror -libprot.a: ${LIBOBJS} AFS_component_version_number.o - $(RM) -f libprot.a - $(AR) r libprot.a ${LIBOBJS} AFS_component_version_number.o - $(RANLIB) libprot.a +libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o + $(RM) -f $@ + $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o + $(RANLIB) $@ pts: pts.o libprot.a ${SRCDIR}/lib/afs/libcmd.a $(LIBS) $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}/lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS} @@ -141,48 +133,112 @@ pt_util: pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) ubik.o: ubik.c ${INCLS} -system: install +prerror.h: pterror.h + ${INSTALL} $? $@ + echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> $@ + +# +# Installation targets +# +ukinstall: ${UKERNELDIR}/afs \ + ${UKERNELDIR}/afsint/ptint.h \ + ${UKERNELDIR}/afsint/ptint.cs.c \ + ${UKERNELDIR}/afsint/ptint.xdr.c \ + ${UKERNELDIR}/afs/ptuser.c \ + ${UKERNELDIR}/afs/ptclient.h \ + ${UKERNELDIR}/afs/pterror.c \ + ${UKERNELDIR}/afs/pterror.h \ + ${UKERNELDIR}/afs/ptserver.h + +install: ukinstall \ + ${DESTDIR}/root.server/usr/afs/bin/ptserver \ + ${DESTDIR}/root.server/usr/afs/bin/pts \ + ${DESTDIR}/bin/pts \ + ${DESTDIR}/root.server/usr/afs/bin/pt_util \ + ${DESTDIR}/etc/prdb_check \ + ${DESTDIR}/lib/afs/libprot.a \ + ${DESTDIR}/include/afs/prclient.h \ + ${DESTDIR}/include/afs/prerror.h \ + ${DESTDIR}/include/afs/print.h \ + ${DESTDIR}/include/afs/prserver.h \ + ${DESTDIR}/include/afs/ptclient.h \ + ${DESTDIR}/include/afs/pterror.h \ + ${DESTDIR}/include/afs/ptint.h \ + ${DESTDIR}/include/afs/ptserver.h \ + readgroup readpwd testpt + +${UKERNELDIR}/afs: + mkdir -p $@ + +${UKERNELDIR}/afs/ptuser.c: ptuser.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/ptclient.h: ptclient.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/pterror.c: pterror.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/pterror.h: pterror.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/ptserver.h: ptserver.h + ${INSTALL} $? $@ -kinstall: - @echo No $@ source here. +${UKERNELDIR}/afsint/ptint.h: Kptint.h + ${INSTALL} $? $@ -ukinstall webinstall: ${UKSRCS} Kptint.h Kptint.cs.c Kptint.xdr.c - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) - ${INSTALL} Kptint.h ${UKERNELDIR}/afsint/ptint.h - ${INSTALL} Kptint.cs.c ${UKERNELDIR}/afsint/ptint.cs.c - ${INSTALL} Kptint.xdr.c ${UKERNELDIR}/afsint/ptint.xdr.c - ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs +${UKERNELDIR}/afsint/ptint.cs.c: Kptint.cs.c + ${INSTALL} $? $@ -all: ptclient libprot.a pts db_verify readgroup readpwd testpt pt_util +${UKERNELDIR}/afsint/ptint.xdr.c: Kptint.xdr.c + ${INSTALL} $? $@ -${DESTDIR}root.server/usr/afs/bin/ptserver: ptserver +${DESTDIR}/root.server/usr/afs/bin/ptserver: ptserver ${INSTALL} $? $@ -${DESTDIR}/bin/pts ${DESTDIR}root.server/usr/afs/bin/pts: pts +${DESTDIR}/bin/pts ${DESTDIR}/root.server/usr/afs/bin/pts: pts ${INSTALL} $? $@ -${DESTDIR}root.server/usr/afs/bin/pt_util: pt_util +${DESTDIR}/root.server/usr/afs/bin/pt_util: pt_util ${INSTALL} $? $@ ${DESTDIR}/lib/afs/libprot.a: libprot.a - ${INSTALL} $? $@ - - -install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/ptserver ${DESTDIR}root.server/usr/afs/bin/pts ${DESTDIR}/bin/pts ${DESTDIR}/lib/afs/libprot.a ${DESTDIR}root.server/usr/afs/bin/pt_util - ${INSTALL} libprot.a ${DESTDIR}/lib/afs/libprot.a - ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}/include/afs - ${INSTALL} ptserver.h ${DESTDIR}/include/afs/prserver.h - ${INSTALL} ptint.h ${DESTDIR}/include/afs/print.h - ${INSTALL} pterror.h ${DESTDIR}/include/afs/prerror.h - ${INSTALL} ptclient.h ${DESTDIR}/include/afs/prclient.h - ${INSTALL} -f db_verify ${DESTDIR}/etc/prdb_check - echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> ${DESTDIR}/include/afs/prerror.h - -libinstall: ${DESTDIR}/lib/afs/libprot.a - ${INSTALL} libprot.a ${DESTDIR}/lib/afs/libprot.a - ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}/include/afs - ${INSTALL} ptserver.h ${DESTDIR}/include/afs/prserver.h - ${INSTALL} ptint.h ${DESTDIR}/include/afs/print.h - ${INSTALL} pterror.h ${DESTDIR}/include/afs/prerror.h - ${INSTALL} ptclient.h ${DESTDIR}/include/afs/prclient.h + ${INSTALL} $? $@ +${DESTDIR}/etc/prdb_check: db_verify + ${INSTALL} -f $? $@ + +${DESTDIR}/include/afs/prclient.h: ptclient.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/prerror.h: pterror.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/print.h: ptint.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/prserver.h: ptserver.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/ptserver.h: ptserver.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/ptint.h: ptint.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/pterror.h: pterror.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/ptclient.h: ptclient.h + ${INSTALL} $? $@ + +# +# Misc. targets +# +clean: + $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \ + libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ + core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c + +include ../config/Makefile.version diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in index 9e4674982..3b00b27df 100644 --- a/src/rcp/Makefile.in +++ b/src/rcp/Makefile.in @@ -68,10 +68,10 @@ rcp: ${OBJS} ${LIBS} clean: clean: - rm -f ${OBJS} core rcp AFS_component_version_number.c + $(RM) -f ${OBJS} core rcp AFS_component_version_number.c cleandir: clean - rm -f ${MAN} tags .depend + $(RM) -f ${MAN} tags .depend depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in index cf94f96aa..eb48c1468 100644 --- a/src/rlogind/Makefile.in +++ b/src/rlogind/Makefile.in @@ -78,10 +78,10 @@ rexecd: rexecd.o ${ALIBS} ( cd ../rsh ; $(MAKE) herror.o ) clean: - rm -f ${OBJS} core rlogind AFS_component_version_number.c + $(RM) -f ${OBJS} core rlogind AFS_component_version_number.c cleandir: clean - rm -f ${MAN} tags .depend + $(RM) -f ${MAN} tags .depend depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} diff --git a/src/rsh/Makefile.in b/src/rsh/Makefile.in index 8558fa6c6..0dac9d41e 100644 --- a/src/rsh/Makefile.in +++ b/src/rsh/Makefile.in @@ -47,7 +47,7 @@ all: rlogin rsh system: install rsh: rsh.o ${OBJS} ${LIBS} - ${CC} -o $@ ${CFLAGS} rsh.o ${OBJS} ${LIBS} ${XLIBS} + ${CC} -o $@ ${CFLAGS} rsh.o ${OBJS} ${LIBS} ${XLIBS} rlogin: rlogin.o ${OBJS} ${LIBS} ${CC} -o $@ ${CFLAGS} rlogin.o ${OBJS} ${LIBS} ${XLIBS} @@ -61,10 +61,10 @@ rsh.o: rsh.c AFS_component_version_number.c (cd ../inetd ; $(MAKE) ta-rauth.o DESTDIR=${DESTDIR}) clean: - rm -f ${OBJS} core rsh *.BAK AFS_component_version_number.c rlogin rlogin.o rsh.o + $(RM) -f ${OBJS} core rsh *.BAK AFS_component_version_number.c rlogin rlogin.o rsh.o cleandir: clean - rm -f ${MAN} tags .depend + $(RM) -f ${MAN} tags .depend depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index a39a27c3b..8194f6fd9 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -86,7 +86,7 @@ rx_conncache.o: rx.h rx_trace.o: rx_trace.h rxdumptrace: rx_trace.c - rm -f rxdumptrace + $(RM) -f rxdumptrace $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o rx_trace.c $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o ${LIBS} ${XLIBS} @@ -99,13 +99,13 @@ xdr_rx.o: xdr.h rx.h xdr_refernce.o: xdr_refernce.c xdr.h librx.a: ${LIBOBJS} RX_component_version_number.o - -rm -f $@ - $(AR) rv $@ RX_component_version_number.o ${LIBOBJS} + -$(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} RX_component_version_number.o $(RANLIB) $@ librx-djgpp.a: ${LIBOBJS_djgpp} RX_component_version_number.o - -rm -f librx-djgpp.a - $(AR) rv librx-djgpp.a RX_component_version_number.o ${LIBOBJS_djgpp} + -$(RM) -f librx-djgpp.a + $(AR) crv librx-djgpp.a RX_component_version_number.o ${LIBOBJS_djgpp} $(RANLIB) librx-djgpp.a ${DESTDIR}/etc/rxdebug: rxdebug @@ -208,7 +208,7 @@ ${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${DESTDIR}/include/rx # Misc. targets # clean: - rm -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug + $(RM) -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug include ../config/Makefile.version diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 87b982530..2eb16b32e 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -74,4 +74,4 @@ testqueue: ../librx.a testqueue.o ${RXTESTOBJS}: ${BASICINCLS} ../rx.h clean: - rm -f *.o *.a ${TESTS} ${TH_TESTS} core + $(RM) -f *.o *.a ${TESTS} ${TH_TESTS} core diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index 884c8a0db..3ed2d7119 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -14,7 +14,6 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \ rpc_svcout.c rpc_clntout.c @@ -30,6 +29,9 @@ all: install rxgen: $(OBJS) AFS_component_version_number.c $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@ +# +# Install targets +# install: ukinstall \ ${DESTDIR}/bin/rxgen \ ${DESTDIR}/include/afs/rxgen_consts.h @@ -50,7 +52,10 @@ ${DESTDIR}/bin/rxgen: rxgen ${DESTDIR}/include/afs/rxgen_consts.h: rxgen_consts.h ${INSTALL} $? $@ +# +# Misc. targets +# clean: - rm -f *.o rxgen core AFS_component_version_number.c + $(RM) -f *.o rxgen core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 4ebf13e9a..aa937138b 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -144,9 +144,9 @@ ${DESTDIR}/include/rx/rxkad.h: rxkad.h # librxkad.a: ${OBJS} AFS_component_version_number.o - -rm -f librxkad.a - $(AR) rv librxkad.a ${OBJS} AFS_component_version_number.o - $(RANLIB) librxkad.a + -$(RM) -f $@ + $(AR) crv $@ ${OBJS} AFS_component_version_number.o + $(RANLIB) $@ crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS} @@ -159,7 +159,7 @@ rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS} rxkad_errs.o: rxkad_errs.c rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h - rm -f rxkad.h rxkad_errs.c + $(RM) -f rxkad.h rxkad_errs.c ${COMPILE_ET} rxkad_errs -h rxkad ticket.o: ticket.c lifetimes.h ${INCLS} @@ -177,7 +177,7 @@ tcrypt.o: tcrypt.c AFS_component_version_number.o # clean: - rm -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \ + $(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \ AFS_component_version_number.c \ crypt_conn.c fcrypt.c fcrypt.h sboxes.h diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 4141637c8..277dee2a3 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -29,7 +29,7 @@ LIBRPC = ../../librpc/libafsrpc.so THLIBS= ${LDIR}/afs/libcmd.a ${LDIR}/afs/libcom_err.a \ ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} +CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} THFLAGS = -mt -DAFS_PTHREAD_ENV @@ -41,7 +41,7 @@ COMPILE_ET = ${SRCDIR}/bin/compile_et noversion all test system: stress clean: - rm -f *.o stress.cs.c stress.ss.c stress.xdr.c stress.h \ + $(RM) -f *.o stress.cs.c stress.ss.c stress.xdr.c stress.h \ stress_errs.c stress_errs.h stress th_* stress.ss.o: stress.ss.c @@ -66,7 +66,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} 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 102f5f65f..3f4a5cf18 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -16,7 +16,6 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ RXGEN=${SRCDIR}/bin/rxgen -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c @@ -33,8 +32,8 @@ rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg ${RXGEN} -x rxstat.xg librxstat.a: ${LIBOBJS} AFS_component_version_number.o - -rm -f $@ - $(AR) rv $@ AFS_component_version_number.o ${LIBOBJS} + -$(RM) -f $@ + $(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ Krxstat.cs.c: rxstat.xg @@ -105,6 +104,6 @@ ${UKERNELDIR}/afsint/Krxstat.xdr.c: Krxstat.xdr.c # Misc. targets # clean: - rm -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core AFS_component_version_number.c + $(RM) -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index ed2f293e6..2fee39e79 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -22,9 +22,6 @@ CFLAGS= ${DBUG} -I. \ -I${SRCDIR} ${XCFLAGS} LDFLAGS = ${XLDFLAGS} -#RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h -RPCINCLS= - INCLS=${SRCDIR}/include/afs/gtxobjects.h \ ${SRCDIR}/include/afs/gtxwindows.h \ ${SRCDIR}/include/afs/gtxcurseswin.h \ @@ -34,7 +31,6 @@ INCLS=${SRCDIR}/include/afs/gtxobjects.h \ ${SRCDIR}/include/afs/gtxlightobj.h \ ${SRCDIR}/include/afs/gtxtextobj.h \ ${SRCDIR}/include/afs/gtxobjdict.h \ - ${RPCINCLS} \ ${SRCDIR}/include/afs/keys.h \ ${SRCDIR}/include/afs/cellconfig.h \ ${SRCDIR}/include/afs/cmd.h @@ -59,24 +55,29 @@ LIBS= ${SRCDIR}/lib/afs/libgtx.a \ ${SRCDIR}/lib/liblwp.a \ ${SRCDIR}/lib/afs/util.a -EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} - -include ../config/Makefile.version - -all: scout +all: install +# +# Build targets +# scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${EXTRA_LIBS} + ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} # -# Misc others +# Installation targets # -system: install +install: ${DESTDIR}/bin/scout -install: all - ${INSTALL} scout ${DESTDIR}/bin +${DESTDIR}/bin/scout: scout + ${INSTALL} $? $@ +# +# Misc targets +# clean: - rm -f *.o scout core AFS_component_version_number.c + $(RM) -f *.o scout core AFS_component_version_number.c + +include ../config/Makefile.version + diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index d779596b8..1e2995760 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -35,15 +35,15 @@ AUTHLIBS=afsauthlib.so afskauthlib.so TARGETS=$(AUTHLIBS) default:$(TARGETS) - ${INSTALL} afsauthlib.so ${DESTDIR}root.client/usr/vice/etc - ${INSTALL} afskauthlib.so ${DESTDIR}root.client/usr/vice/etc + ${INSTALL} afsauthlib.so ${DESTDIR}/root.client/usr/vice/etc + ${INSTALL} afskauthlib.so ${DESTDIR}/root.client/usr/vice/etc all:$(TARGETS) install install.noversion: all default clean: - rm -f $(AUTHLIBS) $(AUTHFILES) + $(RM) -f $(AUTHLIBS) $(AUTHFILES) afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES} $(LD) ${LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index 4b9cc45e9..a71c7d249 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -26,15 +26,15 @@ LIBS2 = ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/afs/libaudit.a \ ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a \ ${DESTDIR}/lib/afs/libsys.a -LIBS = ${DESTDIR}/lib/afs/libkauth.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.a ${LIBS2} +LIBS = ${DESTDIR}/lib/afs/libkauth.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.a ${LIBS2} KLIBS = ${DESTDIR}/lib/afs/libkauth.krb.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.krb.a ${LIBS2} all: test-reauth ${DESTDIR}/lib/afs/libafssiad.so ${DESTDIR}/lib/afs/libafssiad.krb.so clean: - rm -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c + $(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${SRCDIR}include ${XCFLAGS} +CFLAGS = $(DEBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} ${DESTDIR}/lib/afs/libafssiad.so: libafssiad.so ${INSTALL} $? $@ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 3c4a7bee2..95ecdc6ef 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -16,10 +16,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 - UKERNELDIR=../libuafs/ -CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} SFLAGS=-P -I${SRCDIR}/include LIBS= libsys.a ${SRCDIR}/lib/librx.a libsys.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a ${XLIBS} UKSRCS=afsl.exp @@ -45,12 +43,12 @@ ${DESTDIR}/include/afs/afssyscalls.h: afssyscalls.h ${INSTALL} afssyscalls.h ${DESTDIR}/include/afs/afssyscalls.h libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o - -rm -f libsys.a - ${AR} r libsys.a ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o - $(RANLIB) libsys.a + -$(RM) -f $@ + $(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o + $(RANLIB) $@ case "${SYS_NAME}" in \ rs_aix*) \ - ${AR} r libsys.a afsl.exp;; \ + $(AR) crv $@ afsl.exp;; \ esac system: install @@ -72,10 +70,12 @@ install: all kinstall ukinstall ${INSTALL} xfsattrs.h ${DESTDIR}/include/afs;; \ esac -ukinstall webinstall: ${UKSRCS} - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) +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 @@ -83,13 +83,13 @@ syscall.o: syscall.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 ${SFLAGS} syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ - rm 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;; \ + $(RM) -f syscall.ss syscall.i;; \ hp_ux11? ) \ touch syscall.o;; \ i386_fbsd* ) \ @@ -97,7 +97,7 @@ syscall.o: syscall.s *) \ /lib/cpp ${SFLAGS} syscall.s syscall.ss; \ as -o syscall.o syscall.ss; \ - rm syscall.ss;; \ + $(RM) syscall.ss;; \ esac @@ -186,6 +186,6 @@ xfsinode: xfsinode.c AFS_component_version_number.c clean: - rm -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \ + $(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 diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 109f8d19e..df20a875d 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -217,9 +217,9 @@ ubik_db_if.o: ${BUCOORD}/ubik_db_if.c # for is is vsprocs.c. The rest are from the VOLSER dir. libvolser.a: vsprocs.o ${VOLSERLIBOBJ} - -rm -f libvolser.a - ar rv libvolser.a ${VOLSERLIBOBJ} - $(RANLIB) libvolser.a + -$(RM) -f $@ + $(AR) crv $@ vsprocs.o ${VOLSERLIBOBJ} + $(RANLIB) $@ vsprocs.o: ${VOLSER}/vsprocs.c if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \ @@ -256,13 +256,13 @@ file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS} ${CC} ${CFLAGS} $$xbsaflags ${BUTMINCLUDE} $$hdrdir -c ${BUTM}/file_tm.c libbutm.a: ${BUTMOBJS} AFS_component_version_number.o - -rm -f libbutm.a - ${AR} rv libbutm.a $(BUTMOBJS) AFS_component_version_number.o + -$(RM) -f libbutm.a + $(AR) crv libbutm.a $(BUTMOBJS) AFS_component_version_number.o ${RANLIB} libbutm.a #----------------------------------------------- clean: - rm -f *.o *.a core AFS_component_version_number.c butc + $(RM) -f *.o *.a core AFS_component_version_number.c butc pre: if [ "${XBSA_NOBUILD}" = "" ]; then xbsaflags="${XBSA_FLAGS}" ; \ diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index 805355ea4..691836820 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -24,13 +24,13 @@ KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubi ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a AUTHLIBS=afs_dynamic_auth afs_dynamic_kerbauth IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp -LDFLAGS = -eafs_initialize ${IMPORTS} -lsys -lcsys -lc +LDFLAGS = -eafs_initialize ${IMPORTS} -lsys -lcsys -lc install install.noversion: $(AUTHLIBS) - ${INSTALL} afs_dynamic_auth ${DESTDIR}root.client/usr/vice/etc - ${INSTALL} afs_dynamic_kerbauth ${DESTDIR}root.client/usr/vice/etc + ${INSTALL} afs_dynamic_auth ${DESTDIR}/root.client/usr/vice/etc + ${INSTALL} afs_dynamic_kerbauth ${DESTDIR}/root.client/usr/vice/etc clean: - rm -f $(AUTHLIBS) $(AUTHFILES) so_locations + $(RM) -f $(AUTHLIBS) $(AUTHFILES) so_locations afs_dynamic_auth: aix41_auth.o ${AFSLIBS} ${AUTHFILES} $(LD) -o afs_dynamic_auth aix41_auth.o $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index 48aebd45a..cb0e4a15f 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -15,7 +15,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}include -I${SRCDIR}include/afs +INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}/include -I${SRCDIR}/include/afs CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG LDFLAGS=${DBG} ${XLDFLAGS} @@ -189,6 +189,6 @@ ${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver install: ${DESTDIR}/root.server/usr/afs/bin/fileserver clean: - rm -f *.o fileserver core AFS_component_version_number.c + $(RM) -f *.o fileserver core AFS_component_version_number.c include ../config/Makefile.version diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 09e9e4feb..27d525fe9 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -13,53 +13,27 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}/include ${XCFLAGS} UKERNELDIR=../libuafs/ + LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ ubikclient.o uerrors.o + INCLS= ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \ ${SRCDIR}/include/lock.h ubik.h ubik_int.h + LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \ ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libcmd.a \ ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/afs/libsys.a ${XLIBS} + RXGEN=${SRCDIR}/bin/rxgen COMPILE_ET = ${SRCDIR}/bin/compile_et -UKSRCS=ubik.h ubikclient.c uerrors.c - -include ../config/Makefile.version - all: libubik.a test -test: utst_server utst_client udebug - ${INSTALL} udebug ${DESTDIR}/bin - ${INSTALL} udebug ${DESTDIR}root.server/usr/afs/bin - -clean: - rm -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c - rm -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h - -system: install - -kinstall: - @echo No $@ source here. - -ukinstall webinstall: ${UKSRCS} Kubik_int.h Kubik_int.xdr.c Kubik_int.cs.c - set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED) - set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED) - ${INSTALL} Kubik_int.h ${UKERNELDIR}/afsint/ubik_int.h - ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}/afsint/ubik_int.cs.c - ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}/afsint/ubik_int.xdr.c - ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs - -install: libubik.a ukinstall - ${INSTALL} libubik.a ${DESTDIR}/lib - ${INSTALL} ubik.h ubik_int.h ${DESTDIR}/include - utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) @@ -85,7 +59,7 @@ 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} 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 @@ -96,11 +70,12 @@ udebug.o: udebug.c ${INCLS} AFS_component_version_number.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 + $(RM) -f ubik.h uerrors.c + ${COMPILE_ET} uerrors -h ubik libubik.a: ${LIBOBJS} AFS_component_version_number.o - -rm -f $@ - ar rv $@ ${LIBOBJS} AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ disk.o: disk.c ${INCLS} @@ -120,7 +95,69 @@ utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h +# +# Installation targets +# +test: utst_server utst_client \ + ${DESTDIR}/bin/udebug \ + ${DESTDIR}/root.server/usr/afs/bin/udebug + +install: test ukinstall \ + ${DESTDIR}/lib/libubik.a \ + ${DESTDIR}/include/ubik.h \ + ${DESTDIR}/include/ubik_int.h +${DESTDIR}/bin/udebug ${DESTDIR}/root.server/usr/afs/bin/udebug: udebug + ${INSTALL} $? $@ +${DESTDIR}/lib/libubik.a: libubik.a + ${INSTALL} $? $@ + +${DESTDIR}/include/ubik.h: ubik.h + ${INSTALL} $? $@ + +${DESTDIR}/include/ubik_int.h: ubik_int.h + ${INSTALL} $? $@ + +ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint \ + ${UKERNELDIR}/afsint/ubik_int.h \ + ${UKERNELDIR}/afsint/ubik_int.cs.c \ + ${UKERNELDIR}/afsint/ubik_int.xdr.c \ + ${UKERNELDIR}/afs/ubik.h \ + ${UKERNELDIR}/afs/ubikclient.c \ + ${UKERNELDIR}/afs/uerrors.c + +${UKERNELDIR}/afs: + mkdir -p $@ + +${UKERNELDIR}/afsint: + mkdir -p $@ + +${UKERNELDIR}/afsint/ubik_int.h: Kubik_int.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/ubik_int.cs.c: Kubik_int.cs.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afsint/ubik_int.xdr.c: Kubik_int.xdr.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/ubik.h: ubik.h + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/ubikclient.c: ubikclient.c + ${INSTALL} $? $@ + +${UKERNELDIR}/afs/uerrors.c: uerrors.c + ${INSTALL} $? $@ + +# +# Misc. targets +# +clean: + $(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c + $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h + +include ../config/Makefile.version diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 4ff7bef8f..5a70d8e58 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -14,19 +14,24 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -LIBRX=${SRCDIR}/lib/librx.a -LIBS = ${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a ${LIBRX} ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a -CFLAGS= ${DBUG} -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +LIBS = ${SRCDIR}/lib/afs/libauth.a \ + ${SRCDIR}/lib/librxkad.a \ + ${SRCDIR}/lib/libdes.a \ + ${SRCDIR}/lib/librx.a \ + ${SRCDIR}/lib/liblwp.a \ + ${SRCDIR}/lib/afs/libcom_err.a \ + ${SRCDIR}/lib/afs/util.a \ + ${SRCDIR}/lib/afs/libsys.a -PROGS=upclient upserver +CFLAGS= -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} -include ../config/Makefile.version +RXGEN=${SRCDIR}/bin/rxgen -all: ${PROGS} +all: install +# +# Build targets +# upclient: client.o update.cs.o utils.o ${LIBS} ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS} @@ -38,12 +43,26 @@ 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 - ${SRCDIR}/bin/rxgen update.xg + ${RXGEN} update.xg + +# +# Installation targets +# +install : ${DESTDIR}/root.server/usr/afs/bin/upserver \ + ${DESTDIR}/root.server/usr/afs/bin/upclient + +${DESTDIR}/root.server/usr/afs/bin/upserver: upserver + ${INSTALL} $? $@ + +${DESTDIR}/root.server/usr/afs/bin/upclient: upclient + ${INSTALL} $? $@ + +# +# Misc. targets +# clean: - rm -f upclient upserver *.o update.ss.c update.cs.c update.xdr.c update.h core\ + $(RM) -f *.o upclient upserver update.ss.c update.cs.c update.xdr.c update.h core \ AFS_component_version_number.c -system: install -install : all - ${INSTALL} upserver ${DESTDIR}root.server/usr/afs/bin - ${INSTALL} upclient ${DESTDIR}root.server/usr/afs/bin +include ../config/Makefile.version + diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in index 191700b70..83354af77 100644 --- a/src/usd/Makefile.in +++ b/src/usd/Makefile.in @@ -9,51 +9,41 @@ DESTDIR=@DESTDIR@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ - SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -RXGEN=${SRCDIR}/bin/rxgen -COMPILE_ET = ${SRCDIR}/bin/compile_et - -CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} - -##################################################################### -# include files -INCLS=${SRCDIR}/include/afs/param.h \ - usd.h - -LINCLS=usd.h +CFLAGS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -##################################################################### -include ../config/Makefile.version - -clean: - $(RM) -f *.o libusd.a \ - core AFS_component_version_number.c +all: install -######################################################################## -# build libusd.a -LIBOBJS=usd_file.o +# +# Build targets +# +libusd.a: usd_file.o AFS_component_version_number.o + $(RM) -f $@ + $(AR) crv $@ usd_file.o AFS_component_version_number.o + $(RANLIB) $@ -libusd.a: ${LIBOBJS} AFS_component_version_number.o - $(RM) -f libusd.a - $(AR) r libusd.a ${LIBOBJS} AFS_component_version_number.o - $(RANLIB) libusd.a - -usd_file.o: usd_file.c $(LINCLS) - -####################################################################### -system: install - -kinstall: - @echo No kernel source here. +usd_file.o: usd_file.c usd.h +# +# Installation targets +# +install: \ + ${DESTDIR}/lib/afs/libusd.a \ + ${DESTDIR}/include/afs/usd.h ${DESTDIR}/lib/afs/libusd.a: libusd.a - ${INSTALL} $? $@ + ${INSTALL} $? $@ +${DESTDIR}/include/afs/usd.h: usd.h + ${INSTALL} $? $@ -install: ${DESTDIR}/lib/afs/libusd.a - ${INSTALL} usd.h ${DESTDIR}/include/afs +# +# Misc. targets +# +clean: + $(RM) -f *.o libusd.a core AFS_component_version_number.c + +include ../config/Makefile.version diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in index 095d34742..84b00ee98 100644 --- a/src/usd/test/Makefile.in +++ b/src/usd/test/Makefile.in @@ -14,17 +14,17 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} #include ../../config/Makefile.version -INSTALL=${SRCDIR}bin/install -RXGEN=${SRCDIR}bin/rxgen -COMPILE_ET = ${SRCDIR}bin/compile_et +INSTALL=${SRCDIR}/bin/install +RXGEN=${SRCDIR}/bin/rxgen +COMPILE_ET = ${SRCDIR}/bin/compile_et -INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include -CFLAGS = $(DBUG) -I${SRCDIR}include ${INCDIRS} ${XCFLAGS} +INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include +CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} LIBUSD=DEST/lib/afs/libusd.a ##################################################################### # include files -INCLS=${SRCDIR}include/afs/param.h ${SRCDIR}include/afs/usd.h +INCLS=${SRCDIR}/include/afs/param.h ${SRCDIR}/include/afs/usd.h # build usd_test @@ -34,7 +34,7 @@ usd_test: usd_test.o ${LIBUSD} $(INCLS) usd_test.o: usd_test.c clean: - -rm -f *.o usd_test \ + -$(RM) -f *.o usd_test \ core AFS_component_version_number.c ####################################################################### diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 000433283..053b3f775 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -16,13 +16,13 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -# -# This makefile creates the following things: -# -PROGRAMS = uss +all: install + +CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \ + -I${SRCDIR}/include -I. ${XCFLAGS} # -# and here's what it uses to do so: +# Build targets # LIBS = ${SRCDIR}/lib/afs/libvolser.a \ ${SRCDIR}/lib/afs/libvldb.a \ @@ -41,8 +41,6 @@ LIBS = ${SRCDIR}/lib/afs/libvolser.a \ ${SRCDIR}/lib/afs/util.a \ ${XLIBS} -CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include -I. ${XCFLAGS} OBJS = uss_procs.o \ uss_common.o \ uss_vol.o \ @@ -53,30 +51,11 @@ OBJS = uss_procs.o \ lex.yy.o \ y.tab.o -include ../config/Makefile.version - -# -# Top-level options: -# -all : ${PROGRAMS} - -install: all - ${INSTALL} uss ${DESTDIR}/etc - -system: install - -clean: - rm -f *.o ${PROGRAMS} y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c - -###### uss program ###### - -uss: uss.o ${OBJS} +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 - -###### common stuff ###### + ${CC} -c ${CFLAGS} uss.c uss_procs.o : uss_procs.c ${CC} -c ${CFLAGS} uss_procs.c @@ -126,3 +105,21 @@ uss_fs.c: uss_fs.h y.tab.c : grammar.y ${YACC} -d grammar.y + +# +# Installation targets +# +install: ${DESTDIR}/etc/uss + +${DESTDIR}/etc/uss: uss + ${INSTALL} $? $@ + +# +# Misc. targets +# +clean: + $(RM) -f *.o uss y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c + +include ../config/Makefile.version + +# diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 66058b35e..1b9f6b241 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I$(SRCDIR)include ${XCFLAGS} +CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${SRCDIR}/include ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ @@ -25,8 +25,8 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ all: install util.a: ${objects} AFS_component_version_number.o - rm -f util.a - $(AR) r util.a ${objects} AFS_component_version_number.o + $(RM) -f util.a + $(AR) crv util.a ${objects} AFS_component_version_number.o $(RANLIB) util.a volparse.o: volparse.c @@ -53,7 +53,7 @@ get_krbrlm.o: get_krbrlm.c uuid.o: uuid.c ${CC} ${CFLAGS} -c uuid.c -sys.o: sys.c ${SRCDIR}include/afs/param.h AFS_component_version_number.c +sys.o: sys.c ${SRCDIR}/include/afs/param.h AFS_component_version_number.c ${CC} ${CFLAGS} -c sys.c sys: sys.o @@ -266,8 +266,8 @@ ${UKDIR}/afs_lhash.h: afs_lhash.h # clean: - rm -f ${objects} sys - rm -f util.a *.o core AFS_component_version_number.c + $(RM) -f ${objects} sys + $(RM) -f util.a *.o core AFS_component_version_number.c test: cd test; $(MAKE) diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in index 4a97d37ce..d67e2e0c8 100644 --- a/src/util/test/Makefile.in +++ b/src/util/test/Makefile.in @@ -12,7 +12,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} -CFLAGS = -I. -I.. -I${SRCDIR}include ${XCFLAGS} -g +CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} -g tests: test_ktime ktest dirpath_test diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 9a25dce67..93c24fcf9 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -210,7 +210,7 @@ kdump: kdump.o sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \ ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ sun4x_5? ) \ - ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ @@ -244,7 +244,7 @@ kdump64 : kdump64.o -set -x; \ case ${SYS_NAME} in \ sun4x_5[78] | hp_ux11* ) \ - ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}/lib/afs/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}/lib/afs/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ esac # @@ -263,7 +263,7 @@ install: ${DESTDIR}/bin/fs \ # clean: - rm -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags + $(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags test: cd test; $(MAKE) diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index fbe8352a1..a695e28f2 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -34,5 +34,5 @@ getinitparams: getinitparams.o $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) clean: - rm -f *.o fulltest owntest idtest getinitparams + $(RM) -f *.o fulltest owntest idtest getinitparams diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index 1216a0d4c..c786387f0 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -24,7 +24,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} +CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${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\ @@ -45,7 +45,7 @@ vfsck: main.o ${OBJS} ${OBJS}: ${SRCS} case ${SYS_NAME} in \ hp_ux11? ) \ - ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${SRCDIR}include ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \ + ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${SRCDIR}/include ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \ ;; \ hp?00_ux101 | hp_ux10? ) \ ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS} -D_FILE64\ @@ -61,10 +61,10 @@ main.o: main.c AFS_component_version_number.c # ${CC} ${CFLAGS} -c $*.c clean: - rm -f ${OBJS} vfsck core AFS_component_version_number.c + $(RM) -f ${OBJS} vfsck core AFS_component_version_number.c cleandir: clean - rm -f ${MAN} tags .depend + $(RM) -f ${MAN} tags .depend depend: ${SRCS} mkdep ${CFLAGS} ${SRCS} diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 9fefe2892..77d464830 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -38,17 +38,17 @@ LIBS= ${SRCDIR}/lib/afs/libacl.a \ ${SRCDIR}/lib/afs/util.a \ ${SRCDIR}/lib/liblwp.a -headers=${SRCDIR}include/lwp.h \ - ${SRCDIR}include/afs/acl.h \ - ${SRCDIR}include/afs/errors.h \ - ${SRCDIR}include/afs/ptclient.h \ - ${SRCDIR}include/lock.h \ - ${SRCDIR}include/afs/volume.h \ - ${SRCDIR}include/afs/vnode.h \ - ${SRCDIR}include/rx/rx.h \ - ${SRCDIR}include/rx/xdr.h \ - ${SRCDIR}include/afs/auth.h \ - ${SRCDIR}include/afs/afsint.h \ +headers=${SRCDIR}/include/lwp.h \ + ${SRCDIR}/include/afs/acl.h \ + ${SRCDIR}/include/afs/errors.h \ + ${SRCDIR}/include/afs/ptclient.h \ + ${SRCDIR}/include/lock.h \ + ${SRCDIR}/include/afs/volume.h \ + ${SRCDIR}/include/afs/vnode.h \ + ${SRCDIR}/include/rx/rx.h \ + ${SRCDIR}/include/rx/xdr.h \ + ${SRCDIR}/include/afs/auth.h \ + ${SRCDIR}/include/afs/afsint.h \ viced.h \ host.h \ fs_stats.h @@ -83,13 +83,13 @@ fsprobe.o: fsprobe.c AFS_component_version_number.c ${CC} ${CFLAGS} -DINTERPRET_DUMP -c fsprobe.c fsprobe: fsprobe.o - ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} + ${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 cbd: cbd.o - ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} + ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} ${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver @case ${SYS_NAME} in \ @@ -107,6 +107,6 @@ install: cbd fsprobe check_sysid ${DESTDIR}/root.server/usr/afs/bin/fileserver \ ${DESTDIR}/include/afs/fs_stats.h clean: - rm -f *.o fileserver core AFS_component_version_number.c cbd check_sysid fsprobe + $(RM) -f *.o fileserver core AFS_component_version_number.c cbd check_sysid fsprobe include ../config/Makefile.version diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index e25c6f2b6..31920f0bb 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -13,7 +13,6 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 KERNELDIR=../libafs/ UKERNELDIR=../libuafs/ @@ -96,9 +95,9 @@ Kvldbint.xdr.c: vldbint.xg ${RXGEN} -x -k -c -o $@ vldbint.xg libvldb.a: $(OBJS) AFS_component_version_number.o - -$(RM) -f libvldb.a - $(AR) r libvldb.a $(OBJS) AFS_component_version_number.o - $(RANLIB) libvldb.a + $(RM) -f $@ + $(AR) crv $@ $(OBJS) AFS_component_version_number.o + $(RANLIB) $@ vlclient: vlclient.o libvldb.a $(LIBS) $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}/lib/afs/libcmd.a @@ -114,17 +113,19 @@ system: install kinstall: $(KSRCS) ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint -ukinstall webinstall: $(UKSRCS) - set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED) +ukinstall webinstall: ${UKERNELDIR}/afsint $(UKSRCS) ${INSTALL} $(UKSRCS) ${TKERNELDIR}/afsint -${DESTDIR}root.server/usr/afs/bin/vlserver: vlserver - ${INSTALL} vlserver ${DESTDIR}root.server/usr/afs/bin +${UKERNELDIR}/afsint: + mkdir -p $@ + +${DESTDIR}/root.server/usr/afs/bin/vlserver: vlserver + ${INSTALL} vlserver ${DESTDIR}/root.server/usr/afs/bin ${DESTDIR}/etc/vldb_convert: cnvldb ${INSTALL} -f cnvldb ${DESTDIR}/etc/vldb_convert -install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check +install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}/root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check ${INSTALL} libvldb.a ${DESTDIR}/lib/afs ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}/include/afs ${INSTALL} cnvldb.h ${DESTDIR}/include/afs diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index dcf23b930..7f4b7b425 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -13,7 +13,6 @@ SYS_NAME=@AFS_SYSNAME@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -include ../config/Makefile.version INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}/include ${FSINCLUDES} LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} @@ -24,8 +23,6 @@ LIBS= ${DESTDIR}/lib/afs/libcmd.a vlib.a ${SRCDIR}/lib/afs/util.a \ CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG} -PROGS = salvager volinfo - PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\ fssync.h ihandle.h namei_ops.h @@ -33,24 +30,35 @@ VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \ clone.o nuke.o devname.o listinodes.o common.o ihandle.o \ namei_ops.o - OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o -all: ${DESTDIR}/lib/afs/vlib.a \ - ${DESTDIR}/lib/afs/libvlib.a \ - ${DESTDIR}root.server/usr/afs/bin/salvager \ - ${DESTDIR}root.server/usr/afs/bin/volinfo \ - gi +all: install -system: install - -kinstall ukinstall webinstall: - @echo No kernel source here. - -${DESTDIR}root.server/usr/afs/bin/salvager: salvager +# +# Installation targets +# +install: gi \ + ${DESTDIR}/lib/afs/vlib.a \ + ${DESTDIR}/lib/afs/libvlib.a \ + ${DESTDIR}/root.server/usr/afs/bin/salvager \ + ${DESTDIR}/root.server/usr/afs/bin/volinfo \ + $(FS_CONV_OSF40D) \ + $(XFS_SIZE_CHECK) \ + $(FS_CONV_SOL26) \ + ${DESTDIR}/include/afs/nfs.h \ + ${DESTDIR}/include/afs/vnode.h \ + ${DESTDIR}/include/afs/viceinode.h \ + ${DESTDIR}/include/afs/volume.h \ + ${DESTDIR}/include/afs/voldefs.h \ + ${DESTDIR}/include/afs/partition.h \ + ${DESTDIR}/include/afs/fssync.h \ + ${DESTDIR}/include/afs/ihandle.h \ + ${DESTDIR}/include/afs/namei_ops.h + +${DESTDIR}/root.server/usr/afs/bin/salvager: salvager ${INSTALL} -s $? $@ -${DESTDIR}root.server/usr/afs/bin/volinfo: volinfo +${DESTDIR}/root.server/usr/afs/bin/volinfo: volinfo ${INSTALL} -s $? $@ ${DESTDIR}/lib/afs/vlib.a: vlib.a @@ -60,18 +68,44 @@ ${DESTDIR}/lib/afs/libvlib.a: vlib.a ${INSTALL} $? $@ $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D: fs_conv_dux40D - ${INSTALL} -s $? $@ + ${INSTALL} -s $? $@ $(DESTDIR)root.server/usr/afs/bin/xfs_size_check: xfs_size_check - ${INSTALL} -s $? $@ + ${INSTALL} -s $? $@ $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26: fs_conv_sol26 - ${INSTALL} -s $? $@ + ${INSTALL} -s $? $@ + +${DESTDIR}/include/afs/nfs.h: nfs.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/vnode.h: vnode.h + ${INSTALL} $? $@ -install: all $(FS_CONV_OSF40D) $(XFS_SIZE_CHECK) $(FS_CONV_SOL26) - ${INSTALL} ${PUBLICHEADERS} ${DESTDIR}/include/afs +${DESTDIR}/include/afs/viceinode.h: viceinode.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/volume.h: volume.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/voldefs.h: voldefs.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/partition.h: partition.h + ${INSTALL} $? $@ +${DESTDIR}/include/afs/fssync.h: fssync.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/ihandle.h: ihandle.h + ${INSTALL} $? $@ +${DESTDIR}/include/afs/namei_ops.h: namei_ops.h + ${INSTALL} $? $@ + +# +# Build targets +# ${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ ${SRCDIR}/include/afs/afsint.h vutils.h salvage.h\ AFS_component_version_number.c @@ -79,9 +113,9 @@ ${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ vol-salvage.o vutil.o: volinodes.h vlib.a: ${VLIBOBJS} AFS_component_version_number.o - rm -f vlib.a - $(AR) r vlib.a ${VLIBOBJS} AFS_component_version_number.o - $(RANLIB) vlib.a + $(RM) -f $@ + $(AR) crv $@ ${VLIBOBJS} AFS_component_version_number.o + $(RANLIB) $@ # new salvager: remove references to /vice by linking with novice.o salvager: vol-salvage.o physio.o vlib.a @@ -112,7 +146,7 @@ volinfo: vol-info.o physio.o ihandle.o case ${SYS_NAME} in \ *linux* | *fbsd*) \ ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \ - ihandle.o ${LIBS} ;; \ + ihandle.o ${LIBS} ;; \ *) \ ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \ ihandle.o ${LIBS} ;; \ @@ -131,9 +165,14 @@ fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c xfs_size_check: xfs_size_check.c ${CC} ${CFLAGS} -o xfs_size_check xfs_size_check.c +# +# Misc. targets +# clean: - rm -f *.o *.a AFS_component_version_number.c - rm -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D + $(RM) -f *.o *.a AFS_component_version_number.c + $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D test: cd test; $(MAKE) + +include ../config/Makefile.version diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index f66e3bb42..be4d1cccb 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -82,5 +82,5 @@ nino: nino.o ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}/lib/afs/util.a clean: - rm -f *.o *.a - rm -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode + $(RM) -f *.o *.a + $(RM) -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 4a12eb7e4..7b674eb89 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -15,6 +15,8 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} COMPILE_ET=${SRCDIR}/bin/compile_et +RXGEN=${SRCDIR}/bin/rxgen + CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} @@ -28,17 +30,8 @@ RINCLS=${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \ ${SRCDIR}/include/afs/keys.h ${SRCDIR}/include/afs/cellconfig.h \ ${SRCDIR}/include/ubik.h ${SRCDIR}/include/afs/cmd.h -TARGETS= ${DESTDIR}/include/afs/volser.h \ - ${DESTDIR}/include/afs/volint.h \ - ${DESTDIR}/etc/vos \ - ${DESTDIR}root.server/usr/afs/bin/vos \ - ${DESTDIR}root.server/usr/afs/bin/volserver \ - ${DESTDIR}/lib/afs/libvolser.a - INTINCLS=volint.h volser.h -HACKS=${SRCDIR}/lib/afs/libdir.a - LIBS= \ ${SRCDIR}/lib/afs/libaudit.a \ ${SRCDIR}/lib/afs/vlib.a \ @@ -62,33 +55,39 @@ 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 -COBJS=volint.cs.o volint.xdr.o -all: volserver libvolser.a vos restorevol +all: install restorevol: restorevol.c ${CC} ${CFLAGS} -o restorevol restorevol.c \ ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a - ${INSTALL} restorevol ${SRCDIR}/etc vos: vos.o ${VSOBJS} libvolser.a ${LIBS} - ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} \ - ${XLIBS} + ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} + +volserver: $(SOBJS) $(LIBS) ${SRCDIR}/lib/afs/libdir.a + ${CC} ${DBUG} -o volserver $(SOBJS) ${SRCDIR}/lib/afs/libdir.a \ + ${LDFLAGS} $(LIBS) ${XLIBS} libvolser.a: volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o - -rm -f libvolser.a - ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o \ - AFS_component_version_number.o + -$(RM) -f libvolser.a + ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o $(RANLIB) libvolser.a volser.h volerr.c: volerr.et volser.p.h - rm -f volser.h volerr.c; ${COMPILE_ET} volerr -h volser + $(RM) -f volser.h volerr.c + ${COMPILE_ET} volerr -h volser volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg - ${SRCDIR}/bin/rxgen -x volint.xg + ${RXGEN} -x volint.xg +# +# Dependencies +# +volint.cs.o: volint.cs.c ${INTINCLS} +volint.ss.o: volint.ss.c ${INTINCLS} +volint.xdr.o: volint.xdr.c ${INTINCLS} vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS} - volmain.o: volmain.c ${VINCLS} ${RINCLS} AFS_component_version_number.c volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS} dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS} @@ -99,36 +98,43 @@ physio.o: physio.c ${VINCLS} common.o: common.c ${VINCLS} lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS} -volint.cs.o: volint.cs.c ${INTINCLS} -volint.ss.o: volint.ss.c ${INTINCLS} -volint.xdr.o: volint.xdr.c ${INTINCLS} - -volserver: $(SOBJS) $(LIBS) $(HACKS) - ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \ - ${LDFLAGS} $(LIBS) ${XLIBS} +# +# Installation targets +# +install: volserver vos restorevol \ + ${DESTDIR}/etc/restorevol \ + ${DESTDIR}/include/afs/volser.h \ + ${DESTDIR}/include/afs/volint.h \ + ${DESTDIR}/etc/vos \ + ${DESTDIR}/root.server/usr/afs/bin/vos \ + ${DESTDIR}/root.server/usr/afs/bin/volserver \ + ${DESTDIR}/lib/afs/libvolser.a -system: install -${DESTDIR}/include/afs/volser.h :: volser.h +${DESTDIR}/include/afs/volser.h: volser.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/volint.h :: volint.h +${DESTDIR}/include/afs/volint.h: volint.h ${INSTALL} $? $@ -${DESTDIR}/etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos +${DESTDIR}/etc/restorevol: restorevol ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libvolser.a :: libvolser.a +${DESTDIR}/etc/vos ${DESTDIR}/root.server/usr/afs/bin/vos: vos ${INSTALL} $? $@ -${DESTDIR}root.server/usr/afs/bin/volserver :: volserver +${DESTDIR}/lib/afs/libvolser.a: libvolser.a ${INSTALL} $? $@ -install: all $(TARGETS) +${DESTDIR}/root.server/usr/afs/bin/volserver: volserver + ${INSTALL} $? $@ +# +# Misc targets +# clean: - rm -f volserver *.o volint.ss.c volint.cs.c *.a volint.h \ - volint.xdr.c vos core volser.h volerr.c AFS_component_version_number.c restorevol + $(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \ + volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol include ../config/Makefile.version diff --git a/src/wsadmin.src/Makefile.in b/src/wsadmin.src/Makefile.in index 156c9a40b..91426ee2d 100644 --- a/src/wsadmin.src/Makefile.in +++ b/src/wsadmin.src/Makefile.in @@ -109,4 +109,4 @@ install: ${CONFIG} cp ${CONFIG} ${wsadmin}/etc clean: - rm -f ${CONFIG} *.BAK *.CKP + $(RM) -f ${CONFIG} *.BAK *.CKP diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index 3b33cabdb..a9ceefe1a 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -7,6 +7,7 @@ # Makefile for the module providing the client side of the File Server # and Cache Manager extended statistics gathering. + DESTDIR=@DESTDIR@ SRCDIR=@SRCDIR@ TOP_SRCDIR=@TOP_SRCDIR@ @@ -24,35 +25,25 @@ CFLAGS= ${DBUG} -I. \ -I/usr/include ${XCFLAGS} RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h -FSINCLS=xstat_fs.h ${RPCINCLS} -CMINCLS=xstat_cm.h ${RPCINCLS} -AFSLIBS=${SRCDIR}/lib/afs/libafsint.a \ +LIBS= ${SRCDIR}/lib/afs/libafsint.a \ ${SRCDIR}/lib/afs/libcmd.a \ ${SRCDIR}/lib/librx.a \ ${SRCDIR}/lib/liblwp.a \ ${SRCDIR}/lib/afs/libsys.a \ ${SRCDIR}/lib/afs/util.a -LIBS = ${AFSLIBS} - -FSOBJS=xstat_fs.o \ - xstat_fs_callback.o - -CMOBJS=xstat_cm.o - -include ../config/Makefile.version - -all: libxstat_fs.a xstat_fs_test \ - libxstat_cm.a xstat_cm_test +all: install # -# ------------------------------------------ File Server data collection +# File Server data collection # -libxstat_fs.a: ${FSOBJS} AFS_component_version_number.o - -rm -f libxstat_fs.a - ${AR} rv libxstat_fs.a ${FSOBJS} AFS_component_version_number.o - $(RANLIB) libxstat_fs.a +FSINCLS=xstat_fs.h ${RPCINCLS} + +libxstat_fs.a: xstat_fs.o xstat_fs_callback.o AFS_component_version_number.o + -$(RM) -f $@ + $(AR) crv $@ xstat_fs.o xstat_fs_callback.o AFS_component_version_number.o + $(RANLIB) $@ xstat_fs.o: xstat_fs.c ${FSINCLS} @@ -64,11 +55,13 @@ xstat_fs_test: xstat_fs_test.o libxstat_fs.a ${LIBS} ${CC} ${CFLAGS} -o xstat_fs_test xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS} # -# ---------------------------------------- Cache Manager data collection +# Cache Manager data collection # -libxstat_cm.a: ${CMOBJS} AFS_component_version_number.o - -rm -f libxstat_cm.a - ${AR} rv libxstat_cm.a ${CMOBJS} AFS_component_version_number.o +CMINCLS=xstat_cm.h ${RPCINCLS} + +libxstat_cm.a: xstat_cm.o AFS_component_version_number.o + -$(RM) -f libxstat_cm.a + $(AR) crv libxstat_cm.a xstat_cm.o AFS_component_version_number.o $(RANLIB) libxstat_cm.a xstat_cm.o: xstat_cm.c ${CMINCLS} @@ -79,24 +72,39 @@ xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS} ${CC} ${CFLAGS} -o xstat_cm_test xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS} # -# Misc others - +# Installation targets # -system: install +install: \ + ${DESTDIR}/include/afs/xstat_fs.h \ + ${DESTDIR}/include/afs/xstat_cm.h \ + ${DESTDIR}/lib/afs/libxstat_fs.a \ + ${DESTDIR}/lib/afs/libxstat_cm.a \ + ${DESTDIR}/bin/xstat_fs_test \ + ${DESTDIR}/bin/xstat_cm_test + +${DESTDIR}/include/afs/xstat_fs.h: xstat_fs.h + ${INSTALL} $? $@ + +${DESTDIR}/include/afs/xstat_cm.h: xstat_cm.h + ${INSTALL} $? $@ + +${DESTDIR}/lib/afs/libxstat_fs.a: libxstat_fs.a + ${INSTALL} $? $@ + +${DESTDIR}/lib/afs/libxstat_cm.a: libxstat_cm.a + ${INSTALL} $? $@ + +${DESTDIR}/bin/xstat_fs_test: xstat_fs_test + ${INSTALL} $? $@ -install: all - ${INSTALL} xstat_fs.h ${DESTDIR}/include/afs - ${INSTALL} xstat_cm.h ${DESTDIR}/include/afs - ${INSTALL} libxstat_fs.a ${DESTDIR}/lib/afs - ${INSTALL} libxstat_cm.a ${DESTDIR}/lib/afs - ${INSTALL} xstat_fs_test ${DESTDIR}/bin - ${INSTALL} xstat_cm_test ${DESTDIR}/bin +${DESTDIR}/bin/xstat_cm_test: xstat_cm_test + ${INSTALL} $? $@ +# +# Misc targets +# clean: - rm -f *.o \ - xstat_fs_test \ - xstat_cm_test \ - libxstat_fs.a \ - libxstat_cm.a \ - core\ - AFS_component_version_number.c + $(RM) -f *.o *.a xstat_fs_test xstat_cm_test core AFS_component_version_number.c + +include ../config/Makefile.version + -- 2.39.5