From 6fda61ba2e2290dac818b42440fac1346d05b73d Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Wed, 18 Jan 2012 10:06:36 -0500 Subject: [PATCH] Parallel build fixes Assorted fixes for issues seen with parallel builds: - bucoord must depend on butm, since it uses libbutm - for most object files in roken and hcrypto, headers must be installed before building - remove rules with 2 targets in rxkad and ubik - budb: add dependencies for db_dump.o Change-Id: Ide05f223c2f1fe53bff33cb03011ca47bf741c80 Reviewed-on: http://gerrit.openafs.org/6568 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- Makefile.in | 2 +- src/budb/Makefile.in | 1 + src/crypto/hcrypto/Makefile.in | 58 +++++++++++++++--------------- src/roken/Makefile.in | 66 +++++++++++++++++----------------- src/rxkad/Makefile.in | 4 ++- src/ubik/Makefile.in | 4 ++- 6 files changed, 70 insertions(+), 65 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d36381bfd..8dd74d338b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -551,7 +551,7 @@ tbudb: budb tubik echo Not building MT budb for ${SYS_NAME} ;; \ esac -bucoord: cmd comerr bubasics budb volser +bucoord: cmd comerr bubasics budb volser butm +${COMPILE_PART1} bucoord ${COMPILE_PART2} xstat: cmd comerr fsint viced diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 44352e31b3..2a406f3c53 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -79,6 +79,7 @@ budb_errs.c: budb_errs.et database.o: database.c budb_errs.h globals.h ${INCLS} db_alloc.o: db_alloc.c budb_errs.h ${INCLS} dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS} +db_dump.o: db_dump.c budb_errs.h ${INCLS} db_lock.o: db_lock.c budb_errs.h ${INCLS} db_text.o: db_text.c budb_errs.h ${INCLS} db_hash.o: db_hash.c budb_errs.h ${INCLS} diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in index 3199b469f3..0939a99a92 100644 --- a/src/crypto/hcrypto/Makefile.in +++ b/src/crypto/hcrypto/Makefile.in @@ -160,92 +160,92 @@ CFLAGS_test_cipher.o= -I${UPSTREAM}/roken/ CFLAGS_rand-unix.o=@CFLAGS_NOERROR@ CFLAGS_evp.o=-DHAVE_CONFIG_H -aes.o: ${UPSTREAM}/hcrypto/aes.c +aes.o: ${UPSTREAM}/hcrypto/aes.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/aes.c -bn.o: ${UPSTREAM}/hcrypto/bn.c +bn.o: ${UPSTREAM}/hcrypto/bn.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/bn.c -camellia.o: ${UPSTREAM}/hcrypto/camellia.c +camellia.o: ${UPSTREAM}/hcrypto/camellia.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia.c -camellia-ntt.o: ${UPSTREAM}/hcrypto/camellia-ntt.c +camellia-ntt.o: ${UPSTREAM}/hcrypto/camellia-ntt.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia-ntt.c -des.o: ${UPSTREAM}/hcrypto/des.c +des.o: ${UPSTREAM}/hcrypto/des.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/des.c -evp.o: ${UPSTREAM}/hcrypto/evp.c +evp.o: ${UPSTREAM}/hcrypto/evp.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp.c -evp-hcrypto.o: ${UPSTREAM}/hcrypto/evp-hcrypto.c +evp-hcrypto.o: ${UPSTREAM}/hcrypto/evp-hcrypto.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-hcrypto.c -evp-cc.o: ${UPSTREAM}/hcrypto/evp-cc.c +evp-cc.o: ${UPSTREAM}/hcrypto/evp-cc.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-cc.c -hmac.o: ${UPSTREAM}/hcrypto/hmac.c +hmac.o: ${UPSTREAM}/hcrypto/hmac.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/hmac.c -md2.o: ${UPSTREAM}/hcrypto/md2.c +md2.o: ${UPSTREAM}/hcrypto/md2.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md2.c -md4.o: ${UPSTREAM}/hcrypto/md4.c +md4.o: ${UPSTREAM}/hcrypto/md4.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md4.c -md5.o: ${UPSTREAM}/hcrypto/md5.c +md5.o: ${UPSTREAM}/hcrypto/md5.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md5.c -pkcs5.o: ${UPSTREAM}/hcrypto/pkcs5.c +pkcs5.o: ${UPSTREAM}/hcrypto/pkcs5.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/pkcs5.c -rand-egd.o: ${UPSTREAM}/hcrypto/rand-egd.c +rand-egd.o: ${UPSTREAM}/hcrypto/rand-egd.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-egd.c -rand-fortuna.o: ${UPSTREAM}/hcrypto/rand-fortuna.c +rand-fortuna.o: ${UPSTREAM}/hcrypto/rand-fortuna.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c -rand-timer.o: ${UPSTREAM}/hcrypto/rand-timer.c +rand-timer.o: ${UPSTREAM}/hcrypto/rand-timer.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-timer.c -rand-unix.o: ${UPSTREAM}/hcrypto/rand-unix.c +rand-unix.o: ${UPSTREAM}/hcrypto/rand-unix.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-unix.c -rand.o: ${UPSTREAM}/hcrypto/rand.c +rand.o: ${UPSTREAM}/hcrypto/rand.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand.c -rc2.o: ${UPSTREAM}/hcrypto/rc2.c +rc2.o: ${UPSTREAM}/hcrypto/rc2.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc2.c -rc4.o: ${UPSTREAM}/hcrypto/rc4.c +rc4.o: ${UPSTREAM}/hcrypto/rc4.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc4.c -rijndael-alg-fst.o: ${UPSTREAM}/hcrypto/rijndael-alg-fst.c +rijndael-alg-fst.o: ${UPSTREAM}/hcrypto/rijndael-alg-fst.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rijndael-alg-fst.c -rnd_keys.o: ${UPSTREAM}/hcrypto/rnd_keys.c +rnd_keys.o: ${UPSTREAM}/hcrypto/rnd_keys.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rnd_keys.c -sha.o: ${UPSTREAM}/hcrypto/sha.c +sha.o: ${UPSTREAM}/hcrypto/sha.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha.c -sha256.o: ${UPSTREAM}/hcrypto/sha256.c +sha256.o: ${UPSTREAM}/hcrypto/sha256.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha256.c -sha512.o: ${UPSTREAM}/hcrypto/sha512.c +sha512.o: ${UPSTREAM}/hcrypto/sha512.c ${HEADERS} ${AFS_CCRULE} $(UPSTREAM)/hcrypto/sha512.c -ui.o: ${UPSTREAM}/hcrypto/ui.c +ui.o: ${UPSTREAM}/hcrypto/ui.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/ui.c -validate.o: ${UPSTREAM}/hcrypto/validate.c +validate.o: ${UPSTREAM}/hcrypto/validate.c ${HEADERS} ${AFS_CCRULE} ${UPSTREAM}/hcrypto/validate.c -test_cipher.o: ${UPSTREAM}/hcrypto/test_cipher.c +test_cipher.o: ${UPSTREAM}/hcrypto/test_cipher.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/test_cipher.c # LWP Targets -rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c +rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c ${HEADERS} $(LWP_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in index 0a3761e1e4..f4a195e8a3 100644 --- a/src/roken/Makefile.in +++ b/src/roken/Makefile.in @@ -73,104 +73,104 @@ $(TOP_INCDIR)/roken-common.h: $(UPSTREAM)/roken-common.h err.h: ${UPSTREAM}/err.hin cp $? $@ -base64.o: $(UPSTREAM)/base64.c +base64.o: $(UPSTREAM)/base64.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/base64.c -cloexec.o: ${UPSTREAM}/cloexec.c +cloexec.o: ${UPSTREAM}/cloexec.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/cloexec.c -ct.o: ${UPSTREAM}/ct.c +ct.o: ${UPSTREAM}/ct.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/ct.c -daemon.o: ${UPSTREAM}/daemon.c +daemon.o: ${UPSTREAM}/daemon.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/daemon.c -ecalloc.o: ${UPSTREAM}/ecalloc.c +ecalloc.o: ${UPSTREAM}/ecalloc.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/ecalloc.c -emalloc.o: ${UPSTREAM}/emalloc.c +emalloc.o: ${UPSTREAM}/emalloc.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/emalloc.c -erealloc.o: ${UPSTREAM}/erealloc.c +erealloc.o: ${UPSTREAM}/erealloc.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/erealloc.c -err.o: ${UPSTREAM}/err.c err.h +err.o: ${UPSTREAM}/err.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/err.c -errx.o: ${UPSTREAM}/errx.c err.h +errx.o: ${UPSTREAM}/errx.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/errx.c -flock.o: ${UPSTREAM}/flock.c +flock.o: ${UPSTREAM}/flock.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/flock.c -getopt.o: ${UPSTREAM}/getopt.c +getopt.o: ${UPSTREAM}/getopt.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/getopt.c -getprogname.o: ${UPSTREAM}/getprogname.c +getprogname.o: ${UPSTREAM}/getprogname.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/getprogname.c -hex.o: ${UPSTREAM}/hex.c +hex.o: ${UPSTREAM}/hex.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hex.c -issuid.o: ${UPSTREAM}/issuid.c +issuid.o: ${UPSTREAM}/issuid.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/issuid.c -mkstemp.o: ${UPSTREAM}/mkstemp.c +mkstemp.o: ${UPSTREAM}/mkstemp.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/mkstemp.c -net_read.o: ${UPSTREAM}/net_read.c +net_read.o: ${UPSTREAM}/net_read.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/net_read.c -net_write.o: ${UPSTREAM}/net_write.c +net_write.o: ${UPSTREAM}/net_write.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/net_write.c -setenv.o: ${UPSTREAM}/setenv.c +setenv.o: ${UPSTREAM}/setenv.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/setenv.c -socket.o: ${UPSTREAM}/socket.c +socket.o: ${UPSTREAM}/socket.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/socket.c # The upstream snprintf.c has some pointer warnings in it CFLAGS_snprintf.o = @CFLAGS_NOERROR@ -snprintf.o: ${UPSTREAM}/snprintf.c +snprintf.o: ${UPSTREAM}/snprintf.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/snprintf.c -strlcat.o: ${UPSTREAM}/strlcat.c +strlcat.o: ${UPSTREAM}/strlcat.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/strlcat.c -strlcpy.o: ${UPSTREAM}/strlcpy.c +strlcpy.o: ${UPSTREAM}/strlcpy.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/strlcpy.c -strnlen.o: ${UPSTREAM}/strnlen.c +strnlen.o: ${UPSTREAM}/strnlen.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/strnlen.c -strsep.o: ${UPSTREAM}/strsep.c +strsep.o: ${UPSTREAM}/strsep.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/strsep.c -unsetenv.o: ${UPSTREAM}/unsetenv.c +unsetenv.o: ${UPSTREAM}/unsetenv.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/unsetenv.c -verr.o: ${UPSTREAM}/verr.c err.h +verr.o: ${UPSTREAM}/verr.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/verr.c -verrx.o: ${UPSTREAM}/verrx.c err.h +verrx.o: ${UPSTREAM}/verrx.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/verrx.c -vsyslog.o: ${UPSTREAM}/vsyslog.c +vsyslog.o: ${UPSTREAM}/vsyslog.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/vsyslog.c -vwarn.o: ${UPSTREAM}/vwarn.c err.h +vwarn.o: ${UPSTREAM}/vwarn.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/vwarn.c -vwarnx.o: ${UPSTREAM}/vwarnx.c err.h +vwarnx.o: ${UPSTREAM}/vwarnx.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/vwarnx.c -warn.o: ${UPSTREAM}/warn.c err.h +warn.o: ${UPSTREAM}/warn.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/warn.c -warnerr.o: ${UPSTREAM}/warnerr.c err.h +warnerr.o: ${UPSTREAM}/warnerr.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/warnerr.c -warnx.o: ${UPSTREAM}/warnx.c err.h +warnx.o: ${UPSTREAM}/warnx.c err.h ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/warnx.c diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 3788c18f4e..78c941e9f6 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -71,7 +71,9 @@ 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 +rxkad.h: rxkad_errs.c + +rxkad_errs.c: rxkad_errs.et rxkad.p.h $(RM) -f rxkad.h rxkad_errs.c ${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index b1b435804b..a5075baea7 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -107,7 +107,9 @@ utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c udebug.o: udebug.c ${INCLS} AFS_component_version_number.c uerrors.o: uerrors.c -uerrors.c ubik.h: uerrors.et ubik.p.h +ubik.h: uerrors.c + +uerrors.c: uerrors.et ubik.p.h $(RM) -f ubik.h uerrors.c ${COMPILE_ET} -p ${srcdir} uerrors -h ubik