aboutsummaryrefslogtreecommitdiff
path: root/projects/cli-test
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2016-06-25 15:13:43 -0400
committerPaul Selkirk <paul@psgd.org>2016-06-25 15:13:51 -0400
commite3db117ae05a248773abe4b7ec2ef95ed7203b8e (patch)
treef093767315ebc72264cbc858a40c5b616bef139e /projects/cli-test
parentaa90cb43b370ee219e1e14ad774b662a53178727 (diff)
Split LIB*_DIR into _SRC and _BLD.
Also rename all instances of GNUmakefile to Makefile.
Diffstat (limited to 'projects/cli-test')
-rw-r--r--projects/cli-test/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile
index e043566..ba80c88 100644
--- a/projects/cli-test/Makefile
+++ b/projects/cli-test/Makefile
@@ -1,6 +1,6 @@
TEST = cli-test
-OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c
+OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c mgmt-keystore.o
BOARD_OBJS = \
$(TOPLEVEL)/stm-init.o \
@@ -18,10 +18,10 @@ BOARD_OBJS = \
$(BOARD_DIR)/stm32f4xx_hal_msp.o \
$(BOARD_DIR)/stm32f4xx_it_rtos.o
-CFLAGS += -I$(LIBCLI_DIR)
+CFLAGS += -I$(LIBCLI_SRC) -I$(LIBHAL_SRC)
CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M
-LIBS += $(LIBCLI_DIR)/libcli.a $(RTOS_DIR)/librtos.a
+LIBS += $(LIBCLI_BLD)/libcli.a $(LIBHAL_BLD)/libhal.a $(RTOS_DIR)/librtos.a
all: $(TEST:=.elf)