VBoot Reference: Refactoring Part 3

src/platform/vboot_reference/tests/Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 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 \
                 big_kernel_tests \
                 firmware_image_tests \
                 firmware_rollback_tests \
                 firmware_splicing_tests \
                 firmware_verify_benchmark \
                 kernel_image_tests \
                 kernel_rollback_tests \
@@ skipping 60 matching lines @@
 
 verify_firmware_fuzz_driver: verify_firmware_fuzz_driver.c \
         rollback_index_mock.c
         $(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
 
 verify_kernel_fuzz_driver: verify_kernel_fuzz_driver.c rollback_index_mock.c
         $(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
 
 clean:
         rm -f $(TEST_BINS)