[paparazzi-commits] [5872] 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

[Allen Ibara]

Revision: 5872
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5872
Author:   aibara
Date:     2010-09-14 22:26:38 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
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

Modified Paths:
--------------
    paparazzi3/trunk/Makefile

Modified: paparazzi3/trunk/Makefile
===================================================================
--- paparazzi3/trunk/Makefile   2010-09-14 22:18:02 UTC (rev 5871)
+++ paparazzi3/trunk/Makefile   2010-09-14 22:26:38 UTC (rev 5872)
@@ -87,7 +87,7 @@
 logalizer: lib
        cd $(LOGALIZER); $(MAKE)
 
-sim_static :
+sim_static : lib
        cd $(SIMULATOR); $(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC)
 
 cockpit: lib
@@ -104,36 +104,36 @@
 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 $@