| OLD | NEW | 
|---|
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 INCLUDES += -I./include \ | 5 INCLUDES += -I./include \ | 
| 6                 -I$(FWDIR)/lib/include \ | 6                 -I$(FWDIR)/lib/include \ | 
| 7                 -I$(FWDIR)/lib/cgptlib/include \ | 7                 -I$(FWDIR)/lib/cgptlib/include \ | 
| 8                 -I$(FWDIR)/lib/cryptolib/include \ | 8                 -I$(FWDIR)/lib/cryptolib/include \ | 
| 9                 -I$(FWDIR)/lib/tpm_lite/include \ | 9                 -I$(FWDIR)/lib/tpm_lite/include \ | 
| 10                 -I$(HOSTDIR)/include | 10                 -I$(HOSTDIR)/include | 
| 11 CFLAGS += $(INCLUDES) | 11 CFLAGS += $(INCLUDES) | 
| 12 CFLAGS += -MMD -MF $@.d | 12 CFLAGS += -MMD -MF $@.d | 
| 13 LIBS = $(HOSTLIB) $(FWLIB) | 13 LIBS = $(HOSTLIB) $(FWLIB) | 
|  | 14 HOSTCC = cc | 
| 14 | 15 | 
| 15 BUILD_ROOT = ${BUILD}/utility | 16 BUILD_ROOT = ${BUILD}/utility | 
| 16 | 17 | 
| 17 DESTDIR ?= /usr/bin | 18 DESTDIR ?= /usr/bin | 
| 18 | 19 | 
| 19 TARGET_NAMES = dumpRSAPublicKey \ | 20 TARGET_NAMES = dumpRSAPublicKey \ | 
| 20                 dump_kernel_config \ | 21                 dump_kernel_config \ | 
| 21                 gbb_utility \ | 22                 gbb_utility \ | 
| 22                 load_kernel_test \ | 23                 load_kernel_test \ | 
| 23                 signature_digest_utility \ | 24                 signature_digest_utility \ | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 46 ${BUILD_ROOT}/gbb_utility: gbb_utility.cc | 47 ${BUILD_ROOT}/gbb_utility: gbb_utility.cc | 
| 47         $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@ | 48         $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@ | 
| 48 | 49 | 
| 49 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS) | 50 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS) | 
| 50         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 51         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 
| 51 | 52 | 
| 52 ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS) | 53 ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS) | 
| 53         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 54         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 
| 54 | 55 | 
| 55 ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c | 56 ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c | 
| 56 »       $(CC) $(CFLAGS) $(INCLUDES) -fpack-struct $< -o $@ | 57 »       $(HOSTCC) $(CFLAGS) $(INCLUDES) -fpack-struct $< -o $@ | 
| 57 | 58 | 
| 58 ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS) | 59 ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS) | 
| 59         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 60         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 
| 60 | 61 | 
| 61 ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS) | 62 ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS) | 
| 62         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 63         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 
| 63 | 64 | 
| 64 ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS) | 65 ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS) | 
| 65         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 66         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto | 
| 66 | 67 | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 93 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp | 94 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp | 
| 94 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h | 95 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h | 
| 95 | 96 | 
| 96 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator | 97 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator | 
| 97         ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP) | 98         ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP) | 
| 98         cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \ | 99         cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \ | 
| 99                 ( echo "%% Updating structures.h %%" && \ | 100                 ( echo "%% Updating structures.h %%" && \ | 
| 100                   cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) ) | 101                   cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) ) | 
| 101 | 102 | 
| 102 -include ${ALL_DEPS} | 103 -include ${ALL_DEPS} | 
| OLD | NEW | 
|---|