From dbf68229c6c90d65781fdc16565dd1e9b56248c0 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Mon, 9 Sep 2013 22:25:50 -0400 Subject: [PATCH] build: compile_et rules for parallel make Change all makefile rules which run compile_et in order support parallel make. The compile_et generates two outputs, so special care must be taken in rules which run compile_et. All the rules for compile_et have been changed to the form: foo.c foo.h: foo.et compile_et foo.et -h foo foo.h: foo.c The above rules are equivalent to: foo.c: foo.et compile_et foo.et -h foo foo.h: foo.et foo.c compile_et foo.et -h foo therefore a parallel make will serialize the builds of foo.c and foo.h, and should detect that the second is no longer needed once the first is over. This form works since foo.et is not a phony target, and does not depend on a phony target. Previously, the rules for compile_et were of the one of the two forms: a) foo.c foo.h: foo.et compile_et foo.et -h foo or b) foo.h: foo.c foo.c: foo.et compile_et foo.et -h foo Form a) is problematic for parallel makes, since it is equivalent to: foo.c: compile_et foo.et -h foo foo.h: compile_et foo.et -h foo In a parallel make, compile_et will be run concurrently, clobbering each other's output files. Form b) is better, but is problematic when foo.h is removed, since foo.h will not be updated. Thanks to Russ Allbery for pointing out the automake documentation which describes issues with commands that produce multiple outputs, and portable solutions. http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs Change-Id: I14c056606084f80270e05592d3d09a600f804e24 Reviewed-on: http://gerrit.openafs.org/10237 Reviewed-by: Benjamin Kaduk Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/afs/Makefile.in | 4 +++- src/auth/Makefile.in | 2 ++ src/bozo/Makefile.in | 5 ++-- src/bubasics/Makefile.in | 15 +++++------- src/bucoord/Makefile.in | 5 ++-- src/budb/Makefile.in | 5 ++-- src/cmd/Makefile.in | 4 ++-- src/kauth/Makefile.in | 5 ++-- src/libadmin/adminutil/Makefile.in | 37 +++++++++++++++--------------- src/ptserver/Makefile.in | 3 ++- src/rxkad/Makefile.in | 5 ++-- src/rxkad/test/Makefile.in | 4 +++- src/tbudb/Makefile.in | 7 +++--- src/tools/dumpscan/Makefile.in | 4 ++++ src/tptserver/Makefile.in | 4 ++-- src/tvlserver/Makefile.in | 6 +++-- src/tvolser/Makefile.in | 6 +++-- src/ubik/Makefile.in | 5 ++-- src/vlserver/Makefile.in | 7 ++++-- src/volser/Makefile.in | 5 ++-- 20 files changed, 72 insertions(+), 66 deletions(-) diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 7dbb9f4f2..c407c0149 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -16,12 +16,14 @@ all: depinstall generated: afs_trace.h afs_trace.msf unified_afs.c unified_afs.h -afs_trace.h afs_trace.msf: afs_trace.et +afs_trace.msf afs_trace.h: afs_trace.et ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et +afs_trace.h: afs_trace.msf unified_afs.c unified_afs.h: unified_afs.et $(RM) -f unified_afs.c unified_afs.h ${COMPILE_ET} -p ${srcdir} unified_afs -h unified_afs +unified_afs.h: unified_afs.c afszcm.cat: afs_trace.msf -$(RM) -f afszcm.cat diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 2a2c4008d..2a6971390 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -113,10 +113,12 @@ setkey: setkey.o ${LIBS} 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 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 b565d1707..8ce9cc11c 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -81,11 +81,10 @@ bosint.cs.c: bosint.h bosint.ss.c: bosint.h bosint.xdr.c: bosint.h -bnode.h: boserr.c - -boserr.c: bnode.p.h boserr.et +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 bosserver.o: bosserver.c ${INCLS} AFS_component_version_number.o diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index f0fb0187c..eff5efd05 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -80,23 +80,20 @@ bumon.xdr.c: bumon.h bumon.ss.c: bumon.h bumon.cs.c: bumon.h -butm.h: butm_errs.c - -butm_errs.c: butm_errs.et butm.p.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 -tcdata.h: butc_errs.c - -butc_errs.c: butc_errs.et tcdata.p.h butm.h +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.h: butx_errs.c - -butx_errs.c: butx_errs.et +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 # # Installation targets diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index f70369e0c..b9748d0b7 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -70,11 +70,10 @@ $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h backup: $(BACKOBJS) ${LIBS} $(AFS_LDRULE) $(BACKOBJS) ${LIBS} $(LIB_roken) ${XLIBS} -bc.h: bucoord_errs.c - -bucoord_errs.c: bucoord_errs.et bc.p.h +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 # # Errors diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 1d39793a6..c6972b9af 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -71,11 +71,10 @@ ${TOP_INCDIR}/afs/budb_client.h: budb_client.h ${TOP_INCDIR}/afs/budb_prototypes.h: budb_prototypes.h ${INSTALL_DATA} $? $@ -budb_errs.h: budb_errs.c - -budb_errs.c: budb_errs.et +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 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 452aca992..a287a28b8 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -35,11 +35,11 @@ ${TOP_LIBDIR}/libcmd64.a: libcmd64.a ${TOP_INCDIR}/afs/cmd.h: cmd.h ${INSTALL_DATA} $? $@ -cmd.h: cmd_errors.et cmd.p.h +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.h cmd.lo: cmd.h config_file.lo: $(TOP_SRCDIR)/external/heimdal/krb5/config_file.c krb5_locl.h diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 572b6208e..032cee1b3 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -124,11 +124,10 @@ kadatabase.o: kadatabase.c ${INCLS} kaprocs.o: kaprocs.c ${INCLS} kaport.h -kautils.h: kaerrors.c - -kaerrors.c: kaerrors.et kautils.p.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 kauth.xdr.lo: kauth.xdr.c kauth.h diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 15dc10ce2..7053e8257 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -28,76 +28,75 @@ ${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h ${INSTALL_DATA} $? $@ -afs_AdminBosErrors.h: afs_AdminBosErrors.c -afs_AdminBosErrors.c: afs_AdminBosErrors.et +afs_AdminBosErrors.c afs_AdminBosErrors.h: afs_AdminBosErrors.et ${INSTALL_DATA} ${srcdir}/afs_AdminErrors.h ${TOP_INCDIR}/afs $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminBosErrors.et -h afs_AdminBosErrors +afs_AdminBosErrors.h: afs_AdminBosErrors.c ${TOP_INCDIR}/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.h cp afs_AdminBosErrors.h ${TOP_INCDIR}/afs/afs_AdminBosErrors.h -afs_AdminCfgErrors.h: afs_AdminCfgErrors.c -afs_AdminCfgErrors.c: afs_AdminCfgErrors.et +afs_AdminCfgErrors.c afs_AdminCfgErrors.h: afs_AdminCfgErrors.et $(RM) -f ${srcdir}/afs_AdminCfgErrors.c afs_AdminCfgErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminCfgErrors.et -h afs_AdminCfgErrors +afs_AdminCfgErrors.h: afs_AdminCfgErrors.c ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.h cp afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h -afs_AdminClientErrors.h: afs_AdminClientErrors.c -afs_AdminClientErrors.c: afs_AdminClientErrors.et +afs_AdminClientErrors.c afs_AdminClientErrors.h: afs_AdminClientErrors.et $(RM) -f ${srcdir}/afs_AdminClientErrors.c afs_AdminClientErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminClientErrors.et -h afs_AdminClientErrors +afs_AdminClientErrors.h: afs_AdminClientErrors.c ${TOP_INCDIR}/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.h cp afs_AdminClientErrors.h ${TOP_INCDIR}/afs/afs_AdminClientErrors.h -afs_AdminMiscErrors.h: afs_AdminMiscErrors.c -afs_AdminMiscErrors.c: afs_AdminMiscErrors.et +afs_AdminMiscErrors.c afs_AdminMiscErrors.h: afs_AdminMiscErrors.et $(RM) -f ${srcdir}/afs_AdminMiscErrors.c afs_AdminMiscErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminMiscErrors.et -h afs_AdminMiscErrors +afs_AdminMiscErrors.h: afs_AdminMiscErrors.c ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.h cp afs_AdminMiscErrors.h ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h -afs_AdminCommonErrors.h: afs_AdminCommonErrors.c -afs_AdminCommonErrors.c: afs_AdminCommonErrors.et +afs_AdminCommonErrors.c afs_AdminCommonErrors.h: afs_AdminCommonErrors.et $(RM) -f ${srcdir}/afs_AdminCommonErrors.c afs_AdminCommonErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminCommonErrors.et -h afs_AdminCommonErrors +afs_AdminCommonErrors.h: afs_AdminCommonErrors.c ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.h cp afs_AdminCommonErrors.h ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h -afs_AdminKasErrors.h: afs_AdminKasErrors.c -afs_AdminKasErrors.c: afs_AdminKasErrors.et +afs_AdminKasErrors.c afs_AdminKasErrors.h: afs_AdminKasErrors.et $(RM) -f ${srcdir}/afs_AdminKasErrors.c afs_AdminKasErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminKasErrors.et -h afs_AdminKasErrors +afs_AdminKasErrors.h: afs_AdminKasErrors.c ${TOP_INCDIR}/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.h cp afs_AdminKasErrors.h ${TOP_INCDIR}/afs/afs_AdminKasErrors.h -afs_AdminPtsErrors.h: afs_AdminPtsErrors.c -afs_AdminPtsErrors.c: afs_AdminPtsErrors.et +afs_AdminPtsErrors.c afs_AdminPtsErrors.h: afs_AdminPtsErrors.et $(RM) -f ${srcdir}/afs_AdminPtsErrors.c afs_AdminPtsErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminPtsErrors.et -h afs_AdminPtsErrors +afs_AdminPtsErrors.h: afs_AdminPtsErrors.c ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.h cp afs_AdminPtsErrors.h ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h -afs_AdminUtilErrors.h: afs_AdminUtilErrors.c -afs_AdminUtilErrors.c: afs_AdminUtilErrors.et +afs_AdminUtilErrors.c afs_AdminUtilErrors.h: afs_AdminUtilErrors.et $(RM) -f ${srcdir}/afs_AdminUtilErrors.c afs_AdminUtilErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminUtilErrors.et -h afs_AdminUtilErrors +afs_AdminUtilErrors.h: afs_AdminUtilErrors.c ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.h cp afs_AdminUtilErrors.h ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h -afs_AdminVosErrors.c: afs_AdminVosErrors.et +afs_AdminVosErrors.c afs_AdminVosErrors.h: afs_AdminVosErrors.et $(RM) -f ${srcdir}/afs_AdminVosErrors.c afs_AdminVosErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminVosErrors.et -h afs_AdminVosErrors - -afs_AdminVosErrors.h: afs_AdminVosErrors.c +afs_AdminVosErrors.h: afs_AdminVosErrors.c ${TOP_INCDIR}/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.h cp afs_AdminVosErrors.h ${TOP_INCDIR}/afs/afs_AdminVosErrors.h diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index dee45137d..135fa3f0b 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -160,9 +160,10 @@ ptclient: ptclient.o libprot.a $(LIBS) ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c -pterror.h pterror.c: pterror.et +pterror.c pterror.h: pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${srcdir} pterror +pterror.h: pterror.c display.lo: $(INCLS) ptuser.lo: $(LINCLS) diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 4300d6a1b..d768a8021 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -93,11 +93,10 @@ 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.h: rxkad_errs.c - -rxkad_errs.c: rxkad_errs.et rxkad.p.h +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 tcrypt.o: tcrypt.c AFS_component_version_number.o diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 1acfe0eca..6248c4c30 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -71,7 +71,9 @@ 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 + $(RM) -f stress_errs.h stress_errs.c + ${COMPILE_ET} -p ${srcdir} stress_errs -h stress_errs +stress_errs.h: stress_errs.c stress.o: ${HEADERS} stress_c.o: ${HEADERS} diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 34751f8f0..32b456cff 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -48,11 +48,10 @@ 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.h: budb_errs.c - -budb_errs.c: ${BUDB}/budb_errs.et - $(RM) -f budb_errs.c +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 # # Build targets diff --git a/src/tools/dumpscan/Makefile.in b/src/tools/dumpscan/Makefile.in index 13c152aff..a829c6523 100644 --- a/src/tools/dumpscan/Makefile.in +++ b/src/tools/dumpscan/Makefile.in @@ -72,10 +72,14 @@ 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 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 5a217c602..fcf411882 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -146,10 +146,10 @@ pt_util.o: ${PTSERVER}/pt_util.c ptubik.o: ${PTSERVER}/ptubik.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/ptubik.c -pterror.h: pterror.c -pterror.c: ${PTSERVER}/pterror.et +pterror.c pterror.h: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${PTSERVER} pterror +pterror.h: pterror.c prerror.h: pterror.h ${INSTALL} $? $@ diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index 5b81f5a39..947c8cfe9 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -112,8 +112,10 @@ vlclient.o: ${VLSERVER}/vlclient.c vl_errors.o: vl_errors.c -vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h - $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver +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 system: install diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 77c1800ee..14725c5a2 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -89,8 +89,10 @@ volint.xdr.o: ../volser/volint.xdr.c lockprocs.o: ${VOLSER}/lockprocs.c $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c -vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h - $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver +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 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 f52ebeb8d..e9cd30c2e 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -119,11 +119,10 @@ 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 -ubik.h: uerrors.c - -uerrors.c: uerrors.et ubik.p.h +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 libubik.a: ${LT_objs} $(LT_LDLIB_lwp) $(LT_objs) diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 13957e460..a2df96ff0 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -143,8 +143,11 @@ vlclient: vlclient.o libvldb.a $(LIBS) vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o vl_errors.o: vl_errors.c -vlserver.h vl_errors.c: vl_errors.et vlserver.p.h - $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver + +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 vlserver.o: vlserver.c diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 406695965..335c8bee0 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -124,11 +124,10 @@ liboafs_volser.la: liboafs_volser.la.sym $(LT_objs) $(LT_deps) libauthent_volser.la: $(LT_objs) $(LT_LDLIB_pic) $(LT_objs) -volser.h: volerr.c - -volerr.c: volerr.et volser.p.h +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 volint.cs.c: volint.xg ${RXGEN} -A -x -C -o $@ ${srcdir}/volint.xg -- 2.39.5