Yet another fix for the srcdir race problem. We'll just remove the srcdir copies whenever we regenerate the files.

Fallout from bug 141834

mailnews/mapi/mapihook/build/Makefile.in

@@ -43,7 +43,9 @@ OS_LIBS		+= rpcrt4.lib
 
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
-GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(addprefix $(srcdir)/,$(CSRCS))
+SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
+
+GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 include $(topsrcdir)/config/rules.mk
 
@@ -52,12 +54,19 @@ DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
 $(MIDL_GENERATED_FILES): done_gen
 
 done_gen: msgMapi.idl
+	$(RM) $(SRCDIR_CSRCS)
 	$(MIDL) $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
 	touch $@
 
-$(addprefix $(srcdir)/,$(CSRCS)): %.c: done_gen
-	@if cmp -s $(@F) $@; then cp $(@F) $@; fi
+copy_csrcs: done_gen
+	@for f in $(CSRCS); do \
+	    if test ! -f $(srcdir)/$$f; then \
+		cp $$f $(srcdir)/$$f; \
+	    fi ; \
+	done
 
-export:: done_gen $(addprefix $(srcdir)/,$(CSRCS))
+$(SRCDIR_CSRCS): copy_csrcs
+
+export:: done_gen copy_csrcs
 
 

widget/src/windows/expose/ISimpleDOMDocument/Makefile.in

@@ -54,7 +54,9 @@ MIDL_GENERATED_FILES = \
 		dlldata.c \
 		$(NULL)
 
-GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS)
+SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
+
+GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 FORCE_SHARED_LIB = 1
 
@@ -63,15 +65,22 @@ include $(topsrcdir)/config/rules.mk
 $(MIDL_GENERATED_FILES): done_gen
 
 done_gen: ISimpleDOMDocument.idl
+	$(RM) $(SRCDIR_CSRCS)
 	$(MIDL) $(srcdir)/ISimpleDOMDocument.idl
 	cp ISimpleDOMDocument.h ../..
 	cp ISimpleDOMDocument_i.c ../../ISimpleDOMDocument_iid.h
 	touch $@
 
-$(addprefix $(srcdir)/,$(CSRCS)): %.c: done_gen
-	@if cmp -s $(@F) $@; then cp $(@F) $@; fi
+copy_csrcs: done_gen
+	@for f in $(CSRCS); do \
+	    if test ! -f $(srcdir)/$$f; then \
+		cp $$f $(srcdir)/$$f; \
+	    fi ; \
+	done
 
-export:: done_gen $(addprefix $(srcdir)/,$(CSRCS))
+$(SRCDIR_CSRCS): copy_csrcs
+
+export:: done_gen copy_csrcs
 
 libs::
 	regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)

widget/src/windows/expose/ISimpleDOMNode/Makefile.in

@@ -54,7 +54,9 @@ MIDL_GENERATED_FILES = \
 		dlldata.c \
 		$(NULL)
 
-GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS)
+SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
+
+GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 FORCE_SHARED_LIB = 1
 
@@ -63,15 +65,22 @@ include $(topsrcdir)/config/rules.mk
 $(MIDL_GENERATED_FILES): done_gen
 
 done_gen: ISimpleDOMNode.idl
+	$(RM) $(SRCDIR_CSRCS)
 	$(MIDL) $(srcdir)/ISimpleDOMNode.idl
 	cp ISimpleDOMNode.h ../..
 	cp ISimpleDOMNode_i.c ../../ISimpleDOMNode_iid.h
 	touch $@
 
-$(addprefix $(srcdir)/,$(CSRCS)): %.c: done_gen
-	@if cmp -s $(@F) $@; then cp $(@F) $@; fi
+copy_csrcs: done_gen
+	@for f in $(CSRCS); do \
+	    if test ! -f $(srcdir)/$$f; then \
+		cp $$f $(srcdir)/$$f; \
+	    fi ; \
+	done
 
-export:: done_gen $(addprefix $(srcdir)/,$(CSRCS))
+$(SRCDIR_CSRCS): copy_csrcs
+
+export:: done_gen copy_csrcs
 
 libs::
 	regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)