From e3db117ae05a248773abe4b7ec2ef95ed7203b8e Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Sat, 25 Jun 2016 15:13:43 -0400
Subject: Split LIB*_DIR into _SRC and _BLD.

Also rename all instances of GNUmakefile to Makefile.
---
 projects/cli-test/Makefile    | 6 +++---
 projects/hsm/Makefile         | 8 ++++----
 projects/libhal-test/Makefile | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'projects')

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)
 
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index b1718b3..06cfcc2 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -30,13 +30,13 @@ ifndef CRYPTECH_ROOT
   CRYPTECH_ROOT := $(abspath ../../../..)
 endif
 
-CFLAGS += -I$(CRYPTECH_ROOT)/sw/libhal
-CFLAGS += -I$(LIBCLI_DIR)
+CFLAGS += -I$(LIBHAL_SRC)
+CFLAGS += -I$(LIBCLI_SRC)
 CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M
 
-LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
+LIBS += $(LIBHAL_BLD)/libhal.a $(LIBTFM_BLD)/libtfm.a
+LIBS += $(LIBCLI_BLD)/libcli.a
 LIBS += $(RTOS_DIR)/librtos.a
-LIBS += $(LIBCLI_DIR)/libcli.a
 
 all: $(PROJ:=.elf)
 
diff --git a/projects/libhal-test/Makefile b/projects/libhal-test/Makefile
index f58f480..7aa8d3e 100644
--- a/projects/libhal-test/Makefile
+++ b/projects/libhal-test/Makefile
@@ -1,12 +1,12 @@
 TEST = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa test-mkmif
 
-CFLAGS += -I $(LIBHAL_DIR)
+CFLAGS += -I $(LIBHAL_SRC)
 LIBC_OBJS = printf.o gettimeofday.o
-LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
+LIBS += $(LIBHAL_BLD)/libhal.a $(LIBTFM_BLD)/libtfm.a
 
 all: $(TEST:=.elf)
 
-vpath %.c $(LIBHAL_DIR)/tests $(LIBHAL_DIR)/utils
+vpath %.c $(LIBHAL_SRC)/tests $(LIBHAL_SRC)/utils
 
 # .mo extension for files with main() that need to be wrapped as __main()
 %.mo: %.c
-- 
cgit v1.2.3