From 5ff9cd199a8b12e286afd1f5e5358bf57d52e1a3 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Mon, 6 Sep 2010 15:37:40 +0000 Subject: [PATCH] generating dl_protocal2.h based on the using gen_messages2 --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f224104373..c7bc9e65fc 100644 --- a/Makefile +++ b/Makefile @@ -51,12 +51,14 @@ MESSAGES2_H=$(STATICINCLUDE)/messages2.h UBX_PROTOCOL_H=$(STATICINCLUDE)/ubx_protocol.h XSENS_PROTOCOL_H=$(STATICINCLUDE)/xsens_protocol.h DL_PROTOCOL_H=$(STATICINCLUDE)/dl_protocol.h +DL_PROTOCOL2_H=$(STATICINCLUDE)/dl_protocol2.h MESSAGES_XML = $(CONF)/messages.xml UBX_XML = $(CONF)/ubx.xml XSENS_XML = $(CONF)/xsens_MTi-G.xml TOOLS=$(PAPARAZZI_SRC)/sw/tools HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc) ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),) +#ARMGCC=/opt/paparazzi/bin/arm-elf-gcc ARMGCC=/usr/bin/arm-elf-gcc else ARMGCC=/usr/bin/arm-none-eabi-gcc @@ -97,7 +99,7 @@ tmtc: lib multimon: cd $(MULTIMON); $(MAKE) -static_h: $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(DL_PROTOCOL_H) +static_h: $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(DL_PROTOCOL_H) $(DL_PROTOCOL2_H) 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" @@ -131,6 +133,11 @@ $(DL_PROTOCOL_H) : $(MESSAGES_XML) $(TOOLS)/gen_messages.out $(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 + @echo BUILD $@ + $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(TOOLS)/gen_messages2.out $< datalink > /tmp/dl.h + $(Q)mv /tmp/dl.h $@ + include Makefile.ac sim : sim_static