From c01236beb5a6ad55cd424f0ccc3a836d737f78f3 Mon Sep 17 00:00:00 2001
From: Michael Meffie <mmeffie@sinenomine.net>
Date: Sat, 26 Oct 2013 23:35:14 -0400
Subject: [PATCH] build: separate source and header compile_et rules

Generate source and header files separately to support parallel make
without contortions.

Add a complete list of dependencies for each generated header file
to avoid build errors during parallel make.

Change-Id: I804ff553e08d411a1cfe20a4ef4e57da9d321837
Reviewed-on: http://gerrit.openafs.org/10370
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: D Brashear <shadow@your-file-system.com>
---
 src/auth/Makefile.in           | 37 ++++++++++++++++++++-------
 src/bozo/Makefile.in           | 17 ++++++++++---
 src/bubasics/Makefile.in       | 31 ++++++++++++-----------
 src/bucoord/Makefile.in        | 27 +++++++++++++++++---
 src/budb/Makefile.in           | 21 +++++++++++++---
 src/cmd/Makefile.in            | 10 +++++---
 src/kauth/Makefile.in          | 29 ++++++++++++++++++---
 src/ptserver/Makefile.in       | 20 ++++++++++++---
 src/rxkad/Makefile.in          | 20 ++++++++++++---
 src/rxkad/test/Makefile.in     | 13 +++++++---
 src/tbudb/Makefile.in          | 21 +++++++++++++---
 src/tools/dumpscan/Makefile.in | 46 +++++++++++++++++++++++++++-------
 src/tptserver/Makefile.in      | 20 ++++++++++++---
 src/tvlserver/Makefile.in      | 16 +++++++++---
 src/tvolser/Makefile.in        | 16 +++++++++---
 src/ubik/Makefile.in           | 24 +++++++++++++++---
 src/vlserver/Makefile.in       | 16 +++++++++---
 src/volser/Makefile.in         | 21 +++++++++++++---
 18 files changed, 313 insertions(+), 92 deletions(-)

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 2a6971390..593e94893 100644
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -110,15 +110,34 @@ copyauth: copyauth.o ${LIBS}
 setkey: setkey.o ${LIBS}
 	$(AFS_LDRULE) setkey.o ${LIBS} ${XLIBS}
 
-acfg_errors.c cellconfig.h: acfg_errors.et cellconfig.p.h
-	$(RM) -f cellconfig.h acfg_errors.c
-	${COMPILE_ET} -p ${srcdir} acfg_errors -h cellconfig
-cellconfig.h: acfg_errors.c
-
-ktc_errors.c auth.h: ktc_errors.et auth.p.h
-	$(RM) -f auth.h ktc_errors.c
-	${COMPILE_ET} -p ${srcdir} ktc_errors -h auth
-auth.h: ktc_errors.c
+acfg_errors.c: acfg_errors.et
+	${COMPILE_ET_C} -p ${srcdir} acfg_errors
+
+cellconfig.h: acfg_errors.et cellconfig.p.h
+	${COMPILE_ET_H} -p ${srcdir} acfg_errors -h cellconfig
+
+authcon.lo: cellconfig.h
+cellconfig.lo: cellconfig.h
+copyauth.o: cellconfig.h
+keys.lo: cellconfig.h
+ktc.lo: cellconfig.h
+netrestrict.lo: cellconfig.h
+realms.lo: cellconfig.h
+setkey.o: cellconfig.h
+userok.lo: cellconfig.h
+writeconfig.lo: cellconfig.h
+
+ktc_errors.c: ktc_errors.et
+	${COMPILE_ET_C} -p ${srcdir} ktc_errors
+
+auth.h: ktc_errors.et auth.p.h
+	${COMPILE_ET_H} -p ${srcdir} ktc_errors -h auth
+
+authcon.lo: auth.h
+copyauth.o: auth.h
+ktc.lo: auth.h
+token.lo: auth.h
+userok.lo: auth.h
 
 Ktoken.xdr.c: token.xg
 	$(RXGEN) -A -x -k -c -o $@ $(srcdir)/token.xg
diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 8ce9cc11c..510bafb09 100644
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -81,10 +81,19 @@ bosint.cs.c: bosint.h
 bosint.ss.c: bosint.h
 bosint.xdr.c: bosint.h
 
-boserr.c bnode.h: bnode.p.h boserr.et
-	$(RM) -f boserr.c bnode.h
-	${COMPILE_ET} -p ${srcdir} boserr -h bnode
-bnode.h: boserr.c
+boserr.c: boserr.et
+	${COMPILE_ET_C} -p ${srcdir} boserr
+
+bnode.h: bnode.p.h boserr.et
+	${COMPILE_ET_H} -p ${srcdir} boserr -h bnode
+
+bnode.o: bnode.h
+bos.o: bnode.h
+bosoprocs.o: bnode.h
+bosserver.o: bnode.h
+cronbnodeops.o: bnode.h
+ezbnodeops.o: bnode.h
+fsbnodeops.o: bnode.h
 
 bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o
 
diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
index eff5efd05..e22a9c32d 100644
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@@ -80,20 +80,23 @@ bumon.xdr.c: bumon.h
 bumon.ss.c: bumon.h
 bumon.cs.c: bumon.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
-butm.h: butm_errs.c
-
-butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
-	$(RM) -f tcdata.h butc_errs.c
-	${COMPILE_ET} -p ${srcdir} butc_errs -h tcdata
-tcdata.h: butc_errs.c
-
-butx_errs.c butx.h: butx_errs.et
-	$(RM) -f butx.h butx_errs.c
-	${COMPILE_ET} -p ${srcdir} butx_errs -h butx
-butx.h: butx_errs.c
+butm.h: butm_errs.et butm.p.h
+	${COMPILE_ET_H} -p ${srcdir} butm_errs -h butm
+
+butm_errs.c: butm_errs.et
+	${COMPILE_ET_C} -p ${srcdir} butm_errs
+
+tcdata.h: butc_errs.et tcdata.p.h butm.h
+	${COMPILE_ET_H} -p ${srcdir} butc_errs -h tcdata
+
+butc_errs.c: butc_errs.et
+	${COMPILE_ET_C} -p ${srcdir} butc_errs
+
+butx.h: butx_errs.et
+	${COMPILE_ET_H} -p ${srcdir} butx_errs -h butx
+
+butx_errs.c: butx_errs.et
+	${COMPILE_ET_C} -p ${srcdir} butx_errs
 
 #
 # Installation targets
diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index b9748d0b7..b1dcca8ac 100644
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -70,10 +70,29 @@ $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h
 backup:  $(BACKOBJS) ${LIBS}
 	$(AFS_LDRULE) $(BACKOBJS) ${LIBS} $(LIB_roken) ${XLIBS}
 
-bucoord_errs.c bc.h: bucoord_errs.et bc.p.h
-	$(RM) -f bc.h bucoord_errs.c
-	${COMPILE_ET} -p ${srcdir} bucoord_errs -h bc
-bc.h: bucoord_errs.c
+bucoord_errs.c: bucoord_errs.et
+	${COMPILE_ET_C} -p ${srcdir} bucoord_errs
+
+bc.h: bucoord_errs.et bc.p.h
+	${COMPILE_ET_H} -p ${srcdir} bucoord_errs -h bc
+
+bc_status.o: bc.h
+btest.o: bc.h
+commands.o: bc.h
+config.o: bc.h
+dlq.o: bc.h
+dsstub.o: bc.h
+dsvs.o: bc.h
+dump.o: bc.h
+dump_sched.o: bc.h
+main.o: bc.h
+restore.o: bc.h
+status.o: bc.h
+tape_hosts.o: bc.h
+ttest.o: bc.h
+ubik_db_if.o: bc.h
+vol_sets.o: bc.h
+volstub.o: bc.h
 
 #
 # Errors
diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index c6972b9af..d20344d85 100644
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -71,10 +71,23 @@ ${TOP_INCDIR}/afs/budb_client.h: budb_client.h
 ${TOP_INCDIR}/afs/budb_prototypes.h: budb_prototypes.h
 	${INSTALL_DATA} $? $@
 
-budb_errs.c bubd_errs.h: budb_errs.et
-	$(RM) -f budb_errs.c
-	${COMPILE_ET} -p ${srcdir} budb_errs
-budb_errs.h: budb_errs.c
+budb_errs.c: budb_errs.et
+	${COMPILE_ET_C} -p ${srcdir} budb_errs
+
+budb_errs.h: budb_errs.et
+	${COMPILE_ET_H} -p ${srcdir} budb_errs
+
+database.o: budb_errs.h
+db_alloc.o: budb_errs.h
+db_dump.o: budb_errs.h
+db_hash.o: budb_errs.h
+db_lock.o: budb_errs.h
+dbs_dump.o: budb_errs.h
+db_text.o: budb_errs.h
+ol_verify.o: budb_errs.h
+procs.o: budb_errs.h
+server.o: budb_errs.h
+struct_ops.o: budb_errs.h
 
 database.o: database.c budb_errs.h globals.h ${INCLS}
 db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index a287a28b8..efbffa3d0 100644
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -35,12 +35,14 @@ ${TOP_LIBDIR}/libcmd64.a: libcmd64.a
 ${TOP_INCDIR}/afs/cmd.h: cmd.h
 	${INSTALL_DATA} $? $@
 
