From 73c3a9950b8358aec7ea6fa8a4edb2bb1800d342 Mon Sep 17 00:00:00 2001
From: Allen Ibara <uce.savannah@ibara.net>
Date: Tue, 14 Sep 2010 22:26:38 +0000
Subject: [PATCH] make sim_static depend on lib, make generated header files
 (messages[2],ubx_protocol,xsens_protocol,dl_protorol[2] depend on tools --
 helps for parallel make

---
 Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c7bc9e65fc..ed631b3d3d 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ tools: lib
 logalizer: lib
 	cd $(LOGALIZER); $(MAKE)
 
-sim_static :
+sim_static : lib
 	cd $(SIMULATOR); $(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC)
 
 cockpit: lib
@@ -104,36 +104,36 @@ static_h: $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(D
 usb_lib:
 	@[ -d sw/airborne/arm7/lpcusb ] && ((test -x $(ARMGCC) && (cd sw/airborne/arm7/lpcusb; $(MAKE))) || echo "Not building usb_lib: ARMGCC=$(ARMGCC) not found") || echo "Not building usb_lib: sw/airborne/arm7/lpcusb directory missing"
 
-$(MESSAGES_H) : $(MESSAGES_XML) $(CONF_XML) $(TOOLS)/gen_messages.out
+$(MESSAGES_H) : $(MESSAGES_XML) $(CONF_XML) tools
 	$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
 	@echo BUILD $@
 	$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages.out $< telemetry > /tmp/msg.h
 	$(Q)mv /tmp/msg.h $@
 	$(Q)chmod a+r $@
 
-$(MESSAGES2_H) : $(MESSAGES_XML) $(CONF_XML) $(TOOLS)/gen_messages2.out
+$(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)chmod a+r $@
 
-$(UBX_PROTOCOL_H) : $(UBX_XML) $(TOOLS)/gen_ubx.out
+$(UBX_PROTOCOL_H) : $(UBX_XML) tools
 	@echo BUILD $@
 	$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_ubx.out $< > /tmp/ubx.h
 	$(Q)mv /tmp/ubx.h $@
 
-$(XSENS_PROTOCOL_H) : $(XSENS_XML) $(TOOLS)/gen_xsens.out
+$(XSENS_PROTOCOL_H) : $(XSENS_XML) tools
 	@echo BUILD $@
 	$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_xsens.out $< > /tmp/xsens.h
 	$(Q)mv /tmp/xsens.h $@
 
-$(DL_PROTOCOL_H) : $(MESSAGES_XML) $(TOOLS)/gen_messages.out
+$(DL_PROTOCOL_H) : $(MESSAGES_XML) tools
 	@echo BUILD $@
 	$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages.out $< datalink > /tmp/dl.h
 	$(Q)mv /tmp/dl.h $@
 
-$(DL_PROTOCOL2_H) : $(MESSAGES_XML) $(TOOLS)/gen_messages2.out
+$(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 $@