2 files changed, 9 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index 568f6cf..b78d763 100644
--- a/Rules.make
+++ b/Rules.make
@@ -13,32 +13,35 @@ else
         echo CONFIG -= thread >> $@
 endif
 ifneq ($(CONFIG_DEBUG),)
         echo CONFIG += debug >> $@
         echo CONFIG -= release >> $@
         echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
         echo DEFINES += QT_DEBUG >> $@
 else
         echo CONFIG -= debug >> $@
         echo CONFIG += release >> $@
         echo DEFINES += "OPIE_NO_DEBUG" >> $@
 endif
-
+ifeq ($(CONFIG_STATIC),y)
+        echo CONFIG += staticlib >> $@
+endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
         echo CONFIG -= qt3 >> $@
 else
         echo CONFIG += qt3 >> $@
 endif
 ifneq ($(CONFIG_QUICK_LAUNCH),)
         echo contains\( CONFIG, quick-app \) \{ >> $@
+        echo CONFIG -= staticlib >> $@
         echo CONFIG -= quick-app >> $@
         echo CONFIG += quick-app-lib >> $@
         echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
         echo \} >> $@
 else
         echo contains\( CONFIG, quick-app \) \{ >> $@
         echo CONFIG -= quick-app >> $@
         echo CONFIG += quick-app-bin >> $@
         echo \} >> $@
 endif
 ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
         echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
diff --git a/config.in b/config.in
index 124bc2a..c75576a 100644
--- a/config.in
+++ b/config.in
@@ -30,32 +30,36 @@ choice
   config TARGET_SIMPAD
     boolean "SIMpad"
 
   config TARGET_YOPY
     boolean "Yopy 3500/3700"  
 
 endchoice
 
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
-# added for threaded compile
 config THREADED
   boolean "Enable threaded build"
   default "n"
 
+config STATIC
+  boolean "Build static libraries"
+  default "n"
+
 config DEBUG
   boolean "Enable debug builds"
   default n
+
 config RELEASE
   bool
   default y
   depends !DEBUG
   
 config QUICK_LAUNCH
   boolean "Enable Quick Launch"
   default n if TARGET_X86
   default y if ! TARGET_X86
   
 config QUICKLAUNCH_PATH
   string "Path to quicklauncher"