New commandline args are clearer, and prepare for compression.

utility/Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 INCLUDES += -I./include \
                 -I$(FWDIR)/lib/include \
                 -I$(FWDIR)/lib/cgptlib/include \
                 -I$(FWDIR)/lib/cryptolib/include \
                 -I$(FWDIR)/lib/tpm_lite/include \
                 -I$(HOSTDIR)/include
@@ skipping 41 matching lines @@
 
 ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
 
 ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/gbb_utility: gbb_utility.cc
         $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@
 
-${BUILD_ROOT}/bmpblk_utility: bmpblk_utility.cc
-        $(CXX) -DWITH_UTIL_MAIN -lyaml $(CFLAGS) $< -o $@
+${BUILD_ROOT}/bmpblk_utility.o: bmpblk_utility.cc
+        $(CXX) -DWITH_UTIL_MAIN -lyaml $(CFLAGS) -c $< -o $@
+
+${BUILD_ROOT}/bmpblk_util.o: bmpblk_util.c
+        $(CC) $(CFLAGS) -c $< -o $@
+
+${BUILD_ROOT}/bmpblk_utility: ${BUILD_ROOT}/bmpblk_utility.o ${BUILD_ROOT}/bmpblk_util.o
+        $(CXX) -DWITH_UTIL_MAIN -lyaml $(CFLAGS) $^ -o $@
 
 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
@@ skipping 53 matching lines @@
 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp
 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h
 
 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator
         ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP)
         cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \
                 ( echo "%% Updating structures.h %%" && \
                   cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) )
 
 -include ${ALL_DEPS}