Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: src/platform/vboot_reference/utility/Makefile

Issue 1581005: VBoot Reference: Refactoring Part 3 (Closed)
Patch Set: . Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/platform/vboot_reference/utility/Makefile
diff --git a/src/platform/vboot_reference/utils/Makefile b/src/platform/vboot_reference/utility/Makefile
similarity index 62%
rename from src/platform/vboot_reference/utils/Makefile
rename to src/platform/vboot_reference/utility/Makefile
index 81de74f104fc3291e82b029002882f837c3e76d7..a5f6f584eaa12ac08a9af1511c5ec22c5fd9ec0d 100644
--- a/src/platform/vboot_reference/utils/Makefile
+++ b/src/platform/vboot_reference/utility/Makefile
@@ -2,24 +2,25 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+TOP ?= ../
CC ?= gcc
CXX ?= g++
-CFLAGS ?= -Wall -DNDEBUG -O3 -Werror
-INCLUDES ?= -I../include/
-TOP ?= ../
-
-LIBS = file_keys.o \
- firmware_image.o \
- firmware_image_fw.o \
- kernel_image.o \
- kernel_image_fw.o \
- rollback_index.o \
- signature_digest.o
-
-FIRMWARELIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
-
-TARGET_BINS = $(LIBS) \
- dumpRSAPublicKey \
+INCLUDES += -I./include \
+ -I../cryptolib/include \
+ -I../common/include \
+ -I../misclibs/include \
+ -I../vfirmware/include\
+ -I../vkernel/include
+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
+
+TARGET_BINS = dumpRSAPublicKey \
firmware_utility \
kernel_utility \
signature_digest_utility \
@@ -27,23 +28,14 @@ TARGET_BINS = $(LIBS) \
all: $(TARGET_BINS)
-.c.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
dumpRSAPublicKey: dumpRSAPublicKey.c
- $(CC) $(CFLAGS) $< -o $@ -lcrypto
-
-firmware_image_fw.o: firmware_image_fw.c
- $(CC) $(CFLAGS) -ansi $(INCLUDES) -c $^ -o $@
+ $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
firmware_utility: firmware_utility.cc $(LIBS) $(FIRMWARELIBS)
$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \
-o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \
-lcrypto
-kernel_image_fw.o: kernel_image_fw.c
- $(CC) $(CFLAGS) -ansi $(INCLUDES) -c $< -o $@
-
kernel_utility: kernel_utility.cc $(LIBS) $(FIRMWARELIBS)
$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \
-o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \
@@ -56,5 +48,5 @@ verify_data: verify_data.c $(LIBS) $(FIRMWARELIBS)
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
clean:
- rm -f $(TARGET_BINS) $(LIBS)
+ rm -f $(TARGET_BINS)
« no previous file with comments | « src/platform/vboot_reference/tests/common.sh ('k') | src/platform/vboot_reference/utility/dumpRSAPublicKey.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698