summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-12-16 21:34:48 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-12-16 21:34:48 +0000
commit13b2f5381310bc4e58d34f8dac0c8b9bdbd736d2 (patch)
treecdffd144f63f54ea8a19e33d9d0979814ae5f678
parent84205025c76b82343f157a4a21addecb72f7252b (diff)
downloadrockbox-13b2f5381310bc4e58d34f8dac0c8b9bdbd736d2.tar.gz
rockbox-13b2f5381310bc4e58d34f8dac0c8b9bdbd736d2.zip
Rename libchinachip to libchinachippatcher.
Use the same name for output file / library and folder to simplify dependencies. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31334 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/chinachippatcher/Makefile2
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro8
2 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile
index 7575cd9452..cdcca865b0 100644
--- a/rbutil/chinachippatcher/Makefile
+++ b/rbutil/chinachippatcher/Makefile
@@ -9,7 +9,7 @@
9CFLAGS = -g -Wall 9CFLAGS = -g -Wall
10CC = gcc 10CC = gcc
11 11
12OUTPUT = chinachip 12OUTPUT = chinachippatcher
13 13
14LIBSOURCES = chinachip.c 14LIBSOURCES = chinachip.c
15SOURCES = $(LIBSOURCES) main.c 15SOURCES = $(LIBSOURCES) main.c
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index c4990f54d6..3d78166d27 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -113,16 +113,16 @@ libmkmpioboot.commands = @$(MAKE) -s \
113 APPVERSION=\"rbutil\" \ 113 APPVERSION=\"rbutil\" \
114 libmkmpioboot$$RBLIBPOSTFIX \ 114 libmkmpioboot$$RBLIBPOSTFIX \
115 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" 115 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
116libchinachip.commands = @$(MAKE) -s \ 116libchinachippatcher.commands = @$(MAKE) -s \
117 BUILD_DIR=$$MYBUILDDIR/chinachip/ \ 117 BUILD_DIR=$$MYBUILDDIR/chinachippatcher/ \
118 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/chinachippatcher \ 118 TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/chinachippatcher \
119 APPVERSION=\"rbutil\" \ 119 APPVERSION=\"rbutil\" \
120 libchinachip$$RBLIBPOSTFIX \ 120 libchinachippatcher$$RBLIBPOSTFIX \
121 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" 121 CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
122# Note: order is important for RBLIBS! The libs are appended to the linker 122# Note: order is important for RBLIBS! The libs are appended to the linker
123# flags in this order, put libucl at the end. 123# flags in this order, put libucl at the end.
124RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \ 124RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \
125 libmkmpioboot libchinachip libucl 125 libmkmpioboot libchinachippatcher libucl
126QMAKE_EXTRA_TARGETS += $$RBLIBS 126QMAKE_EXTRA_TARGETS += $$RBLIBS
127PRE_TARGETDEPS += $$RBLIBS 127PRE_TARGETDEPS += $$RBLIBS
128 128