futility: Remove FUTIL_STATIC build rules
After CL:1210342, the 'futility_s' is no longer needed so we may drop
the related build rules. People who wants to build static version of
futility can do:
make STATIC=true futil
BUG=chromium:765499
TEST=precq passes; make futil; make clean; make STATIC=1 futil
BRANCH=none
Change-Id: I80e83a80eaa273f09288f850c59a52494dc5bec9
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1235795
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/Makefile b/Makefile
index 5e73d36..300e735 100644
--- a/Makefile
+++ b/Makefile
@@ -661,44 +661,38 @@
vbutil_key \
vbutil_keyblock
-FUTIL_STATIC_SRCS = \
- futility/futility.c \
- futility/cmd_dump_fmap.c \
- futility/cmd_gbb_utility.c \
- futility/cmd_update.c \
- futility/cmd_vbutil_firmware.c \
- futility/cmd_vbutil_key.c \
- futility/misc.c \
- futility/ryu_root_header.c
-
FUTIL_SRCS = \
- ${FUTIL_STATIC_SRCS} \
+ futility/futility.c \
+ futility/bdb_helper.c \
futility/cmd_bdb.c \
futility/cmd_create.c \
+ futility/cmd_dump_fmap.c \
futility/cmd_dump_kernel_config.c \
+ futility/cmd_gbb_utility.c \
futility/cmd_load_fmap.c \
futility/cmd_pcr.c \
futility/cmd_show.c \
futility/cmd_sign.c \
+ futility/cmd_update.c \
futility/cmd_validate_rec_mrc.c \
futility/cmd_vbutil_firmware.c \
+ futility/cmd_vbutil_firmware.c \
futility/cmd_vbutil_kernel.c \
- futility/cmd_vbutil_key.c \
futility/cmd_vbutil_keyblock.c \
- futility/file_type.c \
+ futility/cmd_vbutil_key.c \
+ futility/cmd_vbutil_key.c \
futility/file_type_bios.c \
+ futility/file_type.c \
futility/file_type_rwsig.c \
futility/file_type_usbpd1.c \
+ futility/misc.c \
+ futility/ryu_root_header.c \
futility/vb1_helper.c \
- futility/vb2_helper.c \
- futility/bdb_helper.c
+ futility/vb2_helper.c
-# List of commands built in futility and futility_s.
-FUTIL_STATIC_CMD_LIST = ${BUILD}/gen/futility_static_cmds.c
+# List of commands built in futility.
FUTIL_CMD_LIST = ${BUILD}/gen/futility_cmds.c
-FUTIL_STATIC_OBJS = ${FUTIL_STATIC_SRCS:%.c=${BUILD}/%.o} \
- ${FUTIL_STATIC_CMD_LIST:%.c=%.o}
FUTIL_OBJS = ${FUTIL_SRCS:%.c=${BUILD}/%.o} ${FUTIL_CMD_LIST:%.c=%.o}
${FUTIL_OBJS}: INCLUDES += -Ihost/lib21/include -Ifirmware/lib21/include \
@@ -1306,9 +1300,7 @@
# Generates the list of commands defined in futility by running grep in the
# source files looking for the DECLARE_FUTIL_COMMAND() macro usage.
-${FUTIL_STATIC_CMD_LIST}: ${FUTIL_STATIC_SRCS}
${FUTIL_CMD_LIST}: ${FUTIL_SRCS}
-${FUTIL_CMD_LIST} ${FUTIL_STATIC_CMD_LIST}:
@${PRINTF} " GEN $(subst ${BUILD}/,,$@)\n"
${Q}rm -f $@ $@_t $@_commands
${Q}mkdir -p ${BUILD}/gen
