diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-09-02 12:33:18 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-02 12:33:18 +0000 |
commit | e800bca6dca50fd3c6616cfcc3102d6cbdbec05d (patch) | |
tree | b0c92d288e4b02530687a1117bbd31730f1aa07f /tools | |
parent | 42c125fad6ff6ddd1d59085632399d2032233e69 (diff) | |
download | rockbox-e800bca6dca50fd3c6616cfcc3102d6cbdbec05d.tar.gz rockbox-e800bca6dca50fd3c6616cfcc3102d6cbdbec05d.zip |
make it bourne shell pure
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2129 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure index f8dd633738..c5f4876703 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -24,7 +24,7 @@ if test -r "configure"; then | |||
24 | # this is a check for a configure script in the current directory, it there | 24 | # this is a check for a configure script in the current directory, it there |
25 | # is one, try to figure out if it is this one! | 25 | # is one, try to figure out if it is this one! |
26 | 26 | ||
27 | if { grep "^# Jukebox" configure >/dev/null 2>&1 } ; then | 27 | if { grep "^# Jukebox" configure >/dev/null 2>&1 ; } then |
28 | echo "WEEEEEEEEP. Don't run this configure script within the tools directory." | 28 | echo "WEEEEEEEEP. Don't run this configure script within the tools directory." |
29 | echo "It will only cause you pain and grief. Instead do this:" | 29 | echo "It will only cause you pain and grief. Instead do this:" |
30 | echo "" | 30 | echo "" |
@@ -206,6 +206,17 @@ if [ -z "$target" ]; then | |||
206 | esac | 206 | esac |
207 | fi | 207 | fi |
208 | 208 | ||
209 | <<<<<<< configure | ||
210 | if [ "-DARCHOS_RECORDER" = "$target" ] ; then | ||
211 | |||
212 | echo "Loadable fonts support? (y|n) [n]" | ||
213 | getit=`input`; | ||
214 | if [ "y" = "$getit" ] ; then | ||
215 | loadable_fonts="-DLOADABLE_FONTS" | ||
216 | fi | ||
217 | fi | ||
218 | |||
219 | ======= | ||
209 | if [ "-" = "$extra_defines" ]; then | 220 | if [ "-" = "$extra_defines" ]; then |
210 | extra_defines="" | 221 | extra_defines="" |
211 | 222 | ||
@@ -244,7 +255,11 @@ if [ "-" = "$extra_defines" ]; then | |||
244 | fi | 255 | fi |
245 | fi | 256 | fi |
246 | 257 | ||
258 | <<<<<<< configure | ||
259 | >>>>>>> 1.25 | ||
260 | ======= | ||
247 | 261 | ||
262 | >>>>>>> 1.35 | ||
248 | if [ -z "$debug" ]; then | 263 | if [ -z "$debug" ]; then |
249 | ################################################################## | 264 | ################################################################## |
250 | # Figure out debug on/off | 265 | # Figure out debug on/off |
@@ -320,7 +335,15 @@ sed > Makefile \ | |||
320 | -e "s,@APPSDIR@,${appsdir},g" \ | 335 | -e "s,@APPSDIR@,${appsdir},g" \ |
321 | -e "s,@DEBUG@,${debug},g" \ | 336 | -e "s,@DEBUG@,${debug},g" \ |
322 | -e "s,@TARGET@,${target},g" \ | 337 | -e "s,@TARGET@,${target},g" \ |
338 | <<<<<<< configure | ||
339 | <<<<<<< configure | ||
340 | -e "s,@LOADABLE_FONTS@,${loadable_fonts},g" \ | ||
341 | ======= | ||
342 | -e "s,@EXTRA_DEFINES@,${extra_defines},g" \ | ||
343 | >>>>>>> 1.25 | ||
344 | ======= | ||
323 | -e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \ | 345 | -e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \ |
346 | >>>>>>> 1.35 | ||
324 | -e "s,@PWD@,${pwd},g" \ | 347 | -e "s,@PWD@,${pwd},g" \ |
325 | <<EOF | 348 | <<EOF |
326 | ## Automaticly generated. http://rockbox.haxx.se | 349 | ## Automaticly generated. http://rockbox.haxx.se |
@@ -332,16 +355,29 @@ TARGET=@TARGET@ | |||
332 | THISDIR="@PWD@" | 355 | THISDIR="@PWD@" |
333 | VERSION=\$(shell date +%y%m%d-%H%M) | 356 | VERSION=\$(shell date +%y%m%d-%H%M) |
334 | 357 | ||
358 | <<<<<<< configure | ||
359 | EXTRA_CFLAGS=@LOADABLE_FONTS@ | ||
360 | ======= | ||
335 | EXTRA_DEFINES=@EXTRA_DEFINES@ | 361 | EXTRA_DEFINES=@EXTRA_DEFINES@ |
362 | >>>>>>> 1.25 | ||
336 | .PHONY: firmware apps | 363 | .PHONY: firmware apps |
337 | 364 | ||
338 | all: firmware apps | 365 | all: firmware apps |
366 | for f in ../tools/*.ajf ; do cp \$\$f . ; done | ||
339 | 367 | ||
340 | firmware: | 368 | firmware: |
369 | <<<<<<< configure | ||
370 | make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) | ||
371 | ======= | ||
341 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) | 372 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) |
373 | >>>>>>> 1.25 | ||
342 | 374 | ||
343 | apps: | 375 | apps: |
376 | <<<<<<< configure | ||
377 | make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) | ||
378 | ======= | ||
344 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) | 379 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) |
380 | >>>>>>> 1.25 | ||
345 | 381 | ||
346 | clean-firmware: | 382 | clean-firmware: |
347 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean | 383 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean |