diff options
author | Dave Chapman <dave@dchapman.com> | 2009-10-28 21:11:43 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-10-28 21:11:43 +0000 |
commit | 48430bfabd5148bb3b27576f3e58b1b3350beac6 (patch) | |
tree | 42d07f008efc0d2726f9788133a73284744a673d | |
parent | 1992c389ae9f7b351b32d717c07606c8662519e9 (diff) | |
download | rockbox-48430bfabd5148bb3b27576f3e58b1b3350beac6.tar.gz rockbox-48430bfabd5148bb3b27576f3e58b1b3350beac6.zip |
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
-rw-r--r-- | rbutil/mktccboot/Makefile | 21 | ||||
-rw-r--r-- | rbutil/mktccboot/mktccboot.c (renamed from tools/mktccboot.c) | 0 | ||||
-rw-r--r-- | tools/Makefile | 7 | ||||
-rwxr-xr-x | tools/configure | 2 | ||||
-rw-r--r-- | tools/root.make | 2 | ||||
-rw-r--r-- | tools/tools.make | 1 |
6 files changed, 25 insertions, 8 deletions
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 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | TOOLSDIR=../../tools | ||
10 | CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR) | ||
11 | |||
12 | all: mktccboot | ||
13 | |||
14 | telechips.o: $(TOOLSDIR)/telechips.c $(TOOLSDIR)/telechips.h | ||
15 | $(SILENT)$(CC) $(CFLAGS) $(TOOLSDIR)/telechips.c -c -o $@ | ||
16 | |||
17 | mktccboot: mktccboot.c telechips.o | ||
18 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | ||
19 | |||
20 | clean: | ||
21 | rm -f telechips.o mktccboot | ||
diff --git a/tools/mktccboot.c b/rbutil/mktccboot/mktccboot.c index e135b7e506..e135b7e506 100644 --- a/tools/mktccboot.c +++ b/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 | |||
13 | 13 | ||
14 | CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ | 14 | CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ |
15 | generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \ | 15 | generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \ |
16 | lngdump telechips gigabeats creative hmac-sha1 mktccboot rbspeexenc \ | 16 | lngdump telechips gigabeats creative hmac-sha1 rbspeexenc \ |
17 | mkzenboot mk500boot | 17 | mkzenboot mk500boot |
18 | 18 | ||
19 | all: scramble descramble sh2d rdf2binary mkboot mktccboot mkzenboot \ | 19 | all: scramble descramble sh2d rdf2binary mkboot mkzenboot \ |
20 | convbdf codepages uclpack rbspeexenc voicefont mk500boot | 20 | convbdf codepages uclpack rbspeexenc voicefont mk500boot |
21 | 21 | ||
22 | scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o telechips.o iaudio_bl_flash.o creative.o hmac-sha1.o | 22 | 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 | |||
46 | mkboot: mkboot.c | 46 | mkboot: mkboot.c |
47 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | 47 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ |
48 | 48 | ||
49 | mktccboot: mktccboot.c telechips.o | ||
50 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | ||
51 | |||
52 | mk500boot: mk500boot.c mr500.c | 49 | mk500boot: mk500boot.c mr500.c |
53 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | 50 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ |
54 | 51 | ||
diff --git a/tools/configure b/tools/configure index c79d69570c..5023b69331 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -909,7 +909,7 @@ fi | |||
909 | iaudiobitmaptools="$toolset scramble descramble mkboot bmp2rb" | 909 | iaudiobitmaptools="$toolset scramble descramble mkboot bmp2rb" |
910 | ipodbitmaptools="$toolset scramble bmp2rb" | 910 | ipodbitmaptools="$toolset scramble bmp2rb" |
911 | gigabeatbitmaptools="$toolset scramble descramble bmp2rb" | 911 | gigabeatbitmaptools="$toolset scramble descramble bmp2rb" |
912 | tccbitmaptools="$toolset scramble mktccboot bmp2rb" | 912 | tccbitmaptools="$toolset scramble bmp2rb" |
913 | # generic is used by IFP, Meizu and Onda | 913 | # generic is used by IFP, Meizu and Onda |
914 | genericbitmaptools="$toolset bmp2rb" | 914 | genericbitmaptools="$toolset bmp2rb" |
915 | # scramble is used by all other targets | 915 | # 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 | |||
20 | 20 | ||
21 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ | 21 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ |
22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ | 22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ |
23 | $(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot | 23 | $(TOOLSDIR)/uclpack $(TOOLSDIR)/mkboot |
24 | 24 | ||
25 | 25 | ||
26 | ifeq (,$(PREFIX)) | 26 | 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 | |||
18 | $(TOOLSDIR)/convbdf: $(TOOLSDIR)/convbdf.c | 18 | $(TOOLSDIR)/convbdf: $(TOOLSDIR)/convbdf.c |
19 | $(TOOLSDIR)/codepages: $(TOOLSDIR)/codepages.c $(TOOLSDIR)/codepage_tables.c | 19 | $(TOOLSDIR)/codepages: $(TOOLSDIR)/codepages.c $(TOOLSDIR)/codepage_tables.c |
20 | $(TOOLSDIR)/mkboot: $(TOOLSDIR)/mkboot.c | 20 | $(TOOLSDIR)/mkboot: $(TOOLSDIR)/mkboot.c |
21 | $(TOOLSDIR)/mktccboot: $(TOOLSDIR)/mktccboot.c $(TOOLSDIR)/telechips.c | ||
22 | $(TOOLSDIR)/wavtrim: $(TOOLSDIR)/wavtrim.c | 21 | $(TOOLSDIR)/wavtrim: $(TOOLSDIR)/wavtrim.c |
23 | $(TOOLSDIR)/voicefont: $(TOOLSDIR)/voicefont.c | 22 | $(TOOLSDIR)/voicefont: $(TOOLSDIR)/voicefont.c |
24 | 23 | ||