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.zip rockbox-48430bfabd5148bb3b27576f3e58b1b3350beac6.tar.gz rockbox-48430bfabd5148bb3b27576f3e58b1b3350beac6.tar.bz2 rockbox-48430bfabd5148bb3b27576f3e58b1b3350beac6.tar.xz | |
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 0000000..f3c0409 --- /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 index e135b7e..e135b7e 100644 --- a/tools/mktccboot.c +++ b/rbutil/mktccboot/mktccboot.c diff --git a/tools/Makefile b/tools/Makefile index 71fb6bf..853b567 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 c79d695..5023b69 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 13768dd..d68f36d 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 e033774..64a47c5 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 |