rbutil: build our libraries in the build folder like everything else. Centralize the build rules for them within the project file.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23216 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 16 insertions, 29 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 959a10e10d..c1178b8967 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -9,10 +9,12 @@ unix:!mac:!noccache {
     }
 }
 
-OBJECTS_DIR = $$OUT_PWD/build/o
-UI_DIR = $$OUT_PWD/build/ui
-MOC_DIR = $$OUT_PWD/build/moc
-RCC_DIR = $$OUT_PWD/build/rcc
+MYBUILDDIR = $$OUT_PWD/build/
+OBJECTS_DIR = $$MYBUILDDIR/o
+UI_DIR = $$MYBUILDDIR/ui
+MOC_DIR = $$MYBUILDDIR/moc
+RCC_DIR = $$MYBUILDDIR/rcc
+
 
 # check version of Qt installation
 VER = $$find(QT_VERSION, ^4\.[3-9]+.*)
@@ -35,14 +37,19 @@ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex)
     LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp)
     LIBS += $$LIBSPEEX
 }
+# custom rules for rockbox-specific libs
 !mac {
-rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex.a
+rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex.a
+libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl.a
+libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a
 }
 mac {
-rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal
+rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal
+libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl-universal
+libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal
 }
-QMAKE_EXTRA_TARGETS += rbspeex
-PRE_TARGETDEPS += rbspeex
+QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot
+PRE_TARGETDEPS += rbspeex libucl libmkamsboot
 
 # rule for creating ctags file
 tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES)
@@ -56,26 +63,6 @@ QMAKE_EXTRA_TARGETS += lrelease
     PRE_TARGETDEPS += lrelease
 }
 
-#custom rules for libucl.a
-!mac {
-libucl.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/ucl/src libucl.a
-}
-mac {
-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) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a
-}
-mac {
-libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal
-}
-QMAKE_EXTRA_TARGETS += libmkamsboot
-PRE_TARGETDEPS += libmkamsboot
-
 SOURCES += rbutilqt.cpp \
  main.cpp \
  install.cpp \
@@ -192,7 +179,7 @@ INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher
 
 DEPENDPATH = $$INCLUDEPATH
 
-LIBS += -L$$OUT_PWD -lrbspeex -lmkamsboot -lucl
+LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lucl
 
 TEMPLATE = app
 dbg {