summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-09-02 12:33:18 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-09-02 12:33:18 +0000
commite800bca6dca50fd3c6616cfcc3102d6cbdbec05d (patch)
treeb0c92d288e4b02530687a1117bbd31730f1aa07f /tools
parent42c125fad6ff6ddd1d59085632399d2032233e69 (diff)
downloadrockbox-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-xtools/configure38
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
# this is a check for a configure script in the current directory, it there
# is one, try to figure out if it is this one!
- if { grep "^# Jukebox" configure >/dev/null 2>&1 } ; then
+ if { grep "^# Jukebox" configure >/dev/null 2>&1 ; } then
echo "WEEEEEEEEP. Don't run this configure script within the tools directory."
echo "It will only cause you pain and grief. Instead do this:"
echo ""
@@ -206,6 +206,17 @@ if [ -z "$target" ]; then
esac
fi
+<<<<<<< configure
+if [ "-DARCHOS_RECORDER" = "$target" ] ; then
+
+ echo "Loadable fonts support? (y|n) [n]"
+ getit=`input`;
+ if [ "y" = "$getit" ] ; then
+ loadable_fonts="-DLOADABLE_FONTS"
+ fi
+fi
+
+=======
if [ "-" = "$extra_defines" ]; then
extra_defines=""
@@ -244,7 +255,11 @@ if [ "-" = "$extra_defines" ]; then
fi
fi
+<<<<<<< configure
+>>>>>>> 1.25
+=======
+>>>>>>> 1.35
if [ -z "$debug" ]; then
##################################################################
# Figure out debug on/off
@@ -320,7 +335,15 @@ sed > Makefile \
-e "s,@APPSDIR@,${appsdir},g" \
-e "s,@DEBUG@,${debug},g" \
-e "s,@TARGET@,${target},g" \
+<<<<<<< configure
+<<<<<<< configure
+ -e "s,@LOADABLE_FONTS@,${loadable_fonts},g" \
+=======
+ -e "s,@EXTRA_DEFINES@,${extra_defines},g" \
+>>>>>>> 1.25
+=======
-e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \
+>>>>>>> 1.35
-e "s,@PWD@,${pwd},g" \
<<EOF
## Automaticly generated. http://rockbox.haxx.se
@@ -332,16 +355,29 @@ TARGET=@TARGET@
THISDIR="@PWD@"
VERSION=\$(shell date +%y%m%d-%H%M)
+<<<<<<< configure
+EXTRA_CFLAGS=@LOADABLE_FONTS@
+=======
EXTRA_DEFINES=@EXTRA_DEFINES@
+>>>>>>> 1.25
.PHONY: firmware apps
all: firmware apps
+ for f in ../tools/*.ajf ; do cp \$\$f . ; done
firmware:
+<<<<<<< configure
+ make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_CFLAGS=\$(EXTRA_CFLAGS)
+=======
\$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES)
+>>>>>>> 1.25
apps:
+<<<<<<< configure
+ make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_CFLAGS=\$(EXTRA_CFLAGS)
+=======
\$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES)
+>>>>>>> 1.25
clean-firmware:
\$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean