summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-07-18 15:12:05 (UTC)
committer mickeyl <mickeyl>2004-07-18 15:12:05 (UTC)
commit8e8fcd65b8d8657650728bae604c5a34dc31338e (patch) (unidiff)
treef2d6ae7ef740335374d6273b906bd95beb0d12cb
parent63c1d7b2cb5abfcfa518363caf9e9c24dbb906dc (diff)
downloadopie-8e8fcd65b8d8657650728bae604c5a34dc31338e.zip
opie-8e8fcd65b8d8657650728bae604c5a34dc31338e.tar.gz
opie-8e8fcd65b8d8657650728bae604c5a34dc31338e.tar.bz2
don't allow a static libqpe
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index e08e5c1..0dce8d5 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,74 +1,76 @@
1.phony: force 1.phony: force
2force: 2force:
3 3
4$(configs) : 4$(configs) :
5 $(call makecfg,$@) 5 $(call makecfg,$@)
6 6
7$(TOPDIR)/gen.pro : $(TOPDIR)/.config 7$(TOPDIR)/gen.pro : $(TOPDIR)/.config
8 echo > $@ 8 echo > $@
9# added for threaded version 9# added for threaded version
10ifneq ($(CONFIG_THREADED),) 10ifneq ($(CONFIG_THREADED),)
11 echo CONFIG += thread >> $@ 11 echo CONFIG += thread >> $@
12else 12else
13 echo CONFIG -= thread >> $@ 13 echo CONFIG -= thread >> $@
14endif 14endif
15ifneq ($(CONFIG_DEBUG),) 15ifneq ($(CONFIG_DEBUG),)
16 echo CONFIG += debug >> $@ 16 echo CONFIG += debug >> $@
17 echo CONFIG -= release >> $@ 17 echo CONFIG -= release >> $@
18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ 18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
19 echo DEFINES += QT_DEBUG >> $@ 19 echo DEFINES += QT_DEBUG >> $@
20else 20else
21 echo CONFIG -= debug >> $@ 21 echo CONFIG -= debug >> $@
22 echo CONFIG += release >> $@ 22 echo CONFIG += release >> $@
23 echo DEFINES += "OPIE_NO_DEBUG" >> $@ 23 echo DEFINES += "OPIE_NO_DEBUG" >> $@
24endif 24endif
25ifeq ($(CONFIG_STATIC),y) 25ifeq ($(CONFIG_STATIC),y)
26 echo !contains\( TARGET,qpe \) \{ >> $@
26 echo CONFIG += staticlib >> $@ 27 echo CONFIG += staticlib >> $@
28 echo \} >> $@
27endif 29endif
28ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 30ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
29 echo CONFIG -= qt3 >> $@ 31 echo CONFIG -= qt3 >> $@
30else 32else
31 echo CONFIG += qt3 >> $@ 33 echo CONFIG += qt3 >> $@
32endif 34endif
33ifneq ($(CONFIG_QUICK_LAUNCH),) 35ifneq ($(CONFIG_QUICK_LAUNCH),)
34 echo contains\( CONFIG, quick-app \) \{ >> $@ 36 echo contains\( CONFIG, quick-app \) \{ >> $@
35 echo CONFIG -= staticlib >> $@ 37 echo CONFIG -= staticlib >> $@
36 echo CONFIG -= quick-app >> $@ 38 echo CONFIG -= quick-app >> $@
37 echo CONFIG += quick-app-lib >> $@ 39 echo CONFIG += quick-app-lib >> $@
38 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ 40 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
39 echo \} >> $@ 41 echo \} >> $@
40else 42else
41 echo contains\( CONFIG, quick-app \) \{ >> $@ 43 echo contains\( CONFIG, quick-app \) \{ >> $@
42 echo CONFIG -= quick-app >> $@ 44 echo CONFIG -= quick-app >> $@
43 echo CONFIG += quick-app-bin >> $@ 45 echo CONFIG += quick-app-bin >> $@
44 echo \} >> $@ 46 echo \} >> $@
45endif 47endif
46ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 48ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
47 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ 49 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
48else 50else
49 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 51 echo ENABLE_SQL_PIM_BACKEND=n >> $@
50endif 52endif
51ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
52 echo CONFIG += no-override >> $@ 54 echo CONFIG += no-override >> $@
53endif 55endif
54ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) 56ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
55 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ 57 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
56endif 58endif
57ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 59ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
58 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 60 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
59endif 61endif
60ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 62ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
61 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 63 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
62endif 64endif
63ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 65ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
64 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 66 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
65endif 67endif
66ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) 68ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
67 echo DEFINES += USE_FILE_NOTIFICATION >> $@ 69 echo DEFINES += USE_FILE_NOTIFICATION >> $@
68endif 70endif
69ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 71ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
70 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 72 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
71endif 73endif
72ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 74ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
73 echo DEFINES += OPIE_NEW_MALLOC >> $@ 75 echo DEFINES += OPIE_NEW_MALLOC >> $@
74endif 76endif