From 264871cefb3c18e586e56028123d74dbe3c73445 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 22 Nov 2019 13:42:02 -0700 Subject: [PATCH] Fix up a couple issues with multi-core builds and 2 race conditions --- cde/.gitignore | 1 + cde/programs/dtcm/server/Makefile.am | 3 +-- cde/programs/dtprintinfo/Makefile.am | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cde/.gitignore b/cde/.gitignore index faaf2db9..65a23db4 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -478,6 +478,7 @@ programs/dtcm/libDtCmP/getdate.c programs/dtcm/server/parser.c programs/dtcm/server/parser.h programs/dtcm/server/rpc.cmsd +programs/dtcm/server/y.tab* # programs/dtconfig programs/dtconfig/hp/dtconfig diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am index 6b561786..541ad828 100644 --- a/cde/programs/dtcm/server/Makefile.am +++ b/cde/programs/dtcm/server/Makefile.am @@ -26,7 +26,7 @@ rpc_cmsd_SOURCES = parser.c access.c callback.c cmscalendar.c \ lookup.h rpcextras.h v5ops.h BUILT_SOURCES = parser.c parser.h -CLEANFILES = parser.c parser.h +CLEANFILES = parser.c parser.h y.tab.c y.tab.h AM_YFLAGS = -d @@ -34,5 +34,4 @@ parser.c parser.h: parser.y $(YACC) $(AM_YFLAGS) $< $(SED) -e "s/yy/yyy/g" -e "/# line/d" y.tab.c > parser.c $(SED) -e 's/yy/yyy/g' y.tab.h > parser.h - $(RM) y.tab.c y.tab.h diff --git a/cde/programs/dtprintinfo/Makefile.am b/cde/programs/dtprintinfo/Makefile.am index c875ce72..61aeae66 100644 --- a/cde/programs/dtprintinfo/Makefile.am +++ b/cde/programs/dtprintinfo/Makefile.am @@ -61,7 +61,8 @@ SYM2NUM_CMD = CPP=$(GENCPP) $(KSH) sym2num BUILT_SOURCES = dtprintinfo_cat.h dtprintinfo_msg.h dtprintinfo.msg CLEANFILES = $(BUILT_SOURCES) -dtprintinfo_msg.h dtprintinfo.msg: dtprintinfo.msg.src +# this will also create dtprintinfo_msg.h +dtprintinfo.msg: dtprintinfo.msg.src $(RM) dtprintinfo_msg.h dtprintinfo.msg $(SYM2NUM_CMD) dtprintinfo dtprintinfo.msg.src > dtprintinfo.msg -- 2.25.1