From e759a9046311323ca49053da41bee1c190140a08 Mon Sep 17 00:00:00 2001 From: Christophe De Wagter Date: Mon, 17 Aug 2015 16:49:35 +0200 Subject: [PATCH] [telemetry] Bluegiga dongle builds automatically --- .gitignore | 1 - Makefile | 3 +++ sw/tools/bluegiga_usb_dongle/.gitignore | 2 ++ sw/tools/bluegiga_usb_dongle/Makefile | 5 +++-- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 sw/tools/bluegiga_usb_dongle/.gitignore diff --git a/.gitignore b/.gitignore index 4a3797ab1f..172b21d315 100644 --- a/.gitignore +++ b/.gitignore @@ -141,7 +141,6 @@ paparazzi.sublime-workspace # /sw/tools/ /sw/tools/wiki_gen/wiki_gen /sw/tools/mergelogs -/sw/tools/bluegiga_usb_dongle/*.d # /sw/ground_segment/misc /sw/ground_segment/misc/davis2ivy diff --git a/Makefile b/Makefile index b3354c1cae..b6159f71f3 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ TMTC=sw/ground_segment/tmtc GENERATORS=$(PAPARAZZI_SRC)/sw/tools/generators JOYSTICK=sw/ground_segment/joystick EXT=sw/ext +TOOLS=sw/tools # # build some stuff in subdirs @@ -164,6 +165,7 @@ sim_static: libpprz ext: $(MAKE) -C $(EXT) + $(MAKE) -C $(TOOLS)/bluegiga_usb_dongle # # make misc subdirs @@ -281,6 +283,7 @@ clean: $(Q)rm -f $(GEN_HEADERS) $(Q)find . -mindepth 2 -name Makefile -a ! -path "./sw/ext/*" -exec sh -c 'echo "Cleaning {}"; $(MAKE) -C `dirname {}` $@' \; $(Q)$(MAKE) -C $(EXT) clean + $(Q)$(MAKE) -C $(TOOLS)/bluegiga_usb_dongle clean $(Q)find . -name '*~' -exec rm -f {} \; cleanspaces: diff --git a/sw/tools/bluegiga_usb_dongle/.gitignore b/sw/tools/bluegiga_usb_dongle/.gitignore new file mode 100644 index 0000000000..b5273df583 --- /dev/null +++ b/sw/tools/bluegiga_usb_dongle/.gitignore @@ -0,0 +1,2 @@ +*.d +drone-telemetry-demo diff --git a/sw/tools/bluegiga_usb_dongle/Makefile b/sw/tools/bluegiga_usb_dongle/Makefile index 5d6926e834..e1a5f6a4f9 100644 --- a/sw/tools/bluegiga_usb_dongle/Makefile +++ b/sw/tools/bluegiga_usb_dongle/Makefile @@ -1,3 +1,4 @@ +Q=@ CC = gcc TARGET = drone-telemetry-demo @@ -21,11 +22,11 @@ DEPS := $(SRCS:.c=.d) all: $(TARGET) %.o: %.c - $(CC) -O3 -Wall -c -fmessage-length=0 -DPLATFORM_$(PLATFORM) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" + i$(Q)$(CC) -O3 -Wall -c -fmessage-length=0 -DPLATFORM_$(PLATFORM) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" $(TARGET): $(OBJS) @echo 'Building target: $@' - $(CC) -o $(TARGET) $(OBJS) $(LIBS) + $(Q)$(CC) -o $(TARGET) $(OBJS) $(LIBS) @echo 'Finished building target: $@' clean: