VBoot Reference: Refactor Pass 1: Split {firmware|kernel}_image

src/platform/vboot_reference/utils/Makefile

Index: src/platform/vboot_reference/utils/Makefile
diff --git a/src/platform/vboot_reference/utils/Makefile b/src/platform/vboot_reference/utils/Makefile
index 597638e75b667435df6f84e379dc8f15e613bf31..81de74f104fc3291e82b029002882f837c3e76d7 100644
--- a/src/platform/vboot_reference/utils/Makefile
+++ b/src/platform/vboot_reference/utils/Makefile
@@ -8,43 +8,53 @@ CFLAGS ?= -Wall -DNDEBUG -O3 -Werror
 INCLUDES ?= -I../include/
 TOP ?= ../
 
-LIBS =  firmware_image.o kernel_image.o signature_digest.o file_keys.o \
-	rollback_index.o
+LIBS = file_keys.o \
+	firmware_image.o \
+	firmware_image_fw.o \
+	kernel_image.o \
+	kernel_image_fw.o \
+	rollback_index.o \
+	signature_digest.o 
 
 FIRMWARELIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
 
-all: dumpRSAPublicKey verify_data file_keys.o signature_digest.o \
-	firmware_image.o kernel_image.o signature_digest.o \
-	signature_digest_utility firmware_utility kernel_utility \
-	rollback_index.o
+TARGET_BINS = $(LIBS) \
+		dumpRSAPublicKey \
+		firmware_utility \
+		kernel_utility \
+		signature_digest_utility \
+		verify_data
+
+all: $(TARGET_BINS)
+
+.c.o:
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 dumpRSAPublicKey: dumpRSAPublicKey.c
 	$(CC) $(CFLAGS) $< -o $@ -lcrypto
 
-verify_data: verify_data.c $(LIBS) $(FIRMWARELIBS)
-	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
-
-signature_digest_utility: signature_digest_utility.c $(LIBS) $(FIRMWARELIBS)
-	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
+firmware_image_fw.o: firmware_image_fw.c
+	$(CC) $(CFLAGS) -ansi $(INCLUDES) -c $^ -o $@
 
 firmware_utility: firmware_utility.cc $(LIBS) $(FIRMWARELIBS)
 	$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \
 	-o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \
 	-lcrypto
 
+kernel_image_fw.o: kernel_image_fw.c
+	$(CC) $(CFLAGS) -ansi $(INCLUDES) -c $< -o $@
+
 kernel_utility: kernel_utility.cc $(LIBS) $(FIRMWARELIBS)
 	$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \
 	-o $@ $(FIRMWARELIBS) $(LIBS) $(TOP)/common/libcommon.a \
 	-lcrypto
 
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+signature_digest_utility: signature_digest_utility.c $(LIBS) $(FIRMWARELIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
 
-firmware_image.o: firmware_image.c
-	$(CC) -ansi $(CFLAGS) $(INCLUDES) -c $< -o $@
+verify_data: verify_data.c $(LIBS) $(FIRMWARELIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
 
-kernel_image.o: kernel_image.c
-	$(CC) -ansi $(CFLAGS) $(INCLUDES) -c $< -o $@
 clean:
-	rm -f dumpRSAPublicKey verify_data signature_digest firmware_utility \
-	kernel_utility signature_digest_utility $(LIBS)
+	rm -f $(TARGET_BINS) $(LIBS)
+