From 01bf3b2ad70d63759588860b4ceed83bac3572a3 Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Mon, 21 Oct 2013 14:23:50 +0200 Subject: [PATCH] Revert "build: compile_et rules for parallel make" This reverts commit 6c3adb6db781ef4b15d9336a63b40d3a79b11264. While gerrit 10310 may be correct, it at least triggers some other problem, causing significantly higher failure rates for parallel builds. This is especially true in combination with gerrit 10337, where there's at least one known case of 100% failure rate. A different solution, modifying compile_et to allow it to emit a single file per invocation, is being worked on. For the time being, revert 10310 on the 1.6 branch to get parallel build stability back to the previous level. Change-Id: I372d64868f7f7d0e7185f575212f16e453299b1c Reviewed-on: http://gerrit.openafs.org/10349 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Marc Dionne Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- 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 | 5 ++-- src/dvolser/Makefile.in | 6 ++--- src/kauth/Makefile.in | 5 ++-- src/libadmin/adminutil/Makefile.in | 37 +++++++++++++++--------------- src/ptserver/Makefile.in | 3 +-- src/rxkad/Makefile.in | 1 - src/rxkad/test/Makefile.in | 4 +--- src/tbudb/Makefile.in | 7 +++--- src/tptserver/Makefile.in | 3 +-- src/tubik/Makefile.in | 1 - src/tvlserver/Makefile.in | 6 ++--- src/tvolser/Makefile.in | 6 ++--- src/ubik/Makefile.in | 1 - src/vlserver/Makefile.in | 7 ++---- src/volser/Makefile.in | 5 ++-- 21 files changed, 62 insertions(+), 71 deletions(-) diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 81cd4ab6b..66d6c024f 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -18,14 +18,12 @@ all: depinstall generated: afs_trace.h afs_trace.msf unified_afs.c unified_afs.h -afs_trace.msf afs_trace.h: afs_trace.et +afs_trace.h afs_trace.msf: 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 6539ca5cb..c1cf575f6 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -100,14 +100,12 @@ 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} -p ${srcdir} acfg_errors -h cellconfig -cellconfig.h: acfg_errors.c 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} -p ${srcdir} ktc_errors -h auth -auth.h: ktc_errors.c # # Install targets diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 691b8fe83..de114bceb 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -79,10 +79,11 @@ bosint.cs.c: bosint.h bosint.ss.c: bosint.h bosint.xdr.c: bosint.h -boserr.c bnode.h: bnode.p.h boserr.et +bnode.h: boserr.c + +boserr.c: 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 0ed202ebe..4c94f1976 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -82,20 +82,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 +butm.h: butm_errs.c + +butm_errs.c: 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 +tcdata.h: butc_errs.c + +butc_errs.c: 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 +butx.h: butx_errs.c + +butx_errs.c: 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 f1cdabf21..b41086d31 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -69,10 +69,11 @@ $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h backup: $(BACKOBJS) ${LIBS} ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS} ${KRB5_LIBS} -bucoord_errs.c bc.h: bucoord_errs.et bc.p.h +bc.h: bucoord_errs.c + +bucoord_errs.c: 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 e4b36c76f..4b2c8a542 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -72,10 +72,11 @@ ${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 +budb_errs.h: budb_errs.c + +budb_errs.c: 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 5cfd4fe34..260bcc099 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -30,10 +30,11 @@ ${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 +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_errors.o: cmd_errors.c diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index 928fc2695..46bdd8d22 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -130,10 +130,8 @@ aclprocs.o: ${LIBACL}/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c ${COMPILE} -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 +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.o: vl_errors.c ${COMPILE} diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index a698cc138..e2157cb25 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -109,10 +109,11 @@ kaauxdb.o: kaauxdb.c kaerrors.o: kaerrors.c -kaerrors.c kautils.h: kaerrors.et kautils.p.h +kautils.h: kaerrors.c + +kaerrors.c: kaerrors.et kautils.p.h $(RM) -f kautils.h kaerrors.c ${COMPILE_ET} -p ${srcdir} kaerrors -h kautils -kautils.h: kaerrors.c kauth.ss.o: kauth.ss.c kauth.cs.o: kauth.cs.c diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index aae7a90d3..434d1e55b 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -33,75 +33,76 @@ ${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h ${INSTALL_DATA} $? $@ -afs_AdminBosErrors.c afs_AdminBosErrors.h: afs_AdminBosErrors.et +afs_AdminBosErrors.h: afs_AdminBosErrors.c +afs_AdminBosErrors.c: 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.c afs_AdminCfgErrors.h: afs_AdminCfgErrors.et +afs_AdminCfgErrors.h: afs_AdminCfgErrors.c +afs_AdminCfgErrors.c: 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.c afs_AdminClientErrors.h: afs_AdminClientErrors.et +afs_AdminClientErrors.h: afs_AdminClientErrors.c +afs_AdminClientErrors.c: 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.c afs_AdminMiscErrors.h: afs_AdminMiscErrors.et +afs_AdminMiscErrors.h: afs_AdminMiscErrors.c +afs_AdminMiscErrors.c: 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.c afs_AdminCommonErrors.h: afs_AdminCommonErrors.et +afs_AdminCommonErrors.h: afs_AdminCommonErrors.c +afs_AdminCommonErrors.c: 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.c afs_AdminKasErrors.h: afs_AdminKasErrors.et +afs_AdminKasErrors.h: afs_AdminKasErrors.c +afs_AdminKasErrors.c: 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.c afs_AdminPtsErrors.h: afs_AdminPtsErrors.et +afs_AdminPtsErrors.h: afs_AdminPtsErrors.c +afs_AdminPtsErrors.c: 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.c afs_AdminUtilErrors.h: afs_AdminUtilErrors.et +afs_AdminUtilErrors.h: afs_AdminUtilErrors.c +afs_AdminUtilErrors.c: 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.h: afs_AdminVosErrors.et +afs_AdminVosErrors.c: 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 47d25777f..d4663c8b2 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -155,10 +155,9 @@ ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c ptuser.o: ptuser.c ${LINCLS} -pterror.c pterror.h: pterror.et +pterror.h pterror.c: pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${srcdir} pterror -pterror.h: pterror.c libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(RM) -f $@ diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 7a3be2e57..2cce5dbe2 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -75,7 +75,6 @@ rxkad_errs.o: rxkad_errs.c 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 ticket.o: ticket.c lifetimes.h ${INCLS} $(CC) $(CFLAGS) -c ${srcdir}/ticket.c diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 6e2bb53ce..8af723936 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -71,9 +71,7 @@ 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 + $(RM) -f stress_errs.h stress_errs.c; ${COMPILE_ET} -p ${srcdir} stress_errs -h stress_errs stress.o: ${HEADERS} stress_c.o: ${HEADERS} diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 6d65dec5c..7dff78c5d 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -58,11 +58,12 @@ 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 ${srcdir}/${BUDB} budb_errs budb_errs.h: budb_errs.c +budb_errs.c: ${BUDB}/budb_errs.et + $(RM) -f budb_errs.c + ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs + # # Build targets # diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 9b797542c..40c75196d 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -174,10 +174,9 @@ ptclient.o: ${PTSERVER}/ptclient.c ${INCLS} ptuser.o: ${PTSERVER}/ptuser.c ${INCLS} ${CCRULE} ${srcdir}/${PTSERVER}/ptuser.c -pterror.c pterror.h: ${PTSERVER}/pterror.et +pterror.h pterror.c: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror -pterror.h: pterror.c pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS} $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS} diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 325a03b1d..3a78dd113 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -179,7 +179,6 @@ uerrors.o: uerrors.c uerrors.c ubik.h: ${srcdir}/uerrors.et ${srcdir}/ubik.p.h $(RM) -f ubik.h uerrors.c ${COMPILE_ET} -p ${srcdir} uerrors -h ubik -ubik.h: uerrors.c libubik_pthread.a: ${INCLS} ${LIBOBJS} AFS_component_version_number.o -$(RM) -f $@ diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index c9cf5d412..949065e45 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -179,10 +179,8 @@ vlclient.o: ${VLSERVER}/vlclient.c vl_errors.o: vl_errors.c ${CCRULE} 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 ${srcdir}/${VLSERVER} vl_errors -h vlserver -vlserver.h: 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 ${srcdir}/${VLSERVER} vl_errors -h vlserver system: install diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 042a15613..5e3c9e690 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -137,10 +137,8 @@ aclprocs.o: ${LIBACL}/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c ${COMPILE} -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 +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.o: vl_errors.c ${COMPILE} diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 5643f6c89..d219d28b2 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -111,7 +111,6 @@ 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 libubik.a: ${LIBOBJS} AFS_component_version_number.o -$(RM) -f $@ diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 16e32ce4e..3e7ad4bbd 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -129,11 +129,8 @@ vlclient: vlclient.o libvldb.a $(LIBS) 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 +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 vlserver.o: vlserver.c diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 4ff2e400b..5e5ac6d3d 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -104,10 +104,11 @@ libvolser.a: volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o $(AR) crv $@ volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o $(RANLIB) $@ -volerr.c volser.h: volerr.et volser.p.h +volser.h: volerr.c + +volerr.c: 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