From b81a116f7fc77b5b67e41bb5d378c8086677e5cb Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 30 Aug 2010 17:52:01 +0000
Subject: [PATCH] Update INSTALL file and move it in preparation of merging
 rbutil/ and utils/.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27946 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutil.pro             |  2 --
 rbutil/{ => rbutilqt}/INSTALL | 24 ++++++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 rbutil/rbutil.pro
 rename rbutil/{ => rbutilqt}/INSTALL (69%)

diff --git a/rbutil/rbutil.pro b/rbutil/rbutil.pro
deleted file mode 100644
index 7e8f422402..0000000000
--- a/rbutil/rbutil.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = rbutilqt
-TEMPLATE = subdirs
\ No newline at end of file
diff --git a/rbutil/INSTALL b/rbutil/rbutilqt/INSTALL
similarity index 69%
rename from rbutil/INSTALL
rename to rbutil/rbutilqt/INSTALL
index 55b0dcd3cf..a145c2cb74 100644
--- a/rbutil/INSTALL
+++ b/rbutil/rbutilqt/INSTALL
@@ -20,9 +20,9 @@ for Rockbox.
 
 Requirements:
 =============
-- Qt 4.3.0 or greater
+- Qt 4.5.0 or greater
 - at least the following folders from Rockbox svn:
-  o apps/
+  o apps/codecs/libspeex
   o rbutil/
   o tools/
 - libusb (Linux, Mac)
@@ -31,8 +31,17 @@ Building:
 =========
 - run qmake
 - run make
-The resulting binary will be located in the rbutilqt subfolder. If you have
-multiple versions of Qt installed make sure to pick the correct one.
+
+Build Options:
+==============
+- static
+  add "-config static" to the qmake call to build a static binary. Note that
+  this also requires that you have a statically built version of Qt.
+- dbg
+  add "-config dbg" to build with debug symbols.
+- silent
+  add "-config silent" to the qmake call. This is an undocumented feature of
+  Qt itself. Note that this doesn't seem to work on Windows and Mac OS X.
 
 Installation / Deployment:
 ==========================
@@ -40,10 +49,13 @@ Rockbox Utility is build as all-in-one binary. This means for distribution
 you need:
 - RockboxUtility (main binary)
 - rbutil_*.qm (translation files, optional)
-You don't need any other files like configuration files, especially 
+You don't need any other files like configuration files, especially
 rbutil.ini which will get included into the binary.
 
+The script deploy-release.py automates building deployment binaries. For a
+complete list of paths to get from svn to build please check its source.
 
-The website for Rockbox Utility is 
+
+The website for Rockbox Utility is
 http://www.rockbox.org/wiki/RockboxUtility