From 48430bfabd5148bb3b27576f3e58b1b3350beac6 Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Wed, 28 Oct 2009 21:11:43 +0000
Subject: [PATCH] Move mktccboot from tools/ to rbutil/mktccboot/ - inspired by
 FS#10728 but with no functional changes to code.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23382 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/mktccboot/Makefile               | 21 +++++++++++++++++++++
 {tools => rbutil/mktccboot}/mktccboot.c |  0
 tools/Makefile                          |  7 ++-----
 tools/configure                         |  2 +-
 tools/root.make                         |  2 +-
 tools/tools.make                        |  1 -
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 rbutil/mktccboot/Makefile
 rename {tools => rbutil/mktccboot}/mktccboot.c (100%)

diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile
new file mode 100644
index 0000000000..f3c0409b2a
--- /dev/null
+++ b/rbutil/mktccboot/Makefile
@@ -0,0 +1,21 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+TOOLSDIR=../../tools
+CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR)
+
+all: mktccboot
+
+telechips.o: $(TOOLSDIR)/telechips.c $(TOOLSDIR)/telechips.h
+	$(SILENT)$(CC) $(CFLAGS) $(TOOLSDIR)/telechips.c -c -o $@
+
+mktccboot: mktccboot.c telechips.o
+	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
+
+clean:
+	rm -f telechips.o mktccboot
diff --git a/tools/mktccboot.c b/rbutil/mktccboot/mktccboot.c
similarity index 100%
rename from tools/mktccboot.c
rename to rbutil/mktccboot/mktccboot.c
diff --git a/tools/Makefile b/tools/Makefile
index 71fb6bff92..853b567b74 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,10 +13,10 @@ LDFLAGS := -g
 
 CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf	\
  generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \
- lngdump telechips gigabeats creative hmac-sha1 mktccboot rbspeexenc \
+ lngdump telechips gigabeats creative hmac-sha1 rbspeexenc \
  mkzenboot mk500boot
 
-all: scramble descramble sh2d rdf2binary mkboot mktccboot mkzenboot \
+all: scramble descramble sh2d rdf2binary mkboot mkzenboot \
 	convbdf codepages uclpack rbspeexenc voicefont mk500boot
 
 scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o telechips.o iaudio_bl_flash.o creative.o hmac-sha1.o
@@ -46,9 +46,6 @@ rdf2binary:	rdf2binary.c
 mkboot:	mkboot.c
 	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
 
-mktccboot: mktccboot.c telechips.o
-	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
-	
 mk500boot: mk500boot.c mr500.c
 	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
 	
diff --git a/tools/configure b/tools/configure
index c79d69570c..5023b69331 100755
--- a/tools/configure
+++ b/tools/configure
@@ -909,7 +909,7 @@ fi
   iaudiobitmaptools="$toolset scramble descramble mkboot bmp2rb"
   ipodbitmaptools="$toolset scramble bmp2rb"
   gigabeatbitmaptools="$toolset scramble descramble bmp2rb"
-  tccbitmaptools="$toolset scramble mktccboot bmp2rb"
+  tccbitmaptools="$toolset scramble bmp2rb"
   # generic is used by IFP, Meizu and Onda
   genericbitmaptools="$toolset bmp2rb"
   # scramble is used by all other targets
diff --git a/tools/root.make b/tools/root.make
index 13768dd33a..d68f36d0c6 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -20,7 +20,7 @@ PPCFLAGS = $(filter-out -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix
 
 TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \
 	$(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \
-	$(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot
+	$(TOOLSDIR)/uclpack $(TOOLSDIR)/mkboot
 
 
 ifeq (,$(PREFIX))
diff --git a/tools/tools.make b/tools/tools.make
index e0337748cb..64a47c53de 100644
--- a/tools/tools.make
+++ b/tools/tools.make
@@ -18,7 +18,6 @@ $(TOOLSDIR)/rdf2binary:	$(TOOLSDIR)/rdf2binary.c
 $(TOOLSDIR)/convbdf: $(TOOLSDIR)/convbdf.c
 $(TOOLSDIR)/codepages: $(TOOLSDIR)/codepages.c $(TOOLSDIR)/codepage_tables.c
 $(TOOLSDIR)/mkboot: $(TOOLSDIR)/mkboot.c
-$(TOOLSDIR)/mktccboot: $(TOOLSDIR)/mktccboot.c $(TOOLSDIR)/telechips.c
 $(TOOLSDIR)/wavtrim: $(TOOLSDIR)/wavtrim.c
 $(TOOLSDIR)/voicefont: $(TOOLSDIR)/voicefont.c