From d46713d4bd0d0ce32640d973696c914e804413f6 Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Mon, 6 Jul 2009 20:41:25 -0400 Subject: [PATCH] Parallel make fixes Fixes several problems with parallel makes in the current source: - Add '+' prefix to many top-level Makefile commands. This informs make that the following command should be treated as a sub-make and propagates the -jN flag. - Add a few missing dependencies - Tweak some Makefiles that work with generated header files to prevent cases where we attempt to use the file while it's being generated - For the Linux kernel build, eliminate duplicated effort between COMPDIRS and INSTDIRS, which also prevents conflict between the two in a parallel situation. FIXES 125031 Reviewed-on: http://gerrit.openafs.org/3 Verified-by: Derrick Brashear Reviewed-by: Derrick Brashear --- Makefile.in | 210 +++++++++++++++--------------- src/bozo/Makefile.in | 4 +- src/bubasics/Makefile.in | 6 +- src/budb/Makefile.in | 6 +- src/libafs/Makefile.common.in | 2 +- src/libafs/MakefileProto.LINUX.in | 4 +- src/sys/Makefile.in | 4 +- src/update/Makefile.in | 2 +- src/vol/Makefile.in | 2 + src/xstat/Makefile.in | 4 +- 10 files changed, 126 insertions(+), 118 deletions(-) diff --git a/Makefile.in b/Makefile.in index d9f05ece12..632c9616d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -114,25 +114,25 @@ prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR} project: cmd comerr tests: all - ${COMPILE_PART1} tests ${COMPILE_PART2} + +${COMPILE_PART1} tests ${COMPILE_PART2} config: prelude - ${COMPILE_PART1} config ${COMPILE_PART2} + +${COMPILE_PART1} config ${COMPILE_PART2} procmgmt: config - ${COMPILE_PART1} procmgmt ${COMPILE_PART2} + +${COMPILE_PART1} procmgmt ${COMPILE_PART2} util: procmgmt des lwp_depinstall - ${COMPILE_PART1} util ${COMPILE_PART2} + +${COMPILE_PART1} util ${COMPILE_PART2} audit: util rx rxkad - ${COMPILE_PART1} audit ${COMPILE_PART2} #TODO + +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO comerr: util - ${COMPILE_PART1} comerr ${COMPILE_PART2} + +${COMPILE_PART1} comerr ${COMPILE_PART2} cmd: comerr - @case ${SYS_NAME} in \ + +@case ${SYS_NAME} in \ sgi_6* | sun*_5[789] | sun*_51[01] | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \ ${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \ *) \ @@ -140,23 +140,23 @@ cmd: comerr esac lwp: util lwp_depinstall - ${COMPILE_PART1} lwp ${COMPILE_PART2} + +${COMPILE_PART1} lwp ${COMPILE_PART2} rxgen: config - ${COMPILE_PART1} rxgen ${COMPILE_PART2} + +${COMPILE_PART1} rxgen ${COMPILE_PART2} rx: config lwp rxgen rx_depinstall - ${COMPILE_PART1} rx ${COMPILE_PART2} + +${COMPILE_PART1} rx ${COMPILE_PART2} rxstat: rx rxstat_depinstall - ${COMPILE_PART1} rxstat ${COMPILE_PART2} + +${COMPILE_PART1} rxstat ${COMPILE_PART2} rxtests: rxdebug rxdebug: rx sys - ${COMPILE_PART1} rxdebug ${COMPILE_PART2} + +${COMPILE_PART1} rxdebug ${COMPILE_PART2} fsint: cmd comerr rxgen rx lwp fsint_depinstall - ${COMPILE_PART1} fsint ${COMPILE_PART2} + +${COMPILE_PART1} fsint ${COMPILE_PART2} export2: project @@ -167,25 +167,25 @@ export: esac export_build: fsint - ${COMPILE_PART1} export ${COMPILE_PART2} + +${COMPILE_PART1} export ${COMPILE_PART2} afs: config export comerr afs_depinstall - ${COMPILE_PART1} afs ${COMPILE_PART2} + +${COMPILE_PART1} afs ${COMPILE_PART2} des: config - ${COMPILE_PART1} des ${COMPILE_PART2} + +${COMPILE_PART1} des ${COMPILE_PART2} sys: cmd comerr afs des rx rxstat fsint auth sys_depinstall - ${COMPILE_PART1} sys ${COMPILE_PART2} + +${COMPILE_PART1} sys ${COMPILE_PART2} -rxkad: cmd comerr sys des rx rxkad_depinstall - ${COMPILE_PART1} rxkad ${COMPILE_PART2} +rxkad: cmd comerr des rx rxkad_depinstall + +${COMPILE_PART1} rxkad ${COMPILE_PART2} auth: cmd comerr comerr des lwp rx rxkad audit sys_depinstall auth_depinstall - ${COMPILE_PART1} auth ${COMPILE_PART2} + +${COMPILE_PART1} auth ${COMPILE_PART2} -ubik: cmd comerr auth ubik_depinstall - ${COMPILE_PART1} ubik ${COMPILE_PART2} +ubik: cmd comerr auth ubik_depinstall sys + +${COMPILE_PART1} ubik ${COMPILE_PART2} tubik: ubik libafsrpc [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ @@ -202,10 +202,10 @@ tubik: ubik libafsrpc ubiktests: ubik ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall - ${COMPILE_PART1} ptserver ${COMPILE_PART2} + +${COMPILE_PART1} ptserver ${COMPILE_PART2} tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent - [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ + +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -217,18 +217,18 @@ tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent esac kauth: cmd comerr ubik cmd auth comerr ptserver audit libacl kauth_depinstall sys_depinstall - ${COMPILE_PART1} kauth ${COMPILE_PART2} + +${COMPILE_PART1} kauth ${COMPILE_PART2} libacl: cmd comerr ptserver libacl_depinstall - ${COMPILE_PART1} libacl ${COMPILE_PART2} + +${COMPILE_PART1} libacl ${COMPILE_PART2} dir: cmd comerr libacl dir_depinstall - ${COMPILE_PART1} dir ${COMPILE_PART2} + +${COMPILE_PART1} dir ${COMPILE_PART2} # Removed from sgi_* case below: # ${COMPILE_PART1} sgiefs ${COMPILE_PART2};; sgiefs: - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ sgi_*) \ echo "SGI efs not supported" ;; \ *) \ @@ -236,10 +236,10 @@ sgiefs: esac vol: cmd comerr dir afs sgiefs - ${COMPILE_PART1} vol ${COMPILE_PART2} + +${COMPILE_PART1} vol ${COMPILE_PART2} tsalvaged: vol libafsrpc libafsauthent cmd util - set -x; \ + +set -x; \ if test "@DEMAND_ATTACH@" = "yes" ; then \ case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \ @@ -257,10 +257,10 @@ tsalvaged: vol libafsrpc libafsauthent cmd util vlserver: cmd comerr vol audit vlserver_depinstall - ${COMPILE_PART1} vlserver ${COMPILE_PART2} + +${COMPILE_PART1} vlserver ${COMPILE_PART2} tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinstall - [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ + +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -273,10 +273,10 @@ tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinsta viced: cmd comerr vlserver tvlserver audit - ${COMPILE_PART1} viced ${COMPILE_PART2} + +${COMPILE_PART1} viced ${COMPILE_PART2} tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -288,10 +288,10 @@ tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent esac volser: cmd comerr tviced usd kauth audit - ${COMPILE_PART1} volser ${COMPILE_PART2} + +${COMPILE_PART1} volser ${COMPILE_PART2} tvolser: project tviced usd libafsrpc libafsauthent volser - @case ${SYS_NAME} in \ + +@case ${SYS_NAME} in \ *_darwin_[1-6][0-9]) \ echo Not building MT volser for ${SYS_NAME} ;; \ *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*) \ @@ -304,29 +304,29 @@ tvolser: project tviced usd libafsrpc libafsauthent volser esac venus: cmd comerr volser ptserver - ${COMPILE_PART1} venus ${COMPILE_PART2} - ${COMPILE_PART1} venus/test ${COMPILE_PART2} + +${COMPILE_PART1} venus ${COMPILE_PART2} + +${COMPILE_PART1} venus/test ${COMPILE_PART2} afsd: cmd comerr sys kauth - ${COMPILE_PART1} afsd ${COMPILE_PART2} + +${COMPILE_PART1} afsd ${COMPILE_PART2} gtx: cmd comerr auth kauth - ${COMPILE_PART1} gtx ${COMPILE_PART2} + +${COMPILE_PART1} gtx ${COMPILE_PART2} fsprobe: cmd comerr util fsint volser - ${COMPILE_PART1} fsprobe ${COMPILE_PART2} + +${COMPILE_PART1} fsprobe ${COMPILE_PART2} scout: cmd comerr gtx fsprobe - ${COMPILE_PART1} scout ${COMPILE_PART2} + +${COMPILE_PART1} scout ${COMPILE_PART2} uss: des kauth cmd comerr rx vlserver vol volser - ${COMPILE_PART1} uss ${COMPILE_PART2} + +${COMPILE_PART1} uss ${COMPILE_PART2} bozo: cmd comerr audit auth kauth volser - ${COMPILE_PART1} bozo ${COMPILE_PART2} + +${COMPILE_PART1} bozo ${COMPILE_PART2} vfsck: vol - set -x; \ + +set -x; \ case ${SYS_NAME} in \ sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* ) \ echo skip vfsck for ${SYS_NAME} ;; \ @@ -335,7 +335,7 @@ vfsck: vol esac pam: cmd comerr kauth rxkad - set -x; \ + +set -x; \ if test "@HAVE_PAM@" = "yes"; then \ ${COMPILE_PART1} pam ${COMPILE_PART2} ; \ else \ @@ -343,7 +343,7 @@ pam: cmd comerr kauth rxkad fi tsm41: cmd comerr kauth rxkad - set -x; \ + +set -x; \ case ${SYS_NAME} in \ rs_aix* ) \ ${COMPILE_PART1} tsm41 ${COMPILE_PART2} ;; \ @@ -352,7 +352,7 @@ tsm41: cmd comerr kauth rxkad esac sgistuff: cmd comerr kauth rxkad - set -x; \ + +set -x; \ case ${SYS_NAME} in \ sgi_* ) \ ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \ @@ -361,7 +361,7 @@ sgistuff: cmd comerr kauth rxkad esac aklog: comerr ptserver - set -x; \ + +set -x; \ if test "@BUILD_KRB5@" = "yes"; then \ ${COMPILE_PART1} aklog ${COMPILE_PART2} ; \ else \ @@ -370,11 +370,11 @@ aklog: comerr ptserver authtools: pam tsm41 sgistuff aklog -platform: - ${COMPILE_PART1} platform ${COMPILE_PART2} +platform: config + +${COMPILE_PART1} platform ${COMPILE_PART2} -man-pages: - if test -d "doc/man-pages" ; then \ +man-pages: config + +if test -d "doc/man-pages" ; then \ cd doc/man-pages ${COMPILE_PART2} ; \ fi @@ -384,49 +384,49 @@ man-pages: # encode dependencies within the _depinstall targets as required # lwp_depinstall: config - ${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL} rx_depinstall: config - ${COMPILE_PART1} rx ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} rx ${COMPILE_DEPINSTALL} rxkad_depinstall: config comerr - ${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL} ubik_depinstall: config comerr rxgen - ${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL} vlserver_depinstall: config rxgen ubik_depinstall auth_depinstall - ${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL} tvlserver_depinstall: config rxgen ubik_depinstall auth_depinstall - ${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL} auth_depinstall: config comerr - ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} auth ${COMPILE_DEPINSTALL} fsint_depinstall: config rxgen - ${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL} rxstat_depinstall: config rxgen - ${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL} libacl_depinstall: config - ${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL} afs_depinstall: config comerr - ${COMPILE_PART1} afs ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} afs ${COMPILE_DEPINSTALL} dir_depinstall: config - ${COMPILE_PART1} dir ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} dir ${COMPILE_DEPINSTALL} sys_depinstall: config rxgen - ${COMPILE_PART1} sys ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} sys ${COMPILE_DEPINSTALL} kauth_depinstall: config rxgen comerr - ${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL} ptserver_depinstall: config rxgen comerr - ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL} + +${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL} ${DEST}/bin/dedebug: dedebug ${INSTALL} $? $@ @@ -440,7 +440,7 @@ libafs_setup: config export libafs: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \ libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall - ${COMPILE_PART1} libafs ${COMPILE_PART2} + +${COMPILE_PART1} libafs ${COMPILE_PART2} libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \ libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall @@ -466,7 +466,7 @@ libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fs auth_depinstall dir_depinstall libacl_depinstall rxkad_depinstall \ ubik_depinstall afs_depinstall kauth_depinstall ptserver_depinstall \ rxstat_depinstall lwp_depinstall sys_depinstall des - set -x; \ + +set -x; \ case ${SYS_NAME} in \ hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \ echo Skipping libuafs for ${SYS_NAME} ;; \ @@ -475,31 +475,31 @@ libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fs esac afsweb: kauth - ${COMPILE_PART1} afsweb ${COMPILE_PART2} + +${COMPILE_PART1} afsweb ${COMPILE_PART2} -update: cmd comerr auth - ${COMPILE_PART1} update ${COMPILE_PART2} +update: cmd comerr auth sys + +${COMPILE_PART1} update ${COMPILE_PART2} -log: cmd comerr auth - ${COMPILE_PART1} log ${COMPILE_PART2} +log: cmd comerr auth sys + +${COMPILE_PART1} log ${COMPILE_PART2} bu_utils: cmd comerr usd - ${COMPILE_PART1} bu_utils ${COMPILE_PART2} + +${COMPILE_PART1} bu_utils ${COMPILE_PART2} usd: cmd comerr - ${COMPILE_PART1} usd ${COMPILE_PART2} + +${COMPILE_PART1} usd ${COMPILE_PART2} bubasics: cmd comerr comerr rx - ${COMPILE_PART1} bubasics ${COMPILE_PART2} + +${COMPILE_PART1} bubasics ${COMPILE_PART2} butm: cmd comerr bubasics usd uss - ${COMPILE_PART1} butm ${COMPILE_PART2} + +${COMPILE_PART1} butm ${COMPILE_PART2} butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx - ${COMPILE_PART1} butc ${COMPILE_PART2} + +${COMPILE_PART1} butc ${COMPILE_PART2} tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \ *) \ @@ -507,10 +507,10 @@ tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin esac budb: cmd comerr bubasics uss - ${COMPILE_PART1} budb ${COMPILE_PART2} + +${COMPILE_PART1} budb ${COMPILE_PART2} tbudb: budb - [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ + +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} tbudb ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -522,19 +522,19 @@ tbudb: budb esac bucoord: cmd comerr bubasics budb volser - ${COMPILE_PART1} bucoord ${COMPILE_PART2} + +${COMPILE_PART1} bucoord ${COMPILE_PART2} xstat: cmd comerr fsint viced - ${COMPILE_PART1} xstat ${COMPILE_PART2} + +${COMPILE_PART1} xstat ${COMPILE_PART2} afsmonitor: cmd comerr gtx xstat - ${COMPILE_PART1} afsmonitor ${COMPILE_PART2} + +${COMPILE_PART1} afsmonitor ${COMPILE_PART2} tests: rxtests ubiktests # pthread based user space RX library libafsrpc: rx rxkad des - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -546,7 +546,7 @@ libafsrpc: rx rxkad des esac libafsauthent: ubik auth kauth libafsrpc - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ @@ -559,7 +559,7 @@ libafsauthent: ubik auth kauth libafsrpc # pthread based user space RX library shlibafsrpc: rx rxkad des - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \ *) \ @@ -567,7 +567,7 @@ shlibafsrpc: rx rxkad des esac shlibafsauthent: ubik auth kauth shlibafsrpc - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \ *) \ @@ -575,22 +575,22 @@ shlibafsauthent: ubik auth kauth shlibafsrpc esac kopenafs: config sys - ${COMPILE_PART1} kopenafs ${COMPILE_PART2} + +${COMPILE_PART1} kopenafs ${COMPILE_PART2} libadmin_real: - ${COMPILE_PART1} libadmin ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/vos ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/client ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/kas ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/pts ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/bos ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/cfg ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/test ${COMPILE_PART2} - ${COMPILE_PART1} libadmin/samples ${COMPILE_PART2} + +${COMPILE_PART1} libadmin ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/vos ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/client ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/kas ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/pts ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/bos ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/cfg ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/test ${COMPILE_PART2} + +${COMPILE_PART1} libadmin/samples ${COMPILE_PART2} libadmin: libafsauthent bozo - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ $(MAKE) libadmin_real ;; \ *_darwin_[1-6][0-9]) \ @@ -602,7 +602,7 @@ libadmin: libafsauthent bozo esac libjafs: libadmin - case ${SYS_NAME} in \ + +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} JAVA/libjafs ${COMPILE_PART2} ;; \ *) \ @@ -620,14 +620,14 @@ finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs venus update xstat afsmonitor rxdebug libafsrpc \ libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ platform kopenafs authtools - ${COMPILE_PART1} finale ${COMPILE_PART2} + +${COMPILE_PART1} finale ${COMPILE_PART2} finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \ ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \ venus update xstat afsmonitor rxdebug libafsrpc \ libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ platform kopenafs authtools - ${COMPILE_PART1} finale ${COMPILE_PART2} + +${COMPILE_PART1} finale ${COMPILE_PART2} # Use washtool to ensure MakefileProto is current and obj/libafs exists. diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 0628be638d..306fa478d5 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -43,7 +43,7 @@ LIBS=${TOP_LIBDIR}/librx.a \ OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \ bosoprocs.o cronbnodeops.o -all: bosserver ${TOP_INCDIR}/afs/bosint.h bos ${TOP_LIBDIR}/libbos.a ${TOP_INCDIR}/afs/bnode.h bos_util +all: bosserver ${TOP_INCDIR}/afs/bosint.h bos ${TOP_LIBDIR}/libbos.a bos_util ${TOP_INCDIR}/afs/bosint.h: bosint.h ${INSTALL_DATA} $? $@ @@ -93,7 +93,7 @@ bos.o: bos.c ${INCLS} AFS_component_version_number.o bos: bos.o $(LIBS) libbos.a ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS) ${XLIBS} -bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o +bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o ${TOP_INCDIR}/afs/bnode.h bos_util: bos_util.o $(LIBS) ${CC} ${CFLAGS} -o bos_util bos_util.o $(LIBS) ${XLIBS} diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index 3f2e7ef88c..21c683e0d3 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -12,7 +12,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/butm.h ${TOP_INCDIR}/afs/butx.h +all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/butx.h 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 @@ -74,6 +74,10 @@ bumon.xdr.c: bumon.h bumon.ss.c: bumon.h bumon.cs.c: bumon.h +butc_errs.c: ${TOP_INCDIR}/afs/tcdata.h + +butm_errs.c: ${TOP_INCDIR}/afs/butm.h + butm_errs.c butm.h: butm_errs.et butm.p.h $(RM) -f butm.h butm_errs.c ${COMPILE_ET} -p ${srcdir} butm_errs -h butm diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 216d85d2ef..022236eceb 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -49,7 +49,7 @@ 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 -all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h ${TOP_INCDIR}/afs/budb_prototypes.h budb_server +all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_prototypes.h budb_server ${TOP_LIBDIR}/libbudb.a: libbudb.a ${INSTALL_DATA} $? $@ @@ -86,10 +86,10 @@ db_text.o: db_text.c budb_errs.h ${INCLS} db_hash.o: db_hash.c budb_errs.h ${INCLS} ol_verify.o: ol_verify.c budb_errs.h ${INCLS} procs.o: procs.c budb_errs.h globals.h ${INCLS} -struct_ops.o: budb_errs.h +struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c -budb_server: $(SERVER_OBJS) ${LIBS} +budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS} budb.cs.c: budb.rg diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index 12696d6d57..3321ab4ec6 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -59,7 +59,7 @@ dest: all $(DESTDIRS) all: setup $(COMPDIRS) -single_compdir single_instdir single_destdir: +single_compdir single_instdir single_destdir: setup cd $(KOBJ) ; \ echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \ $(MAKE) DESTDIR=${DESTDIR} $@_libafs diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 7d58fdfc49..823928ba7c 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -168,7 +168,9 @@ setup: # Compile SP and MP clients as requested -${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: +${INSTDIRS}: + +${COMPDIRS} ${DESTDIRS}: setup $(RM) -f h $(RM) -f sys $(RM) -f netinet diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 55726bdcfc..e107513040 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -157,8 +157,8 @@ pagsh: libsys.a AFS_component_version_number.o ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS} pagsh.krb: libsys.a - ${CC} ${CFLAGS} -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV - ${CC} ${CFLAGS} -o pagsh.krb pagsh.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} + ${CC} ${CFLAGS} -o pagsh.krb.o -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV + ${CC} ${CFLAGS} -o pagsh.krb pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} # # Test programs. diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 3388322a38..c08ece59e6 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -49,7 +49,7 @@ update.h: update.xg ${RXGEN} -A -u -h -o $@ ${srcdir}/update.xg update.cs.c: update.h -upcate.ss.c: update.h +update.ss.c: update.h update.er.c: update.h # diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 501a922d23..cefd2326bd 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -189,6 +189,8 @@ vlib.a: ${VLIBOBJS} AFS_component_version_number.o salvager: vol-salvage.o physio.o vlib.a salvager.o ${LIBS} ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o salvager.o ${LIBS} ${XLIBS} +salvager.o: AFS_component_version_number.c + vol-salvage: vol-salvage.o vol-info: vol-info.o physio.o ihandle.o diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index 686265a588..fc462b09dd 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -58,7 +58,7 @@ xstat_fs.o: xstat_fs.c ${FSINCLS} xstat_fs_callback.o: xstat_fs_callback.c ${FSINCLS} -xstat_fs_test.: xstat_fs_test.c ${FSINCLS} +xstat_fs_test.o: xstat_fs_test.c ${FSINCLS} AFS_component_version_number.c 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} @@ -75,7 +75,7 @@ libxstat_cm.a: xstat_cm.o AFS_component_version_number.o xstat_cm.o: xstat_cm.c ${CMINCLS} -xstat_cm_test.o: xstat_cm_test.c ${CMINCLS} +xstat_cm_test.o: xstat_cm_test.c ${CMINCLS} AFS_component_version_number.c 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}