Index: src/platform/vboot_reference/utility/Makefile |
diff --git a/src/platform/vboot_reference/utility/Makefile b/src/platform/vboot_reference/utility/Makefile |
index 86bd35d54673e6969156df7fd8b497b6902e4a1c..78b967adf5ad9dd2072c8ce8973bec742e0359bc 100644 |
--- a/src/platform/vboot_reference/utility/Makefile |
+++ b/src/platform/vboot_reference/utility/Makefile |
@@ -6,8 +6,7 @@ TOP ?= ../ |
CC ?= gcc |
CXX ?= g++ |
INCLUDES += -I./include \ |
- -I../cryptolib/include \ |
- -I../common/include \ |
+ -I$(FWDIR)/lib/cryptolib/include \ |
-I../misclibs/include \ |
-I../vfirmware/include\ |
-I../vkernel/include |
@@ -15,10 +14,7 @@ CFLAGS ?= -Wall -DNDEBUG -O3 -Werror $(INCLUDES) |
LIBS = $(TOP)/misclibs/file_keys.o \ |
$(TOP)/misclibs/signature_digest.o \ |
$(TOP)/vfirmware/firmware_image.o \ |
- $(TOP)/vfirmware/firmware_image_fw.o \ |
- $(TOP)/vkernel/kernel_image.o \ |
- $(TOP)/vkernel/kernel_image_fw.o |
-FIRMWARELIBS = $(TOP)/cryptolib/libcrypto.a $(TOP)/common/libcommon.a |
+ $(TOP)/vkernel/kernel_image.o |
SUBDIRS = cgpt |
TARGET_BINS = dumpRSAPublicKey \ |
@@ -39,21 +35,19 @@ subdirs: |
dumpRSAPublicKey: dumpRSAPublicKey.c |
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto |
-firmware_utility: firmware_utility.cc $(LIBS) $(FIRMWARELIBS) |
+firmware_utility: firmware_utility.cc $(LIBS) $(FWLIB) |
$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \ |
- -o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \ |
- -lcrypto |
+ -o $@ $(LIBS) $(FWLIB) -lcrypto |
-kernel_utility: kernel_utility.cc $(LIBS) $(FIRMWARELIBS) |
+kernel_utility: kernel_utility.cc $(LIBS) $(FWLIB) |
$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \ |
- -o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \ |
- -lcrypto |
+ -o $@ $(LIBS) $(FWLIB) -lcrypto |
-signature_digest_utility: signature_digest_utility.c $(LIBS) $(FIRMWARELIBS) |
- $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto |
+signature_digest_utility: signature_digest_utility.c $(LIBS) $(FWLIB) |
+ $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FWLIB) -lcrypto |
-verify_data: verify_data.c $(LIBS) $(FIRMWARELIBS) |
- $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto |
+verify_data: verify_data.c $(LIBS) $(FWLIB) |
+ $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FWLIB) -lcrypto |
clean: |
set -e; \ |