Nearly complete rewrite of cgpt tool.

utility/Makefile

Index: utility/Makefile
diff --git a/utility/Makefile b/utility/Makefile
index e6b1bc0e697124bcaa4e5991ebb8f84618bb9c91..50612dd073f2d678f568443a1068c2324af0b9a4 100644
--- a/utility/Makefile
+++ b/utility/Makefile
@@ -22,9 +22,8 @@ LIBS = $(TOP)/misclibs/file_keys.o \
 	$(TOP)/vkernel/kernel_image.o \
 	$(HOSTLIB) \
 	$(FWLIB)
-SUBDIRS = cgpt
 
-DESTDIR ?= /opt/bin
+DESTDIR ?= /usr/bin
 
 TARGET_BINS = dumpRSAPublicKey \
 		firmware_utility \
@@ -35,14 +34,7 @@ TARGET_BINS = dumpRSAPublicKey \
 		vbutil_key \
 		verify_data
 
-all: $(TARGET_BINS) subdirs
-
-.PHONY: subdirs
-subdirs:
-	set -e; \
-	for i in $(SUBDIRS); do \
-		$(MAKE) -C $$i $(MAKECMDGOALS); \
-	done
+all: $(TARGET_BINS)
 
 dumpRSAPublicKey: dumpRSAPublicKey.c
 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
@@ -74,13 +66,9 @@ verify_data: verify_data.c $(LIBS)
 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 clean:
-	set -e; \
-	for i in $(SUBDIRS); do \
-		$(MAKE) -C $$i clean; \
-	done
 	rm -f $(TARGET_BINS)
 
-install: $(TARGET_BINS) subdirs
+install: $(TARGET_BINS)
 	mkdir -p $(DESTDIR)
 	cp -f $(TARGET_BINS) $(DESTDIR)
 	chmod a+rx $(patsubst %,$(DESTDIR)/%,$(TARGET_BINS))