summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-05-07 23:16:08 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-05-07 23:16:08 +0000
commit57a09cdd74a7c973b155e1d2fd818951bdba5c53 (patch)
tree7db0c13beed38ec7018b14496a790436ac178063
parent113a58dca6769ac9f99420d856975f72ef707efb (diff)
downloadrockbox-57a09cdd74a7c973b155e1d2fd818951bdba5c53.tar.gz
rockbox-57a09cdd74a7c973b155e1d2fd818951bdba5c53.zip
produce a nicer root-level Makefile for the bootloader
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6423 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xtools/configure10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure
index 34d80328b9..cab737393b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -315,7 +315,7 @@ if [ -z "$rootdir" ]; then
cd $now
fi
-
+apps="apps"
appsdir='\$(ROOTDIR)/apps'
if [ -z "$archos" ]; then
@@ -501,6 +501,7 @@ if [ -z "$debug" ]; then
fi
extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
appsdir='\$(ROOTDIR)/bootloader'
+ apps="bootloader"
bootloader="1"
echo "Bootloader build selected"
;;
@@ -628,6 +629,7 @@ sed > Makefile \
-e "s,@LOADADDRESS@,${loadaddress},g" \
-e "s,@EXTRADEF@,${extradefines},g" \
-e "s,@APPSDIR@,${appsdir},g" \
+ -e "s,@APPS@,${apps},g" \
-e "s,@SIMVER@,${simver},g" \
-e "s,@GCCVER@,${gccver},g" \
-e "s,@GCCNUM@,${gccnum},g" \
@@ -682,12 +684,12 @@ MAKEFLAGS += --no-print-directory
all:
@\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
- @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/apps
+ @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
clean:
@\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
- @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/apps
- @rm -rf rockbox.zip TAGS apps firmware comsim sim
+ @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
+ @rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim
tags:
@rm -f TAGS