better docu for makefile options

diff --git a/Makefile b/Makefile
index 9093a69..6e498a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,41 @@
 ###########################################################
 # global Makefile for MagicSmoke
 # (c) Konrad Rosenbaum, 2008-2011
+#
+# This Makefile is used for creating the complete
+# MagicSmoke package - including all sub-packages in
+# the correct order.
+#
+# Adjust the configuration values below to match your
+# environment.
 ###########################################################
 
 ######
 #global configuration
 
-#change this if Qt is not in your PATH
+#change this if the correct Qt is not in your PATH
 QMAKE = qmake
+#QMAKE = /usr/local/Trolltech/Qt-4.8.0/bin/qmake
 
-#set this if you want arguments to qmake
+#set this if you want additional arguments to qmake
+# normally only a spec is usefule for this, see below
 QMAKEFLAGS =
 #if you want to use a non-standard spec use something like this:
-#QMAKEFLAGS = qmake -spec linux-icc-64
+#QMAKEFLAGS = -spec linux-icc-64
 
 #change this if doxygen uses a different name or is not in your PATH
 DOXYGEN = doxygen
 
-#the directory to install MagicSmoke to
+#the directory to install MagicSmoke to for preparation of packages
+# change this only if you want to install directly without building
+# packages first
 PREFIX = dist
 
 #the make utility to use
+# normally you do not need to change this, the macosx target changes it on its own
 MYMAKE = $(MAKE)
 
-#this builds the installation package
+#this builds the installation package on win32
 NSIS = makensis
 
 #set this to pass additional options to nsis
@@ -73,17 +85,16 @@ wob: woc
        cd wob && ../pack/woc/woc magicsmoke.wolf
 
 woc:
-       cd pack/woc && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
+       cd pack && $(MYMAKE)
 
-wbase:
-       cd pack/qtbase && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
+wbase: woc
 
 elam:
        cd elam/src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
 
 server: wob
 
-client: wob zip wbase tzone elam
+client: wob zip tzone elam
        cd src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
 
 zip:
@@ -95,8 +106,7 @@ tzone:
 sdoc:
        $(DOXYGEN) Doxyfile-php
        $(DOXYGEN) Doxyfile-cpp
-       cd pack/phpbase && $(DOXYGEN)
-       cd pack/qtbase && $(DOXYGEN)
+       $(MYMAKE) -C pack doc
        cd tzone && $(DOXYGEN) Doxyfile
        cd elam/src && $(DOXYGEN) Doxyfile
        cd dptr && $(DOXYGEN) Doxyfile
@@ -139,8 +149,7 @@ clean:
        -rm -rf zip/Makefile* zip/libQZip* zip/src/.ctmp
        -rm -rf src/.ctmp src/Makefile* src/msmoke
        -rm -rf src/wob www/inc/wob doc/wob wob/core*
-       -rm -rf pack/woc/.ctmp pack/woc/woc pack/woc/core* pack/woc/Makefile*
-       -rm -rf pack/qtbase/.ctmp pack/qtbase/libqwbase* pack/qtbase/Makefile*
+       $(MAKE) -C pack clean
        -rm -rf tzone/zoneinfo* tzone/libtzdata* tzone/Makefile* tzone/.ctmp
        -rm -rf doc/source-php doc/source-cpp
        -rm -rf `find . -name '*~'`