diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2016-05-25 14:40:16 +0200 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2016-05-25 14:40:16 +0200 |
| commit | e5d76aca550df4526783dd938b6a339b26c244fe (patch) | |
| tree | 581b80b28c6bda4550ffd2d79e74cca8fb7173da /Makefile | |
| parent | 50036d875d0264419362a990b6005ca5f1693772 (diff) | |
| parent | d41a0247903218dde01b65d0de373e8e0a19541c (diff) | |
Merge remote-tracking branch 'origin/master' into ft-dfu-code-loading
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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) @@ -108,7 +108,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: @@ -133,9 +133,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) @@ -144,6 +141,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 |