summaryrefslogtreecommitdiff
path: root/misclibs
diff options
context:
space:
mode:
authorvbendeb <vbendeb@chromium.org>2010-06-14 15:41:27 -0700
committervbendeb <vbendeb@chromium.org>2010-06-14 15:41:27 -0700
commit70e9509a2748c0ee8646d77f2a0e6fcbb1446505 (patch)
tree3557b5823bc2200dea45d399f72af51d7cde69f8 /misclibs
parent83c88cfa6920711b8a7823e1e3fc0efe8b71a04c (diff)
downloadvboot-70e9509a2748c0ee8646d77f2a0e6fcbb1446505.tar.gz
Rework the vboot_reference make system.
After this change the generated files are placed in a separate tree (such thet they don't show in the `git status' output anymore) and the dependencies are followed properly (if a .h file changes the appropriate .o files and apps get rebuilt). Tested as follows: > $ make clean > $ make # build succeeds > $ git status # shows clean directory > $ RUNTESTS=1 make # (captured test output matches that of the test run before any changes) > $ touch ./vboot_firmware/include/tlcl.h > $ make # make succeeds > $ find build -type f -newer ./vboot_firmware/include/tlcl.h build/vboot_firmware/lib/rollback_index.o build/vboot_firmware/lib/rollback_index.o.d build/vboot_firmware/a.out build/vboot_fw.a build/utility/vbutil_key build/utility/kernel_utility.d build/utility/vbutil_key.d build/utility/verify_data build/utility/load_kernel_test.d build/utility/vbutil_keyblock.d build/utility/vbutil_kernel build/utility/vbutil_kernel.d build/utility/firmware_utility build/utility/signature_digest_utility.d build/utility/kernel_utility build/utility/verify_data.d build/utility/vbutil_keyblock build/utility/signature_digest_utility build/utility/load_kernel_test build/utility/firmware_utility.d build/tests/vboot_common3_tests build/tests/vboot_common2_tests build/host/a.out $ > Review URL: http://codereview.chromium.org/2845001
Diffstat (limited to 'misclibs')
-rw-r--r--misclibs/Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/misclibs/Makefile b/misclibs/Makefile
index 261158b0..732f7eef 100644
--- a/misclibs/Makefile
+++ b/misclibs/Makefile
@@ -2,23 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-TOP ?= ../
-CC ?= gcc
INCLUDES += -I./include \
-I$(TOP)/common/include \
-I$(TOP)/vboot_firmware/lib/cryptolib/include \
-I$(TOP)/vfirmware/include \
-I$(TOP)/vkernel/include
-CFLAGS ?= -Wall -DNDEBUG -O3 -Werror $(INCLUDES)
-TOP ?= ../
+BUILD_ROOT := ${BUILD}/misclibs
-MISCLIB_OUT = file_keys.o signature_digest.o
+ALL_SRCS = file_keys.c signature_digest.c
-all: $(MISCLIB_OUT)
+include ../common.mk
-.c.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-clean:
- rm -f $(MISCLIB_OUT)
+all: $(ALL_OBJS)