2 files changed, 37 insertions, 30 deletions

diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile
index 3b4cc11404..8f4953a9e3 100644
--- a/rbutil/mkamsboot/Makefile
+++ b/rbutil/mkamsboot/Makefile
@@ -25,18 +25,17 @@ endif
 endif
 endif
 
-CC?= gcc
 
 ifdef RBARCH
 CFLAGS += -arch $(RBARCH)
 endif
 
-OUT = build$(RBARCH)
+OUT = $(TARGET_DIR)build$(RBARCH)
 
 all: $(OUTPUT)
 
 $(LIBUCL):
-        make -C ../../tools/ucl/src libucl.a
+        make -C ../../tools/ucl/src $(TARGET_DIR)libucl.a
 
 # This file can be generated in the dualboot/ directory
 $(OUT)/dualboot.o: dualboot.c
@@ -55,27 +54,27 @@ $(OUT)/libmkamsboot.o: mkamsboot.c dualboot.h md5.h
         $(CC) $(CFLAGS) -DLIB -c -o $(OUT)/libmkamsboot.o -W -Wall mkamsboot.c
 
 libmkamsboot$(RBARCH).a: $(OUT) $(OUT)/libmkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o
-        $(AR) ru libmkamsboot$(RBARCH).a $(OUT)/libmkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o
+        $(AR) ru $(TARGET_DIR)libmkamsboot$(RBARCH).a $(OUT)/libmkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o
 
 # some trickery to build ppc and i386 from a single call
 ifeq ($(RBARCH),)
 libmkamsbooti386.a:
-        make RBARCH=i386 libmkamsbooti386.a
+        make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmkamsbooti386.a
 
 libmkamsbootppc.a:
-        make RBARCH=ppc libmkamsbootppc.a
+        make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmkamsbootppc.a
 endif    
     
 libmkamsboot-universal: libmkamsbooti386.a libmkamsbootppc.a
-        @echo lipo libmkamsboot.a
-        $(SILENT) rm -f libmkamsboot.a
-        lipo -create libmkamsbootppc.a libmkamsbooti386.a -output libmkamsboot.a    
+        @echo lipo $(TARGET_DIR)libmkamsboot.a
+        $(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a
+        lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a    
     
 clean:
-        rm -f $(OUTPUT) libmkamsboot.o libmkamsboot*.a
+        rm -f $(OUTPUT) libmkamsboot.o $(TARGET_DIR)libmkamsboot*.a
         rm -rf build*
     
-build$(RBARCH):
-        @echo MKDIR build$(RBARCH)
-        $(SILENT)mkdir build$(RBARCH)
+$(OUT):
+        @echo MKDIR $(OUT)
+        $(SILENT)mkdir $(OUT)
 
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 78c399ebd7..cdae11dc5c 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -1,3 +1,6 @@
+
+
+# ccache
 unix:!mac {
     CCACHE = $$system(which ccache)
     !isEmpty(CCACHE) {
@@ -7,10 +10,10 @@ unix:!mac {
     }
 }
 
-OBJECTS_DIR = build/o
-UI_DIR = build/ui
-MOC_DIR = build/moc
-RCC_DIR = build/rcc
+OBJECTS_DIR = $$OUT_PWD/build/o
+UI_DIR = $$OUT_PWD/build/ui
+MOC_DIR = $$OUT_PWD/build/moc
+RCC_DIR = $$OUT_PWD/build/rcc
 
 # check version of Qt installation
 VER = $$find(QT_VERSION, ^4\.[3-9]+.*)
@@ -20,12 +23,17 @@ isEmpty(VER) {
 }
 message("Qt version used:" $$VER)
 
+RBBASE_DIR = $$_PRO_FILE_PWD_
+RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
+
+message("Rockbox Base dir: "$$RBBASE_DIR)
+
 # add a custom rule for pre-building librbspeex
 !mac {
-rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a
+rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex.a
 }
 mac {
-rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex-universal
+rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal
 }
 QMAKE_EXTRA_TARGETS += rbspeex
 PRE_TARGETDEPS += rbspeex
@@ -36,7 +44,7 @@ tags.depends = $(SOURCES)
 QMAKE_EXTRA_TARGETS += tags
 
 # add a custom rule for making the translations
-lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro
+lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent $$_PRO_FILE_
 QMAKE_EXTRA_TARGETS += lrelease
 !dbg {
     PRE_TARGETDEPS += lrelease
@@ -44,20 +52,20 @@ QMAKE_EXTRA_TARGETS += lrelease
 
 #custom rules for libucl.a
 !mac {
-libucl.commands = @$(MAKE) -C ../../tools/ucl/src libucl.a
+libucl.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/ucl/src libucl.a
 }
 mac {
-libucl.commands = @$(MAKE) -C ../../tools/ucl/src libucl-universal
+libucl.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/ucl/src libucl-universal
 }
 QMAKE_EXTRA_TARGETS += libucl
 PRE_TARGETDEPS += libucl
 
 #custom rules for libmkamsboot.a
 !mac {
-libmkamsboot.commands = @$(MAKE) -C ../mkamsboot libmkamsboot.a
+libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a
 }
 mac {
-libmkamsboot.commands = @$(MAKE) -C ../mkamsboot libmkamsboot-universal
+libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal
 }
 QMAKE_EXTRA_TARGETS += libmkamsboot
 PRE_TARGETDEPS += libmkamsboot
@@ -167,10 +175,10 @@ HEADERS += rbutilqt.h \
  ../../tools/iriver.h 
  
 # Needed by QT on Win
-INCLUDEPATH = . irivertools zip zlib ../ipodpatcher ../sansapatcher ../../tools/rbspeex ../../tools
-INCLUDEPATH += base
+INCLUDEPATH = $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools $$_PRO_FILE_PWD_/zip $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base
+INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher $$RBBASE_DIR/tools/rbspeex $$RBBASE_DIR/tools
 
-LIBS += -L../../tools/rbspeex -lrbspeex -L../mkamsboot -lmkamsboot -L../../tools/ucl/src/ -lucl
+LIBS += -L$$OUT_PWD -lrbspeex -lmkamsboot -lucl
 
 TEMPLATE = app
 dbg {
@@ -201,12 +209,12 @@ FORMS += rbutilqtfrm.ui \
  sysinfofrm.ui \
  systracefrm.ui
 
-RESOURCES += rbutilqt.qrc
+RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc
 win32 {
-    RESOURCES += rbutilqt-win.qrc
+    RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc
 }
 !dbg {
-    RESOURCES += rbutilqt-lang.qrc
+    RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-lang.qrc
 }
 
 TRANSLATIONS += lang/rbutil_de.ts \