Fix up a couple issues with multi-core builds and 2 race conditions

diff --git a/cde/.gitignore b/cde/.gitignore
index faaf2db978e5060cee9a797c02925b15b3e9952d..65a23db4ad834f4213d220fb11d151430df0076f 100644 (file)
--- 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 6b5617866979ec1d094892aa2443bdef235ef318..541ad828885621cb72c37dd1d3cd286bf00a80b9 100644 (file)
--- 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 c875ce72e4a5978391d3feb74e231575fe7b2edd..61aeae66d0f1c72cb0099a739d1609e9744fa818 100644 (file)
--- 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