-cmd_errors.c cmd.h: cmd_errors.et cmd.p.h
-	$(RM) -f cmd.h cmd_errors.c
-	${COMPILE_ET} -p ${srcdir} cmd_errors -h cmd
-cmd.h: cmd_errors.c
+cmd_errors.c: cmd_errors.et
+	${COMPILE_ET_C} -p ${srcdir} cmd_errors
+
+cmd.h: cmd_errors.et cmd.p.h
+	${COMPILE_ET_H} -p ${srcdir} cmd_errors -h cmd
 
 cmd.lo: cmd.h
+config_file.lo: cmd.h
 
 config_file.lo: $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c krb5_locl.h
 	$(LT_CCRULE) $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 76b70c298..9df89e8d5 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -124,10 +124,31 @@ kadatabase.o: kadatabase.c ${INCLS}
 
 kaprocs.o: kaprocs.c ${INCLS} kaport.h
 
-kaerrors.c kautils.h: kaerrors.et kautils.p.h
-	$(RM) -f kautils.h kaerrors.c
-	${COMPILE_ET} -p ${srcdir} kaerrors -h kautils
-kautils.h: kaerrors.c
+kaerrors.c: kaerrors.et
+	${COMPILE_ET_C} -p ${srcdir} kaerrors
+
+kautils.h: kaerrors.et kautils.p.h
+	${COMPILE_ET_H} -p ${srcdir} kaerrors -h kautils
+
+admin_tools.o admin_tools.lo: kautils.h
+authclient.o authclient.lo: kautils.h
+client.o client.lo: kautils.h
+decode_ticket.o decode_ticket.lo: kautils.h
+kadatabase.o kadatabase.lo: kautils.h
+kalocalcell.o kalocalcell.lo: kautils.h
+kaprocs.o kaprocs.lo: kautils.h
+kas.o kas.lo: kautils.h
+kaserver.o kaserver.lo: kautils.h
+katoken.o katoken.lo: kautils.h
+ka_util.o ka_util.lo: kautils.h
+kautils.o kautils.lo: kautils.h
+klog.o klog.lo: kautils.h
+kpasswd.o kpasswd.lo: kautils.h
+krb_tf.o krb_tf.lo: kautils.h
+krb_udp.o krb_udp.lo: kautils.h
+manyklog.o manyklog.lo: kautils.h
+rebuild.o rebuild.lo: kautils.h
+user.o user.lo: kautils.h
 
 kauth.xdr.lo: kauth.xdr.c kauth.h
 
diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 135fa3f0b..b2b1829cc 100644
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -160,10 +160,22 @@ ptclient: ptclient.o libprot.a $(LIBS)
 
 ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
 
-pterror.c pterror.h: pterror.et
-	$(RM) -f pterror.h pterror.c
-	${COMPILE_ET} -p ${srcdir} pterror
-pterror.h: pterror.c
+pterror.c: pterror.et
+	${COMPILE_ET_C} -p ${srcdir} pterror
+
+pterror.h: pterror.et
+	${COMPILE_ET_H} -p ${srcdir} pterror
+
+db_verify.o db_verify.lo: pterror.h
+ptclient.o ptclient.lo: pterror.h
+ptprocs.o ptprocs.lo: pterror.h
+pts.o pts.lo: pterror.h
+ptuser.o ptuser.lo: pterror.h
+pt_util.o pt_util.lo: pterror.h
+ptutils.o ptutils.lo: pterror.h
+readgroup.o readgroup.lo: pterror.h
+testpt.o testpt.lo: pterror.h
+utils.o utils.lo: pterror.h
 
 display.lo: $(INCLS)
 ptuser.lo: $(LINCLS)
diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index d768a8021..fe04178ce 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -93,10 +93,22 @@ rxkad_errs.lo: rxkad_errs.c
 ticket.lo: ticket.c lifetimes.h ${INCLS}
 ticket5.lo: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
 
-rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
-	$(RM) -f rxkad.h rxkad_errs.c
-	${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad
-rxkad.h: rxkad_errs.c
+rxkad_errs.c: rxkad_errs.et
+	${COMPILE_ET_C} -p ${srcdir} rxkad_errs
+
+rxkad.h: rxkad_errs.et rxkad.p.h
+	${COMPILE_ET_H} -p ${srcdir} rxkad_errs -h rxkad
+
+bg-fcrypt.o bg-fcrypt.lo: rxkad.h
+crc.o crc.lo: rxkad.h
+crypt_conn.o crypt_conn.lo: rxkad.h
+fcrypt.o fcrypt.lo: rxkad.h
+fc_test.o fc_test.lo: rxkad.h
+rxkad_client.o rxkad_client.lo: rxkad.h
+rxkad_common.o rxkad_common.lo: rxkad.h
+rxkad_server.o rxkad_server.lo: rxkad.h
+ticket5.o ticket5.lo: rxkad.h
+ticket.o ticket.lo: rxkad.h
 
 tcrypt.o: tcrypt.c AFS_component_version_number.o
 
diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index 6248c4c30..1775eadb7 100644
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -70,10 +70,15 @@ stress_errs.o: stress_errs.c
 th_stress_errs.o: stress_errs.c
 	${THRULE} -c $(srcdir)/stress_errs.c -o th_stress_errs.o
 
-stress_errs.c stress_errs.h: stress_errs.et
-	$(RM) -f stress_errs.h stress_errs.c
-	${COMPILE_ET} -p ${srcdir} stress_errs -h stress_errs
-stress_errs.h: stress_errs.c
+stress_errs.c: stress_errs.et
+	${COMPILE_ET_C} -p ${srcdir} stress_errs
+
+stress_errs.h: stress_errs.et
+	${COMPILE_ET_H} -p ${srcdir} stress_errs
+
+stress_c.o: stress_errs.h
+stress.o: stress_errs.h
+stress_s.o: stress_errs.h
 
 stress.o: ${HEADERS}
 stress_c.o: ${HEADERS}
diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 32b456cff..df2e5b932 100644
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -48,10 +48,23 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o
 
 all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server ${INCLS}
 
-budb_errs.c budb_errs.h: ${BUDB}/budb_errs.et
-	$(RM) -f budb_errs.c budb_errs.h
-	${COMPILE_ET} -p ${BUDB} budb_errs
-budb_errs.h: budb_errs.c
+budb_errs.c: ${BUDB}/budb_errs.et
+	${COMPILE_ET_C} -p ${BUDB} budb_errs
+
+budb_errs.h: ${BUDB}/budb_errs.et
+	${COMPILE_ET_H} -p ${BUDB} budb_errs
+
+database.o: budb_errs.h
+db_alloc.o: budb_errs.h
+db_dump.o: budb_errs.h
+db_hash.o: budb_errs.h
+db_lock.o: budb_errs.h
+dbs_dump.o: budb_errs.h
+db_text.o: budb_errs.h
+ol_verify.o: budb_errs.h
+procs.o: budb_errs.h
+server.o: budb_errs.h
+struct_ops.o: budb_errs.h
 
 #
 # Build targets
diff --git a/src/tools/dumpscan/Makefile.in b/src/tools/dumpscan/Makefile.in
index a829c6523..33d5c8949 100644
--- a/src/tools/dumpscan/Makefile.in
+++ b/src/tools/dumpscan/Makefile.in
@@ -71,15 +71,43 @@ libdumpscan.a: $(OBJS_libdumpscan.a)
 	$(AR) r libdumpscan.a $(OBJS_libdumpscan.a)
 	$(RANLIB) libdumpscan.a
 
-xf_errs.c xf_errs.h: ${srcdir}/xf_errs.et
-	$(RM) -f xf_errs.c xf_errs.h
-	$(COMPILE_ET) ${srcdir}/xf_errs.et
-xf_errs.h: xf_errs.c
-
-dumpscan_errs.c dumpscan_errs.h: ${srcdir}/dumpscan_errs.et
-	$(RM) -f dumpscan_errs.c dumpscan_errs.h
-	$(COMPILE_ET) ${srcdir}/dumpscan_errs.et
-dumpscan_errs.h: dumpscan_errs.c
+xf_errs.c: ${srcdir}/xf_errs.et
+	$(COMPILE_ET_C) ${srcdir}/xf_errs.et
+
+xf_errs.h: ${srcdir}/xf_errs.et
+	$(COMPILE_ET_H) ${srcdir}/xf_errs.et
+
+afsdump_dirlist.o: xf_errs.h
+afsdump_extract.o: xf_errs.h
+afsdump_scan.o: xf_errs.h
+directory.o: xf_errs.h
+stagehdr.o: xf_errs.h
+util.o: xf_errs.h
+xf_files.o: xf_errs.h
+xfiles.o: xf_errs.h
+xf_printf.o: xf_errs.h
+xf_profile.o: xf_errs.h
+xf_rxcall.o: xf_errs.h
+
+dumpscan_errs.h: ${srcdir}/dumpscan_errs.et
+	$(COMPILE_ET_H) ${srcdir}/dumpscan_errs.et
+
+dumpscan_errs.c: ${srcdir}/dumpscan_errs.et
+	$(COMPILE_ET_C) ${srcdir}/dumpscan_errs.et
+
+afsdump_dirlist.o: dumpscan_errs.h
+afsdump_extract.o: dumpscan_errs.h
+afsdump_scan.o: dumpscan_errs.h
+backuphdr.o: dumpscan_errs.h
+directory.o: dumpscan_errs.h
+parsedump.o: dumpscan_errs.h
+parsetag.o: dumpscan_errs.h
+parsevnode.o: dumpscan_errs.h
+parsevol.o: dumpscan_errs.h
+pathname.o: dumpscan_errs.h
+repair.o: dumpscan_errs.h
+stagehdr.o: dumpscan_errs.h
+util.o: dumpscan_errs.h
 
 util.o xfiles.o xf_files.o: xf_errs.h
 backuphdr.o directory.o parsedump.o parsetag.o: dumpscan_errs.h
diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index fcf411882..f03b1c5e0 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -146,10 +146,22 @@ pt_util.o: ${PTSERVER}/pt_util.c
 ptubik.o: ${PTSERVER}/ptubik.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/ptubik.c
 
-pterror.c pterror.h: ${PTSERVER}/pterror.et
-	$(RM) -f pterror.h pterror.c
-	${COMPILE_ET} -p ${PTSERVER} pterror
-pterror.h: pterror.c
+pterror.c: ${PTSERVER}/pterror.et
+	${COMPILE_ET_C} -p ${PTSERVER} pterror
+
+pterror.h: ${PTSERVER}/pterror.et
+	${COMPILE_ET_H} -p ${PTSERVER} pterror
+
+db_verify.o db_verify.lo: pterror.h
+ptclient.o ptclient.lo: pterror.h
+ptprocs.o ptprocs.lo: pterror.h
+pts.o pts.lo: pterror.h
+ptuser.o ptuser.lo: pterror.h
+pt_util.o pt_util.lo: pterror.h
+ptutils.o ptutils.lo: pterror.h
+readgroup.o readgroup.lo: pterror.h
+testpt.o testpt.lo: pterror.h
+utils.o utils.lo: pterror.h
 
 prerror.h: pterror.h
 	${INSTALL} $? $@
diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 947c8cfe9..495e38a2c 100644
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -112,10 +112,18 @@ vlclient.o: ${VLSERVER}/vlclient.c
 
 vl_errors.o: vl_errors.c
 
-vl_errors.c vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-	$(RM) -f vlserver.h vl_errors.c
-	${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
-vlserver.h: vl_errors.c
+vl_errors.c: ${VLSERVER}/vl_errors.et
+	${COMPILE_ET_C} -p ${VLSERVER} vl_errors
+
+vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
+	${COMPILE_ET_H} -p ${VLSERVER} vl_errors -h vlserver
+
+cnvldb.o cnvldb.lo: vlserver.h
+vlclient.o vlclient.lo: vlserver.h
+vldb_check.o vldb_check.lo: vlserver.h
+vlprocs.o vlprocs.lo: vlserver.h
+vlserver.o vlserver.lo: vlserver.h
+vlutils.o vlutils.lo: vlserver.h
 
 system: install
 
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 40e3ffabc..046d81a8c 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -89,10 +89,18 @@ volint.xdr.o: ../volser/volint.xdr.c
 lockprocs.o: ${VOLSER}/lockprocs.c
 	$(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
 
-vl_errors.c vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-	$(RM) -f vlserver.h vl_errors.c
-	${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
-vlserver.h: vl_errors.c
+vl_errors.c: ${VLSERVER}/vl_errors.et
+	${COMPILE_ET_C} -p ${VLSERVER} vl_errors
+
+vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
+	${COMPILE_ET_H} -p ${VLSERVER} vl_errors -h vlserver
+
+cnvldb.o cnvldb.lo: vlserver.h
+vlclient.o vlclient.lo: vlserver.h
+vldb_check.o vldb_check.lo: vlserver.h
+vlprocs.o vlprocs.lo: vlserver.h
+vlserver.o vlserver.lo: vlserver.h
+vlutils.o vlutils.lo: vlserver.h
 
 vldbint.cs.o: ../vlserver/vldbint.cs.c
 	$(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index e9cd30c2e..08a6ba04b 100644
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -119,10 +119,26 @@ 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
-	$(RM) -f ubik.h uerrors.c
-	${COMPILE_ET} -p ${srcdir} uerrors -h ubik
-ubik.h: uerrors.c
+uerrors.c: uerrors.et
+	${COMPILE_ET_C} -p ${srcdir} uerrors
+
+ubik.h: uerrors.et ubik.p.h
+	${COMPILE_ET_H} -p ${srcdir} uerrors -h ubik
+
+beacon.o beacon.lo: ubik.h
+disk.o disk.lo: ubik.h
+lock.o lock.lo: ubik.h
+phys.o phys.lo: ubik.h
+recovery.o recovery.lo: ubik.h
+remote.o remote.lo: ubik.h
+ubik.o ubik.lo: ubik.h
+ubikclient.o ubikclient.lo: ubik.h
+ubikcmd.o ubikcmd.lo: ubik.h
+udebug.o udebug.lo: ubik.h
+uinit.o uinit.lo: ubik.h
+utst_client.o utst_client.lo: ubik.h
+utst_server.o utst_server.lo: ubik.h
+vote.o vote.lo: ubik.h
 
 libubik.a: ${LT_objs}
 	$(LT_LDLIB_lwp) $(LT_objs)
diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index a2df96ff0..d31277565 100644
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -144,10 +144,18 @@ vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
 
 vl_errors.o: vl_errors.c
 
-vl_errors.c vlserver.h : vl_errors.et vlserver.p.h
-	$(RM) -f vlserver.h vl_errors.c
-	${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver
-vlserver.h: vl_errors.c
+vl_errors.c: vl_errors.et
+	${COMPILE_ET_C} -p ${srcdir} vl_errors
+
+vlserver.h : vl_errors.et vlserver.p.h
+	${COMPILE_ET_H} -p ${srcdir} vl_errors -h vlserver
+
+cnvldb.o cnvldb.lo: vlserver.h
+vlclient.o vlclient.lo: vlserver.h
+vldb_check.o vldb_check.lo: vlserver.h
+vlprocs.o vlprocs.lo: vlserver.h
+vlserver.o vlserver.lo: vlserver.h
+vlutils.o vlutils.lo: vlserver.h
 
 vlserver.o: vlserver.c
 
diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 335c8bee0..18455d00a 100644
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -124,10 +124,23 @@ liboafs_volser.la: liboafs_volser.la.sym $(LT_objs) $(LT_deps)
 libauthent_volser.la: $(LT_objs)
 	$(LT_LDLIB_pic) $(LT_objs)
 
-volerr.c volser.h: volerr.et volser.p.h
-	$(RM) -f volser.h volerr.c
-	${COMPILE_ET} -p ${srcdir} volerr -h volser
-volser.h: volerr.c
+volerr.c: volerr.et
+	${COMPILE_ET_C} -p ${srcdir} volerr
+
+volser.h: volerr.et volser.p.h
+	${COMPILE_ET_H} -p ${srcdir} volerr -h volser
+
+common.o common.lo: volser.h
+dumpstuff.o dumpstuff.lo: volser.h
+lockprocs.o lockprocs.lo: volser.h
+vol-dump.o vol-dump.lo: volser.h
+volmain.o volmain.lo: volser.h
+volprocs.o volprocs.lo: volser.h
+vol_split.o vol_split.lo: volser.h
+voltrans.o voltrans.lo: volser.h
+vos.o vos.lo: volser.h
+vsprocs.o vsprocs.lo: volser.h
+vsutils.o vsutils.lo: volser.h
 
 volint.cs.c: volint.xg
 	${RXGEN} -A -x -C -o $@ ${srcdir}/volint.xg
-- 
2.39.5