diff options
author | Bill Richardson <wfrichar@chromium.org> | 2013-03-29 11:09:30 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-04-02 14:12:52 -0700 |
commit | 0c3ba249abb1dc60f5ebabccf84ff13206440b83 (patch) | |
tree | 81cd2ada3845b8bb4b83fde6e27050483d5b941e /Makefile | |
parent | 28b65ca99f4042fcc1218a4c18297f7ffb32ea15 (diff) | |
download | vboot-0c3ba249abb1dc60f5ebabccf84ff13206440b83.tar.gz |
Massive refactoring of external header files.
This reduces the number of exported header files to the minimum needed by
the existing userspace utilities and firmware implementations.
BUG=chromium:221544
BRANCH=none
TEST=manual, trybots
CQ-DEPEND=CL:47019,CL:47022,CL:47023
sudo FEATURES=test emerge vboot_reference
FEATURES=test emerge-$BOARD \
vboot_reference \
chromeos-cryptohome \
chromeos-installer \
chromeos-u-boot \
peach-u-boot \
depthcharge
Change-Id: I2946cc2dbaf5459a6c5eca92ca57d546498e6d85
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47021
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -160,6 +160,9 @@ endif # Create / use dependency files CFLAGS += -MMD -MF $@.d +# These are required to access large disks and files on 32-bit systems. +CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + # Code coverage ifneq (${COV},) COV_FLAGS = -O0 --coverage @@ -659,8 +662,9 @@ ${FWLIB}: ${FWLIB_OBJS} hostlib: ${HOSTLIB} ${BUILD}/host/linktest/main ${BUILD}/host/% ${HOSTLIB}: INCLUDES += \ - -Ihost/include\ - -Ihost/arch/${ARCH}/include + -Ihost/include \ + -Ihost/arch/${ARCH}/include \ + -Ihost/lib/include # TODO: better way to make .a than duplicating this recipe each time? ${HOSTLIB}: ${HOSTLIB_OBJS} ${FWLIB_OBJS} @@ -687,6 +691,8 @@ ${TINYHOSTLIB}: ${TINYHOSTLIB_OBJS} .PHONY: cgpt cgpt: ${CGPT} +${CGPT_OBJS}: INCLUDES += -Ihost/include + ${CGPT}: LDFLAGS += -static ${CGPT}: LDLIBS += -luuid @@ -704,7 +710,10 @@ cgpt_install: ${CGPT} # Utilities # These have their own headers too. -${BUILD}/utility/%: INCLUDES += -Ihost/include -Iutility/include +${BUILD}/utility/%: INCLUDES += \ + -Ihost/include \ + -Ihost/lib/include \ + -Iutility/include # Utilities for auto-update toolkits must be statically linked. ${UTIL_BINS_STATIC}: LDFLAGS += -static @@ -855,7 +864,7 @@ ${BUILD}/utility/bmpblk_font: ${BUILD}/utility/image_types.o # Allow multiple definitions, so tests can mock functions from other libraries ${BUILD}/tests/%: CFLAGS += -Xlinker --allow-multiple-definition -${BUILD}/tests/%: INCLUDES += -Ihost/include +${BUILD}/tests/%: INCLUDES += -Ihost/include -Ihost/lib/include ${BUILD}/tests/%: LDLIBS += -lrt -luuid ${BUILD}/tests/%: LIBS += ${TESTLIB} |