From 5fac757abef456bf66d9dd96b316ec61fe04b48e Mon Sep 17 00:00:00 2001 From: Jay Srinivasan Date: Thu, 23 Feb 2012 10:59:01 -0800 Subject: Enable building of Cgpt C++ Library for 32-bit. The existing library had a bunch of dependencies which are too many to build for the 32-bit platform. So this checkin prunes the dependency list by building only things that are absolutely required for the functionality used in 32-bit Post-Installer. Made the use of libuuid restricted only to cgpt and unit tests so that libcgpt-cc.a doesn't depend on it. BUG=chromium-os:25374 TEST=Built 32-bit and 64-bit. Tested 32-bit post-install. Change-Id: Idd0826fdf507a95728fee8adac9520e26f05d469 Reviewed-on: https://gerrit.chromium.org/gerrit/16433 Reviewed-by: Don Garrett Reviewed-by: Sonny Rao Commit-Ready: Jay Srinivasan Tested-by: Jay Srinivasan --- cgpt/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'cgpt/Makefile') diff --git a/cgpt/Makefile b/cgpt/Makefile index d3ca978e..dc345215 100644 --- a/cgpt/Makefile +++ b/cgpt/Makefile @@ -33,18 +33,28 @@ ALL_SRCS = \ cgpt_common.c LIB_CGPT_CC_SRCS = \ - CgptManager.cc + CgptManager.cc \ + cgpt_create.c \ + cgpt_add.c \ + cgpt_boot.c \ + cgpt_show.c \ + cgpt_repair.c \ + cgpt_prioritize.c \ + cgpt_common.c \ + ../firmware/lib/cgptlib/crc32.c \ + ../firmware/lib/cgptlib/cgptlib_internal.c \ + ../firmware/stub/utility_stub.c main: $(PROGNAME) include ../common.mk -LIB_CGPT_CC_OBJS = $(LIB_CGPT_CC_SRCS:%.cc=${BUILD_ROOT}/%.o) +LIB_CGPT_CC_OBJS = $(LIB_CGPT_CC_SRCS:%.c=${BUILD_ROOT}/%.o) $(LIB_CGPT_CC_SRCS:%.cc=${BUILD_ROOT}/%.o) LIB_CGPT_CC_DEPS = $(LIB_CGPT_CC_OBJS:%.o=%.o.d) -libcgpt_cc: main $(LIB_CGPT_CC) +libcgpt_cc: $(LIB_CGPT_CC) -$(LIB_CGPT_CC): $(ALL_OBJS) $(LIB_CGPT_CC_OBJS) +$(LIB_CGPT_CC): $(LIB_CGPT_CC_OBJS) rm -f $@ ar qc $@ $^ -- cgit v1.2.1