diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 10 |
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 | |||
315 | cd $now | 315 | cd $now |
316 | fi | 316 | fi |
317 | 317 | ||
318 | 318 | apps="apps" | |
319 | appsdir='\$(ROOTDIR)/apps' | 319 | appsdir='\$(ROOTDIR)/apps' |
320 | 320 | ||
321 | if [ -z "$archos" ]; then | 321 | if [ -z "$archos" ]; then |
@@ -501,6 +501,7 @@ if [ -z "$debug" ]; then | |||
501 | fi | 501 | fi |
502 | extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES | 502 | extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES |
503 | appsdir='\$(ROOTDIR)/bootloader' | 503 | appsdir='\$(ROOTDIR)/bootloader' |
504 | apps="bootloader" | ||
504 | bootloader="1" | 505 | bootloader="1" |
505 | echo "Bootloader build selected" | 506 | echo "Bootloader build selected" |
506 | ;; | 507 | ;; |
@@ -628,6 +629,7 @@ sed > Makefile \ | |||
628 | -e "s,@LOADADDRESS@,${loadaddress},g" \ | 629 | -e "s,@LOADADDRESS@,${loadaddress},g" \ |
629 | -e "s,@EXTRADEF@,${extradefines},g" \ | 630 | -e "s,@EXTRADEF@,${extradefines},g" \ |
630 | -e "s,@APPSDIR@,${appsdir},g" \ | 631 | -e "s,@APPSDIR@,${appsdir},g" \ |
632 | -e "s,@APPS@,${apps},g" \ | ||
631 | -e "s,@SIMVER@,${simver},g" \ | 633 | -e "s,@SIMVER@,${simver},g" \ |
632 | -e "s,@GCCVER@,${gccver},g" \ | 634 | -e "s,@GCCVER@,${gccver},g" \ |
633 | -e "s,@GCCNUM@,${gccnum},g" \ | 635 | -e "s,@GCCNUM@,${gccnum},g" \ |
@@ -682,12 +684,12 @@ MAKEFLAGS += --no-print-directory | |||
682 | 684 | ||
683 | all: | 685 | all: |
684 | @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware | 686 | @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware |
685 | @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/apps | 687 | @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ |
686 | 688 | ||
687 | clean: | 689 | clean: |
688 | @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware | 690 | @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware |
689 | @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/apps | 691 | @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@ |
690 | @rm -rf rockbox.zip TAGS apps firmware comsim sim | 692 | @rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim |
691 | 693 | ||
692 | tags: | 694 | tags: |
693 | @rm -f TAGS | 695 | @rm -f TAGS |