[tomj@pikkukde BUILD]$ diff -u Makefile ../../BUILD/Makefile
--- Makefile 2011-02-09 21:11:11.215153591 +0100
+++ ../../BUILD/Makefile 2011-02-09 21:09:47.730159680 +0100
@@ -1,6 +1,6 @@
## Automatically generated. http://www.rockbox.org/
-export ROOTDIR=/home/maemo/MyProjects/rockbox/ANOTHER_TREE
+export ROOTDIR=/home/maemo/MyProjects/rockbox
export FIRMDIR=$(ROOTDIR)/firmware
export APPSDIR=$(ROOTDIR)/apps
export TOOLSDIR=$(ROOTDIR)/tools
@@ -10,19 +10,19 @@
export MODELNAME=application
export ARCHOSROM=
export FLASHFILE=
-export TARGET_ID=100
+export TARGET_ID=76
export TARGET=-DAPPLICATION
export CPU=hosted
export MANUFACTURER=maemo
-export OBJDIR=/home/maemo/MyProjects/rockbox/ANOTHER_TREE/BUILD
-export BUILDDIR=/home/maemo/MyProjects/rockbox/ANOTHER_TREE/BUILD
+export OBJDIR=/home/maemo/MyProjects/rockbox/BUILD
+export BUILDDIR=/home/maemo/MyProjects/rockbox/BUILD
export LANGUAGE=english
export VOICELANGUAGE=
export MEMORYSIZE=8
export BUILDDATE:=$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d')
export MKFIRMWARE=cp
-export BMP2RB_MONO=/home/maemo/MyProjects/rockbox/ANOTHER_TREE/tools/bmp2rb -f 0
-export BMP2RB_NATIVE=/home/maemo/MyProjects/rockbox/ANOTHER_TREE/tools/bmp2rb -f 4
+export BMP2RB_MONO=/home/maemo/MyProjects/rockbox/tools/bmp2rb -f 0
+export BMP2RB_NATIVE=/home/maemo/MyProjects/rockbox/tools/bmp2rb -f 4
export BMP2RB_REMOTEMONO=
export BMP2RB_REMOTENATIVE=
export BINARY=rockbox
@@ -43,7 +43,7 @@
export RANLIB=/scratchbox/compilers/bin/ranlib
export PREFIX=
export PROFILE_OPTS=
-export APP_TYPE=sdl-app
+export APP_TYPE=
export SIMDIR=$(ROOTDIR)/uisimulator/sdl
export GCCOPTS=-W -Wall -O -Wstrict-prototypes -pipe -std=gnu99 -fno-builtin -g -I$(SIMDIR) -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL -pthread -I/usr/include/dbus-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/dbus-1.0/include -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -O2 -fno-strict-aliasing -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/include/libplayback-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -Wno-pointer-sign -Wno-override-init
export TARGET_INC=-I$(FIRMDIR)/target/hosted/maemo/app -I$(FIRMDIR)/target/hosted/sdl/app -I$(FIRMDIR)/target/hosted/sdl -I$(FIRMDIR)/target/hosted/maemo -I$(FIRMDIR)/target/hosted
@@ -66,7 +66,7 @@
export ROCKBOX_LIBRARY_PATH=/opt/rockbox/lib
export SDLCONFIG=
-CONFIGURE_OPTIONS=--platform=M --lcdwidth=800 --lcdheight=480 --target=$(MODELNAME) --ram=$(MEMORYSIZE) --rbdir=$(RBDIR) --type=N
+CONFIGURE_OPTIONS=--target=$(APP_MODELNAME) --lcdwidth=800 --lcdheight=480 --ram=$(MEMORYSIZE) --rbdir=$(RBDIR) --type=N
include $(TOOLSDIR)/root.make