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

Side by Side Diff: utility/Makefile

Issue 6783006: Fix duplicate -I's harmless under gcc but which break bunny-gcc (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2011 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
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ifeq ($(MINIMAL),) 42 ifeq ($(MINIMAL),)
43 TARGET_NAMES += bmpblk_utility 43 TARGET_NAMES += bmpblk_utility
44 endif 44 endif
45 45
46 TARGET_BINS = $(addprefix ${BUILD_ROOT}/,$(TARGET_NAMES)) 46 TARGET_BINS = $(addprefix ${BUILD_ROOT}/,$(TARGET_NAMES))
47 ALL_DEPS = $(addsuffix .d,${TARGET_BINS}) 47 ALL_DEPS = $(addsuffix .d,${TARGET_BINS})
48 48
49 all: $(TARGET_BINS) 49 all: $(TARGET_BINS)
50 50
51 ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS) 51 ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS)
52 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) 52 » $(CC) $(CFLAGS) $< -o $@ $(LIBS)
53 53
54 ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c 54 ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c
55 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto 55 » $(CC) $(CFLAGS) $< -o $@ -lcrypto
56 56
57 ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS) 57 ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS)
58 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 58 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
59 59
60 ${BUILD_ROOT}/gbb_utility: gbb_utility.cc 60 ${BUILD_ROOT}/gbb_utility: gbb_utility.cc
61 $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@ 61 $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@
62 62
63 ${BUILD_ROOT}/bmpblk_utility.o: bmpblk_utility.cc 63 ${BUILD_ROOT}/bmpblk_utility.o: bmpblk_utility.cc
64 $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) -c $< -o $@ 64 $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) -c $< -o $@
65 65
66 ${BUILD_ROOT}/bmpblk_util.o: bmpblk_util.c 66 ${BUILD_ROOT}/bmpblk_util.o: bmpblk_util.c
67 $(CC) $(CFLAGS) -c $< -o $@ 67 $(CC) $(CFLAGS) -c $< -o $@
68 68
69 ${BUILD_ROOT}/eficompress.o: eficompress.c 69 ${BUILD_ROOT}/eficompress.o: eficompress.c
70 $(CC) $(CFLAGS) -c $< -o $@ 70 $(CC) $(CFLAGS) -c $< -o $@
71 71
72 ${BUILD_ROOT}/efidecompress.o: efidecompress.c 72 ${BUILD_ROOT}/efidecompress.o: efidecompress.c
73 $(CC) $(CFLAGS) -c $< -o $@ 73 $(CC) $(CFLAGS) -c $< -o $@
74 74
75 ${BUILD_ROOT}/bmpblk_utility: ${BUILD_ROOT}/bmpblk_utility.o \ 75 ${BUILD_ROOT}/bmpblk_utility: ${BUILD_ROOT}/bmpblk_utility.o \
76 ${BUILD_ROOT}/bmpblk_util.o \ 76 ${BUILD_ROOT}/bmpblk_util.o \
77 ${BUILD_ROOT}/eficompress.o \ 77 ${BUILD_ROOT}/eficompress.o \
78 ${BUILD_ROOT}/efidecompress.o 78 ${BUILD_ROOT}/efidecompress.o
79 $(CXX) -llzma -lyaml $(CFLAGS) $^ -o $@ 79 $(CXX) -llzma -lyaml $(CFLAGS) $^ -o $@
80 80
81 ${BUILD_ROOT}/load_firmware_test: load_firmware_test.c $(LIBS) 81 ${BUILD_ROOT}/load_firmware_test: load_firmware_test.c $(LIBS)
82 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 82 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
83 83
84 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS) 84 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS)
85 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 85 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
86 86
87 ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS) 87 ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS)
88 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 88 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
89 89
90 ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS) 90 ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS)
91 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 91 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
92 92
93 ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c 93 ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c
94 » $(HOSTCC) $(CFLAGS) $(INCLUDES) -fpack-struct $< -o $@ 94 » $(HOSTCC) $(CFLAGS) -fpack-struct $< -o $@
95 95
96 ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS) 96 ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS)
97 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 97 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
98 98
99 ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS) 99 ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS)
100 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 100 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
101 101
102 ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS) 102 ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS)
103 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 103 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
104 104
105 ${BUILD_ROOT}/vbutil_keyblock: vbutil_keyblock.c $(LIBS) 105 ${BUILD_ROOT}/vbutil_keyblock: vbutil_keyblock.c $(LIBS)
106 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 106 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
107 107
108 ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS) 108 ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS)
109 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 109 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
110 110
111 ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS) 111 ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS)
112 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 112 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
113 113
114 ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS) 114 ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS)
115 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) 115 » $(CC) $(CFLAGS) $< -o $@ $(LIBS)
116 116
117 ${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c 117 ${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c
118 $(CC) $(CFLAGS) $< -o $@ -ltspi 118 $(CC) $(CFLAGS) $< -o $@ -ltspi
119 119
120 ${BUILD_ROOT}/dev_make_keypair: dev_make_keypair 120 ${BUILD_ROOT}/dev_make_keypair: dev_make_keypair
121 cp -f $< $@ 121 cp -f $< $@
122 chmod +x $@ 122 chmod +x $@
123 123
124 ${BUILD_ROOT}/dev_debug_vboot: dev_debug_vboot 124 ${BUILD_ROOT}/dev_debug_vboot: dev_debug_vboot
125 cp -f $< $@ 125 cp -f $< $@
126 chmod +x $@ 126 chmod +x $@
127 127
128 ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS) 128 ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS)
129 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) 129 » $(CC) $(CFLAGS) $< -o $@ $(LIBS)
130 130
131 ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS) 131 ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS)
132 » $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto 132 » $(CC) $(CFLAGS) $< -o $@ $(LIBS) -lcrypto
133 133
134 ${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS) 134 ${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS)
135 $(CC) $(CFLAGS) $< -o $@ $(LIBS) 135 $(CC) $(CFLAGS) $< -o $@ $(LIBS)
136 136
137 ${BUILD_ROOT}/pack_firmware_image: pack_firmware_image 137 ${BUILD_ROOT}/pack_firmware_image: pack_firmware_image
138 cp -f $< $@ 138 cp -f $< $@
139 chmod +x $@ 139 chmod +x $@
140 140
141 install: $(TARGET_BINS) 141 install: $(TARGET_BINS)
142 mkdir -p $(DESTDIR) 142 mkdir -p $(DESTDIR)
143 cp -f $(TARGET_BINS) $(DESTDIR) 143 cp -f $(TARGET_BINS) $(DESTDIR)
144 chmod a+rx $(patsubst %,$(DESTDIR)/%,$(TARGET_NAMES)) 144 chmod a+rx $(patsubst %,$(DESTDIR)/%,$(TARGET_NAMES))
145 145
146 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp 146 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp
147 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h 147 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h
148 148
149 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator 149 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator
150 ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP) 150 ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP)
151 cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \ 151 cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \
152 ( echo "%% Updating structures.h %%" && \ 152 ( echo "%% Updating structures.h %%" && \
153 cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) ) 153 cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) )
154 154
155 -include ${ALL_DEPS} 155 -include ${ALL_DEPS}
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698