Move bin2c handling to libtools.make

Change-Id: I60353bb9f9fd2658d66ba7f352e04f7489c7bf5d

2 files changed, 10 insertions, 7 deletions

diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index cc582ce015..fda9b68132 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -123,6 +123,11 @@ clean:
         rm -f $(OBJS) $(OUTPUT) $(TARGET_DIR)lib$(OUTPUT)*.a $(OUTPUT).dmg
         rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR)
 
+# extra tools
+BIN2C = $(TOP)/tools/bin2c
+$(BIN2C):
+        $(MAKE) -C $(TOP)/tools
+
 # OS X specifics
 $(OUTPUT).dmg: $(OUTPUT)
         @echo DMG $@
diff --git a/rbutil/sansapatcher/Makefile b/rbutil/sansapatcher/Makefile
index b3bf51ee2a..88b3b65345 100644
--- a/rbutil/sansapatcher/Makefile
+++ b/rbutil/sansapatcher/Makefile
@@ -41,13 +41,11 @@ $(OBJDIR)main.o: $(BOOTSRC)
 $(OBJDIR)sansapatcher-rc.o: sansapatcher.rc sansapatcher.manifest
         $(WINDRES) -i sansapatcher.rc -o sansapatcher-rc.o
 
-bootimg_c200.c: firmware.mi4 ../tools/bin2c
+bootimg_c200.c: firmware.mi4 $(BIN2C)
         @echo BIN2C $<
-        $(SILENT)../tools/bin2c firmware.mi4 bootimg_c200
+        $(SILENT)$(BIN2C) $< $*
 
-bootimg_e200.c: PP5022.mi4 ../tools/bin2c
-        @echo BIN2C $<
-        $(SILENT)../tools/bin2c PP5022.mi4 bootimg_e200
+bootimg_e200.c: PP5022.mi4 $(BIN2C)
+        @echo BIN2C $< $*
+        $(SILENT)$(BIN2C) $< $*
 
-../tools/bin2c:
-        $(SILENT)make -C ../tools bin2c