diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2011-08-13 20:03:23 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-08-13 20:03:23 +0000 |
commit | cea0654d186d1ca81d461764d2a52cef281dafa7 (patch) | |
tree | 92e39b76c1f9128304934e24386626771ca32575 /tools/configure | |
parent | adb1b5240421c94598574aa531cbfe45b581b331 (diff) | |
download | rockbox-cea0654d186d1ca81d461764d2a52cef281dafa7.tar.gz rockbox-cea0654d186d1ca81d461764d2a52cef281dafa7.zip |
configure: don't use sed to generate the Makefile
remove a few obsolete options
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30286 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 221 |
1 files changed, 69 insertions, 152 deletions
diff --git a/tools/configure b/tools/configure index 227bd576df..3a4e6c4cfa 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -3609,16 +3609,6 @@ if test -n "$t_cpu"; then | |||
3609 | GCCOPTS="$GCCOPTS" | 3609 | GCCOPTS="$GCCOPTS" |
3610 | fi | 3610 | fi |
3611 | 3611 | ||
3612 | if test "$simulator" = "yes"; then | ||
3613 | # add simul make stuff on the #SIMUL# line | ||
3614 | simmagic1="s<@SIMUL1@<\$(SILENT)\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim<" | ||
3615 | simmagic2="s<@SIMUL2@<\$(SILENT)\$(MAKE) -C \$(ROOTDIR)/uisimulator/common OBJDIR=\$(BUILDDIR)/comsim<" | ||
3616 | else | ||
3617 | # delete the lines that match | ||
3618 | simmagic1='/@SIMUL1@/D' | ||
3619 | simmagic2='/@SIMUL2@/D' | ||
3620 | fi | ||
3621 | |||
3622 | if test "$swcodec" = "yes"; then | 3612 | if test "$swcodec" = "yes"; then |
3623 | voicetoolset="rbspeexenc voicefont wavtrim" | 3613 | voicetoolset="rbspeexenc voicefont wavtrim" |
3624 | else | 3614 | else |
@@ -3647,154 +3637,81 @@ cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) | |||
3647 | 3637 | ||
3648 | ### end of cmdline | 3638 | ### end of cmdline |
3649 | 3639 | ||
3650 | sed > Makefile \ | 3640 | cat > Makefile <<EOF |
3651 | -e "s<@ROOTDIR@<${rootdir}<g" \ | ||
3652 | -e "s<@DEBUG@<${debug}<g" \ | ||
3653 | -e "s<@MEMORY@<${memory}<g" \ | ||
3654 | -e "s<@TARGET_ID@<${target_id}<g" \ | ||
3655 | -e "s<@TARGET@<${target}<g" \ | ||
3656 | -e "s<@CPU@<${t_cpu}<g" \ | ||
3657 | -e "s<@MANUFACTURER@<${t_manufacturer}<g" \ | ||
3658 | -e "s<@MODELNAME@<${modelname}<g" \ | ||
3659 | -e "s<@LANGUAGE@<${language}<g" \ | ||
3660 | -e "s:@VOICELANGUAGE@:${voicelanguage}:g" \ | ||
3661 | -e "s<@PWD@<${pwd}<g" \ | ||
3662 | -e "s<@HOSTCC@<${HOSTCC}<g" \ | ||
3663 | -e "s<@HOSTAR@<${HOSTAR}<g" \ | ||
3664 | -e "s<@CC@<${CC}<g" \ | ||
3665 | -e "s<@LD@<${LD}<g" \ | ||
3666 | -e "s<@AR@<${AR}<g" \ | ||
3667 | -e "s<@AS@<${AS}<g" \ | ||
3668 | -e "s<@OC@<${OC}<g" \ | ||
3669 | -e "s<@WINDRES@<${WINDRES}<g" \ | ||
3670 | -e "s<@DLLTOOL@<${DLLTOOL}<g" \ | ||
3671 | -e "s<@DLLWRAP@<${DLLWRAP}<g" \ | ||
3672 | -e "s<@RANLIB@<${RANLIB}<g" \ | ||
3673 | -e "s<@TOOL@<${tool}<g" \ | ||
3674 | -e "s<@BMP2RB_NATIVE@<${bmp2rb_native}<g" \ | ||
3675 | -e "s<@BMP2RB_MONO@<${bmp2rb_mono}<g" \ | ||
3676 | -e "s<@BMP2RB_REMOTENATIVE@<${bmp2rb_remotenative}<g" \ | ||
3677 | -e "s<@BMP2RB_REMOTEMONO@<${bmp2rb_remotemono}<g" \ | ||
3678 | -e "s<@OUTPUT@<${output}<g" \ | ||
3679 | -e "s<@APPEXTRA@<${appextra}<g" \ | ||
3680 | -e "s<@ARCHOSROM@<${archosrom}<g" \ | ||
3681 | -e "s<@FLASHFILE@<${flash}<g" \ | ||
3682 | -e "s<@PLUGINS@<${plugins}<g" \ | ||
3683 | -e "s<@CODECS@<${swcodec}<g" \ | ||
3684 | -e "s<@PROFILE_OPTS@<${PROFILE_OPTS}<g" \ | ||
3685 | -e "s<@SHARED_LDFLAG@<${SHARED_LDFLAG}<g" \ | ||
3686 | -e "s<@SHARED_CFLAGS@<${SHARED_CFLAGS}<g" \ | ||
3687 | -e "s<@GCCOPTS@<${GCCOPTS}<g" \ | ||
3688 | -e "s<@TARGET_INC@<${TARGET_INC}<g" \ | ||
3689 | -e "s<@LDOPTS@<${LDOPTS}<g" \ | ||
3690 | -e "s<@GLOBAL_LDOPTS@<${GLOBAL_LDOPTS}<g" \ | ||
3691 | -e "s<@LOADADDRESS@<${loadaddress}<g" \ | ||
3692 | -e "s<@EXTRADEF@<${extradefines}<g" \ | ||
3693 | -e "s<@APPSDIR@<${appsdir}<g" \ | ||
3694 | -e "s<@FIRMDIR@<${firmdir}<g" \ | ||
3695 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ | ||
3696 | -e "s<@APPS@<${apps}<g" \ | ||
3697 | -e "s<@APP_TYPE@<${app_type}<g" \ | ||
3698 | -e "s<@APPLICATION@<${application}<g" \ | ||
3699 | -e "s<@GCCVER@<${gccver}<g" \ | ||
3700 | -e "s<@GCCNUM@<${gccnum}<g" \ | ||
3701 | -e "s<@UNAME@<${uname}<g" \ | ||
3702 | -e "s<@ENDIAN@<${defendian}<g" \ | ||
3703 | -e "s<@TOOLSET@<${toolset}<g" \ | ||
3704 | -e "${simmagic1}" \ | ||
3705 | -e "${simmagic2}" \ | ||
3706 | -e "s<@MANUALDEV@<${manualdev}<g" \ | ||
3707 | -e "s<@ENCODER@<${ENC_CMD}<g" \ | ||
3708 | -e "s<@ENC_OPTS@<${ENC_OPTS}<g" \ | ||
3709 | -e "s<@TTS_ENGINE@<${TTS_ENGINE}<g" \ | ||
3710 | -e "s<@TTS_OPTS@<${TTS_OPTS}<g" \ | ||
3711 | -e "s<@VOICETOOLSET@<${voicetoolset}<g" \ | ||
3712 | -e "s<@LANGS@<${buildlangs}<g" \ | ||
3713 | -e "s<@USE_ELF@<${USE_ELF}<g" \ | ||
3714 | -e "s<@RBDIR@<${rbdir}<g" \ | ||
3715 | -e "s<@sharepath@<${sharedir}<g" \ | ||
3716 | -e "s<@binpath@<${bindir}<g" \ | ||
3717 | -e "s<@libpath@<${libdir}<g" \ | ||
3718 | -e "s<@PREFIX@<$ARG_PREFIX<g" \ | ||
3719 | -e "s<@CMDLINE@<$cmdline<g" \ | ||
3720 | -e "s<@SDLCONFIG@<$sdl<g" \ | ||
3721 | -e "s<@LCDORIENTATION@<$lcd_orientation<g" \ | ||
3722 | <<EOF | ||
3723 | ## Automatically generated. http://www.rockbox.org/ | 3641 | ## Automatically generated. http://www.rockbox.org/ |
3724 | 3642 | ||
3725 | export ROOTDIR=@ROOTDIR@ | 3643 | export ROOTDIR=${rootdir} |
3726 | export FIRMDIR=@FIRMDIR@ | 3644 | export FIRMDIR=${firmdir} |
3727 | export APPSDIR=@APPSDIR@ | 3645 | export APPSDIR=${appsdir} |
3728 | export TOOLSDIR=@TOOLSDIR@ | 3646 | export TOOLSDIR=${toolsdir} |
3729 | export DOCSDIR=\$(ROOTDIR)/docs | 3647 | export DOCSDIR=${rootdir}/docs |
3730 | export MANUALDIR=\${ROOTDIR}/manual | 3648 | export MANUALDIR=${rootdir}/manual |
3731 | export DEBUG=@DEBUG@ | 3649 | export DEBUG=${debug} |
3732 | export MODELNAME=@MODELNAME@ | 3650 | export MODELNAME=${modelname} |
3733 | export ARCHOSROM=@ARCHOSROM@ | 3651 | export ARCHOSROM=${archosrom} |
3734 | export FLASHFILE=@FLASHFILE@ | 3652 | export FLASHFILE=${flash} |
3735 | export TARGET_ID=@TARGET_ID@ | 3653 | export TARGET_ID=${target_id} |
3736 | export TARGET=@TARGET@ | 3654 | export TARGET=${target} |
3737 | export CPU=@CPU@ | 3655 | export CPU=${t_cpu} |
3738 | export MANUFACTURER=@MANUFACTURER@ | 3656 | export MANUFACTURER=${t_manufacturer} |
3739 | export OBJDIR=@PWD@ | 3657 | export OBJDIR=${pwd} |
3740 | export BUILDDIR=@PWD@ | 3658 | export BUILDDIR=${pwd} |
3741 | export LANGUAGE=@LANGUAGE@ | 3659 | export LANGUAGE=${language} |
3742 | export VOICELANGUAGE=@VOICELANGUAGE@ | 3660 | export VOICELANGUAGE=${voicelanguage} |
3743 | export MEMORYSIZE=@MEMORY@ | 3661 | export MEMORYSIZE=${memory} |
3744 | export BUILDDATE:=\$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d') | 3662 | export BUILDDATE:=\$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d') |
3745 | export MKFIRMWARE=@TOOL@ | 3663 | export MKFIRMWARE=${tool} |
3746 | export BMP2RB_MONO=@BMP2RB_MONO@ | 3664 | export BMP2RB_MONO=${bmp2rb_mono} |
3747 | export BMP2RB_NATIVE=@BMP2RB_NATIVE@ | 3665 | export BMP2RB_NATIVE=${bmp2fb_native} |
3748 | export BMP2RB_REMOTEMONO=@BMP2RB_REMOTEMONO@ | 3666 | export BMP2RB_REMOTEMONO=${bmp2rb_remotemono} |
3749 | export BMP2RB_REMOTENATIVE=@BMP2RB_REMOTENATIVE@ | 3667 | export BMP2RB_REMOTENATIVE=${bmp2rb_remotenative} |
3750 | export BINARY=@OUTPUT@ | 3668 | export BINARY=${output} |
3751 | export APPEXTRA=@APPEXTRA@ | 3669 | export APPEXTRA=${appextra} |
3752 | export ENABLEDPLUGINS=@PLUGINS@ | 3670 | export ENABLEDPLUGINS=${plugins} |
3753 | export SOFTWARECODECS=@CODECS@ | 3671 | export SOFTWARECODECS=${swcodec} |
3754 | export EXTRA_DEFINES=@EXTRADEF@ | 3672 | export EXTRA_DEFINES=${extradefines} |
3755 | export HOSTCC=@HOSTCC@ | 3673 | export HOSTCC=${HOSTCC} |
3756 | export HOSTAR=@HOSTAR@ | 3674 | export HOSTAR=${HOSTAR} |
3757 | export CC=@CC@ | 3675 | export CC=${CC} |
3758 | export LD=@LD@ | 3676 | export LD=${LD} |
3759 | export AR=@AR@ | 3677 | export AR=${AR} |
3760 | export AS=@AS@ | 3678 | export AS=${AS} |
3761 | export OC=@OC@ | 3679 | export OC=${OC} |
3762 | export WINDRES=@WINDRES@ | 3680 | export WINDRES=${WINDRES} |
3763 | export DLLTOOL=@DLLTOOL@ | 3681 | export DLLTOOL=${DLLTOOL} |
3764 | export DLLWRAP=@DLLWRAP@ | 3682 | export DLLWRAP=${DLLWRAP} |
3765 | export RANLIB=@RANLIB@ | 3683 | export RANLIB=${RANLIB} |
3766 | export PREFIX=@PREFIX@ | 3684 | export PREFIX=${ARG_PREFIX} |
3767 | export PROFILE_OPTS=@PROFILE_OPTS@ | 3685 | export PROFILE_OPTS=${PROFILE_OPTS} |
3768 | export APP_TYPE=@APP_TYPE@ | 3686 | export APP_TYPE=${app_type} |
3769 | export APPLICATION=@APPLICATION@ | 3687 | export APPLICATION=${application} |
3770 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | 3688 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl |
3771 | export GCCOPTS=@GCCOPTS@ | 3689 | export GCCOPTS=${GCCOPTS} |
3772 | export TARGET_INC=@TARGET_INC@ | 3690 | export TARGET_INC=${TARGET_INC} |
3773 | export LOADADDRESS=@LOADADDRESS@ | 3691 | export LOADADDRESS=${loadaddress} |
3774 | export SHARED_LDFLAG=@SHARED_LDFLAG@ | 3692 | export SHARED_LDFLAG=${SHARED_LDFLAG} |
3775 | export SHARED_CFLAGS=@SHARED_CFLAGS@ | 3693 | export SHARED_CFLAGS=${SHARED_CFLAGS} |
3776 | export LDOPTS=@LDOPTS@ | 3694 | export LDOPTS=${LDOPTS} |
3777 | export GLOBAL_LDOPTS=@GLOBAL_LDOPTS@ | 3695 | export GLOBAL_LDOPTS=${GLOBAL_LDOPTS} |
3778 | export GCCVER=@GCCVER@ | 3696 | export GCCVER=${gccver} |
3779 | export GCCNUM=@GCCNUM@ | 3697 | export GCCNUM=${gccnum} |
3780 | export UNAME=@UNAME@ | 3698 | export UNAME=${uname} |
3781 | export MANUALDEV=@MANUALDEV@ | 3699 | export MANUALDEV=${manualdev} |
3782 | export TTS_OPTS=@TTS_OPTS@ | 3700 | export TTS_OPTS=${TTS_OPTS} |
3783 | export TTS_ENGINE=@TTS_ENGINE@ | 3701 | export TTS_ENGINE=${TTS_ENGINE} |
3784 | export ENC_OPTS=@ENC_OPTS@ | 3702 | export ENC_OPTS=${ENC_OPTS} |
3785 | export ENCODER=@ENCODER@ | 3703 | export ENCODER=${ENC_CMD} |
3786 | export USE_ELF=@USE_ELF@ | 3704 | export USE_ELF=${USE_ELF} |
3787 | export RBDIR=@RBDIR@ | 3705 | export RBDIR=${rbdir} |
3788 | export ROCKBOX_SHARE_PATH=@sharepath@ | 3706 | export ROCKBOX_SHARE_PATH=${sharedir} |
3789 | export ROCKBOX_BINARY_PATH=@binpath@ | 3707 | export ROCKBOX_BINARY_PATH=${bindir} |
3790 | export ROCKBOX_LIBRARY_PATH=@libpath@ | 3708 | export ROCKBOX_LIBRARY_PATH=${libdir} |
3791 | export SDLCONFIG=@SDLCONFIG@ | 3709 | export SDLCONFIG=${sdl} |
3792 | export LCDORIENTATION=@LCDORIENTATION@ | 3710 | export LCDORIENTATION=${lcd_orientation} |
3793 | 3711 | ||
3794 | CONFIGURE_OPTIONS=@CMDLINE@ | 3712 | CONFIGURE_OPTIONS=${cmdline} |
3795 | 3713 | ||
3796 | include \$(TOOLSDIR)/root.make | 3714 | include \$(TOOLSDIR)/root.make |
3797 | |||
3798 | EOF | 3715 | EOF |
3799 | 3716 | ||
3800 | echo "Created Makefile" | 3717 | echo "Created Makefile" |