From 3337dc794b4d5b9f58520ea87e15d74e218bd44e Mon Sep 17 00:00:00 2001 From: Allen Ibara Date: Wed, 15 Sep 2010 03:15:08 +0000 Subject: [PATCH] use msg2.h and dl2.h tmp filenames in build to avoid clash with msg.h and dl.h during parallel build --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed631b3d3d..4336536076 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ $(MESSAGES_H) : $(MESSAGES_XML) $(CONF_XML) tools $(MESSAGES2_H) : $(MESSAGES_XML) $(CONF_XML) tools $(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE) @echo BUILD $@ - $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages2.out $< telemetry > /tmp/msg.h - $(Q)mv /tmp/msg.h $@ + $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages2.out $< telemetry > /tmp/msg2.h + $(Q)mv /tmp/msg2.h $@ $(Q)chmod a+r $@ $(UBX_PROTOCOL_H) : $(UBX_XML) tools @@ -135,8 +135,8 @@ $(DL_PROTOCOL_H) : $(MESSAGES_XML) tools $(DL_PROTOCOL2_H) : $(MESSAGES_XML) tools @echo BUILD $@ - $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages2.out $< datalink > /tmp/dl.h - $(Q)mv /tmp/dl.h $@ + $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages2.out $< datalink > /tmp/dl2.h + $(Q)mv /tmp/dl2.h $@ include Makefile.ac