summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2012-08-14 10:36:42 -0700
committerDuncan Laurie <dlaurie@chromium.org>2012-08-14 10:49:58 -0700
commit3509b016b13495447a5cae39c972696af5932bec (patch)
tree328fd846955dc507383b89c1134dd1c8b9622b4d
parente2e99d36e30c36c23086bb30b3345ab97ea204ac (diff)
downloadvboot-3509b016b13495447a5cae39c972696af5932bec.tar.gz
rename common.mk to build.mk
This is to avoid confusion with the canonical common.mk file that is a CrOS build system. BUG=chromium-os:33327 TEST=`cros_run_unit_tests --board x86-alex -p vboot_reference` still works Old-Change-Id: I4b6719d58a4a8ab44b62c23c0e2c45b154374958 Reviewed-on: https://gerrit.chromium.org/gerrit/29578 Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> (cherry picked from commit 6c34ecf61bf621e4b4cfffb3f99732eb9930e85c) Change-Id: I1c072a2410f37712ae3b168351454313537dd7b7 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30236
-rw-r--r--build.mk (renamed from common.mk)0
-rw-r--r--cgpt/Makefile2
-rw-r--r--firmware/Makefile2
-rw-r--r--host/Makefile2
4 files changed, 3 insertions, 3 deletions
diff --git a/common.mk b/build.mk
index 177605e5..177605e5 100644
--- a/common.mk
+++ b/build.mk
diff --git a/cgpt/Makefile b/cgpt/Makefile
index 546656d3..8e810d42 100644
--- a/cgpt/Makefile
+++ b/cgpt/Makefile
@@ -48,7 +48,7 @@ LIB_CGPT_CC_SRCS = \
main: $(PROGNAME)
-include ../common.mk
+include ../build.mk
LIB_CGPT_CC_OBJS = $(filter %.o, \
$(LIB_CGPT_CC_SRCS:%.c=${BUILD_ROOT}/%.o) \
diff --git a/firmware/Makefile b/firmware/Makefile
index 811c158b..6dcf0bb3 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -115,7 +115,7 @@ else
test : $(FWLIB)
endif
-include ../common.mk
+include ../build.mk
$(FWLIB) : $(LIB_OBJS)
rm -f $@
diff --git a/host/Makefile b/host/Makefile
index 3e3eb4cd..c4b24d0b 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -37,7 +37,7 @@ test : $(HOSTLIB)
$(CC) $(CFLAGS) $(INCLUDES) -o $(BUILD_ROOT)/a.out $(TESTDIR)/main.c \
$(HOSTLIB) -lcrypto
-include ../common.mk
+include ../build.mk
$(HOSTLIB) : $(ALL_OBJS) $(FWLIB)
rm -rf $@ $(BUILD_ROOT)/.tmp