summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-06-02 23:42:42 (UTC)
committer mickeyl <mickeyl>2004-06-02 23:42:42 (UTC)
commit9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90 (patch) (side-by-side diff)
tree3be637914bd75d0402670fa4b2e4785a6870c342
parent3706581a124f51ec92bcdf1fc3f94431778509e9 (diff)
downloadopie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.zip
opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.gz
opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.bz2
enable building static versions of the libraries
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make5
-rw-r--r--config.in6
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
@@ -1,56 +1,59 @@
.phony: force
force:
$(configs) :
$(call makecfg,$@)
$(TOPDIR)/gen.pro : $(TOPDIR)/.config
echo > $@
# added for threaded version
ifneq ($(CONFIG_THREADED),)
echo CONFIG += thread >> $@
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) >> $@
else
echo ENABLE_SQL_PIM_BACKEND=n >> $@
endif
ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
echo CONFIG += no-override >> $@
endif
ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
endif
ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
endif
diff --git a/config.in b/config.in
index 124bc2a..c75576a 100644
--- a/config.in
+++ b/config.in
@@ -18,56 +18,60 @@ choice
config TARGET_SHARP
boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
config TARGET_C700
boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
config TARGET_IPAQ
boolean "iPAQ"
config TARGET_RAMSES
boolean "Ramses"
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"
default "./quicklauncher" if TARGET_X86
default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
config SPECFILE
string
default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
default "linux-g++" if TARGET_X86 && X11
default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
default "linux-g++" if TARGET_SHARP && X11
default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
default "linux-g++" if TARGET_IPAQ && X11
default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)