Index: host/Makefile |
diff --git a/host/Makefile b/host/Makefile |
index f0bdf85556c7f626586824ab1ac1f9a01308c954..7f1c9f15f4547a7f19fa860279173085c3bbafc8 100644 |
--- a/host/Makefile |
+++ b/host/Makefile |
@@ -2,46 +2,31 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-LIBNAME = vboot_host.a |
- |
-CC ?= gcc |
-CFLAGS = -Wall -DNDEBUG -O3 -Werror |
- |
HOSTTOP := $(shell pwd) |
-LIBDIR = $(HOSTTOP)/lib |
TESTDIR = $(HOSTTOP)/linktest |
+BUILD_ROOT := ${BUILD}/$(shell basename ${HOSTTOP}) |
INCLUDES += \ |
-I$(HOSTTOP)/include \ |
-I$(FWDIR)/lib/include \ |
-I$(FWDIR)/lib/cgptlib/include \ |
- -I$(FWDIR)/lib/cryptolib/include |
+ -I$(FWDIR)/lib/cryptolib/include |
# find ./lib -iname '*.c' | sort |
-LIB_SRCS = \ |
+ALL_SRCS = \ |
./lib/host_common.c \ |
./lib/host_key.c \ |
./lib/host_keyblock.c \ |
./lib/host_misc.c \ |
- ./lib/host_signature.c |
+ ./lib/host_signature.c |
-LIB_OBJS = $(LIB_SRCS:%.c=%.o) |
-test : $(LIBNAME) |
- $(CC) $(CFLAGS) $(INCLUDES) -o $(TESTDIR)/a.out $(TESTDIR)/main.c \ |
- $(LIBNAME) $(FWLIB) -lcrypto |
+test : $(HOSTLIB) |
+ $(CC) $(CFLAGS) $(INCLUDES) -o $(BUILD_ROOT)/a.out $(TESTDIR)/main.c \ |
+ $(HOSTLIB) $(FWLIB) -lcrypto |
-$(LIBNAME) : $(LIB_OBJS) $(STUB_OBJS) |
+include ../common.mk |
+ |
+$(HOSTLIB) : $(ALL_OBJS) |
rm -f $@ |
ar qc $@ $^ |
- |
-%o : %c |
- $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< |
- |
-clean: FORCE |
- rm -f $(LIBNAME) $(LIB_OBJS) $(STUB_OBJS) $(TESTDIR)/a.out |
- |
-FORCE: |
- |
- |
-.PHONY: FORCE |