Update docs for static building

diff --git a/dev-notes/build-static-qt.txt b/dev-notes/build-static-qt.txt
deleted file mode 100644 (file)
index 5d29b41..0000000
--- a/dev-notes/build-static-qt.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# NOTE: Have a look at build-static-quassel.txt instead!
-
-[16:35:11] <EgS> 1.)
-[16:35:12] <EgS> ./configure -no-accessibility -qt-sql-sqlite -no-qt3support
--no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -nomake demos -nomake
-examples -nomake gui -nomake uic -nomake opengl -nomake tools -no-opengl
--no-sm -no-xshape -no-xinerama -no-xcursor -no-xfixes -no-xrandr -no-xrender
--no-fontconfig -no-tablet -no-xkb
-[16:35:31] <EgS> 2.)
-[16:35:31] <EgS> $ cat QT4_TARGET_DIRECTORIES
-[16:35:31] <EgS> src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml src/network src/sql src/plugins/codecs src/script
-[16:35:38] <EgS> so eine datei ist sehr hilfreich
-[16:35:40] <EgS> und dann im src dir:
-[16:36:21] <EgS> for i in `cat /home/irc/QT4_TARGET_DIRECTORIES`; do make -C $i; done
-[16:36:28] <EgS> naja...
-[16:36:33] <EgS> $pfad halt :)
-[16:36:50] <EgS> das ganze kannste dann noch mit "make install" machen
-
-for static core:
-./configure -static -no-accessibility -qt-sql-sqlite -qt-zlib -no-qt3support \
--no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -nomake demos -nomake examples \
--nomake gui -nomake uic -nomake opengl -nomake tools -no-opengl -no-sm -no-xshape \
--no-xinerama -no-xcursor -no-xfixes -no-xrandr -no-xrender -no-fontconfig -no-tablet \
--no-xkb -no-glib -no-svg -openssl-linked -no-phonon -no-webkit -no-dbus -no-xmlpatterns \
--prefix /usr/local/Trolltech/qt-4.4-static
-
-for i in `cat /home/sputnick/devel/quassel/dev-notes/QT4_TARGET_DIRECTORIES`; do make -C $i; done

diff --git a/dev-notes/build-static-quassel.txt b/doc/build-static-quassel
similarity index 74%
rename from dev-notes/build-static-quassel.txt
rename to doc/build-static-quassel
index bc9d4d3..1f36764 100644 (file)
--- a/dev-notes/build-static-quassel.txt
+++ b/doc/build-static-quassel
@@ -15,17 +15,19 @@ and OpenSSL. Note that these are just hints that work for me; ymmv.
 
     To only build non-X dependent parts of Qt:
 
-    for i in `cat /path/to/quassel/dev-notes/QT4_TARGET_DIRECTORIES`; do make -C $i; done
+    $> export QT4_TARGET_DIRECTORIES="src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml \
+                                     src/network src/sql src/plugins/codecs src/script"
+    $> for i in $QT4_TARGET_DIRECTORIES; do make -C $i; done
 
     NOTE: This has not really been tested and may or may not be working for
           you. If in doubt, follow the official route and just do make
           and make install.
 
-2.) Link some system libs into /path/to/quassel/build/contrib/libs:
+2.) Link some system libs into /path/to/builddir/staticlibs
     (we need this, because otherwise your quasselcore wouldn't be
     portable)
 
-    On my system, I have this in build/contrib/libs:
+    On my system, I have this in staticlibs:
       libcrypto.a -> /usr/lib/libcrypto.a
       libssl.a -> /usr/lib/libssl.a
       libstdc++.a -> /usr/lib/gcc/i686-pc-linux-gnu/4.2.3/libstdc++.a
@@ -34,8 +36,8 @@ and OpenSSL. Note that these are just hints that work for me; ymmv.
 
 3.) Build Quassel Core:
     
-    cd /path/to/quassel
-    /path/to/static/qt/bin/qmake -config static BUILD=core
-    make
+    $> cd /path/to/builddir
+    $> cmake /path/to/source -DSTATIC=1 -DWANT_QTCLIENT=0 -DWANT_MONO=0 -DQT=/usr/local/Trolltech/qt-4.4-static
+    $> make
 
 4.) Enjoy.