From e9cd8ff4027cd153a6f71b5da3a092ee60fce6e6 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 24 May 2016 17:20:47 -0400 Subject: Remove duplicate cli-test target --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9c0661b..b51c74d 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ $(MBED_DIR)/libstmf4.a: board-test: $(BOARD_OBJS) $(LIBS) $(MAKE) -C projects/board-test -cli-test: $(BOARD_OBJS) $(LIBS) +cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a $(MAKE) -C projects/cli-test $(RTOS_DIR)/librtos.a: @@ -132,9 +132,6 @@ libhal-test: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a hsm: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a $(MAKE) -C projects/hsm -cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a - $(MAKE) -C projects/cli-test - # don't automatically delete objects, to avoid a lot of unnecessary rebuilding .SECONDARY: $(BOARD_OBJS) @@ -143,6 +140,7 @@ cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a clean: rm -f $(BOARD_OBJS) $(MAKE) -C projects/board-test clean + $(MAKE) -C projects/cli-test clean $(MAKE) -C projects/rtos-test clean $(MAKE) -C projects/libhal-test clean $(MAKE) -C projects/hsm clean -- cgit v1.2.3 From d41a0247903218dde01b65d0de373e8e0a19541c Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 24 May 2016 21:33:59 -0400 Subject: Try harder to pick up updates from our submodules. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2c4710f..57ed42c 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ export CFLAGS all: board-test cli-test libhal-test hsm init: - git submodule update --init --recursive + git submodule update --init --recursive --remote $(MBED_DIR)/libstmf4.a: $(MAKE) -C $(MBED_DIR) -- cgit v1.2.3