VBoot Reference: Refactoring Part 3

src/platform/vboot_reference/tests/Makefile

Index: src/platform/vboot_reference/tests/Makefile
diff --git a/src/platform/vboot_reference/tests/Makefile b/src/platform/vboot_reference/tests/Makefile
index 99e2d3a4904a9773fa85f7ae4cab3e32b7fec22e..b14f74f6e04e27c9f2fd2f7b634b9d47f2f731fa 100644
--- a/src/platform/vboot_reference/tests/Makefile
+++ b/src/platform/vboot_reference/tests/Makefile
@@ -4,15 +4,18 @@
 
 CC ?= gcc
 CFLAGS ?= -Wall -DNDEBUG -O3 -Werror
-INCLUDES ?= -I../include/
-TOP ?= ../
-
-BASE_LIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
-IMAGE_LIBS = $(TOP)/utils/firmware_image.o \
-		$(TOP)/utils/firmware_image_fw.o \
-		$(TOP)/utils/kernel_image.o \
-		$(TOP)/utils/kernel_image_fw.o
-UTIL_LIBS = $(TOP)/utils/file_keys.o $(TOP)/utils/signature_digest.o
+INCLUDES += -I./include \
+		-I../cryptolib/include \
+		-I../common/include \
+		-I../misclibs/include \
+		-I../vfirmware/include\
+		-I../vkernel/include
+BASE_LIBS = $(TOP)/cryptolib/libcrypto.a $(TOP)/common/libcommon.a
+IMAGE_LIBS = $(TOP)/vfirmware/firmware_image.o \
+		$(TOP)/vfirmware/firmware_image_fw.o \
+		$(TOP)/vkernel/kernel_image.o \
+		$(TOP)/vkernel/kernel_image_fw.o
+UTIL_LIBS = $(TOP)/misclibs/file_keys.o $(TOP)/misclibs/signature_digest.o
 LIBS = $(IMAGE_LIBS) $(UTIL_LIBS) -lcrypto $(BASE_LIBS)
 
 TEST_BINS = big_firmware_tests \