summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
committer mickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
commit22e51ed82162ef307f3f8cef21d3288147f18cad (patch) (unidiff)
treed3318a78deb837c91aca6d048ad649716060a5a3
parent969831e80dd285e8c95e8a91333a626717d5543e (diff)
downloadopie-22e51ed82162ef307f3f8cef21d3288147f18cad.zip
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.gz
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.bz2
support a customizable quicklaunch path, this fixes the problem when
people install quicklaunch applications to non-root hence having the link pointing to non-existing ./quicklauncher
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--config.in4
2 files changed, 5 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 82c71e1..31a1b66 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,227 +1,228 @@
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 > $@
9ifneq ($(CONFIG_DEBUG),) 9ifneq ($(CONFIG_DEBUG),)
10 echo CONFIG += debug >> $@ 10 echo CONFIG += debug >> $@
11 echo CONFIG -= release >> $@ 11 echo CONFIG -= release >> $@
12else 12else
13 echo CONFIG -= debug >> $@ 13 echo CONFIG -= debug >> $@
14 echo CONFIG += release >> $@ 14 echo CONFIG += release >> $@
15endif 15endif
16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
17 echo CONFIG -= qt3 >> $@ 17 echo CONFIG -= qt3 >> $@
18else 18else
19 echo CONFIG += qt3 >> $@ 19 echo CONFIG += qt3 >> $@
20endif 20endif
21ifneq ($(CONFIG_QUICK_LAUNCH),) 21ifneq ($(CONFIG_QUICK_LAUNCH),)
22 echo contains\( CONFIG, quick-app \) \{ >> $@ 22 echo contains\( CONFIG, quick-app \) \{ >> $@
23 echo CONFIG -= quick-app >> $@ 23 echo CONFIG -= quick-app >> $@
24 echo CONFIG += quick-app-lib >> $@ 24 echo CONFIG += quick-app-lib >> $@
25 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
25 echo \} >> $@ 26 echo \} >> $@
26else 27else
27 echo contains\( CONFIG, quick-app \) \{ >> $@ 28 echo contains\( CONFIG, quick-app \) \{ >> $@
28 echo CONFIG -= quick-app >> $@ 29 echo CONFIG -= quick-app >> $@
29 echo CONFIG += quick-app-bin >> $@ 30 echo CONFIG += quick-app-bin >> $@
30 echo \} >> $@ 31 echo \} >> $@
31 endif 32 endif
32ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 33ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
33 echo CONFIG += no-override >> $@ 34 echo CONFIG += no-override >> $@
34endif 35endif
35ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 36ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
36 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 37 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
37endif 38endif
38ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 39ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
39 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 40 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
40endif 41endif
41ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 42ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
42 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 43 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
43endif 44endif
44ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 45ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
45 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 46 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
46endif 47endif
47ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) 48ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
48 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ 49 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
49endif 50endif
50ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 51ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
51 echo DEFINES += OPIE_NEW_MALLOC >> $@ 52 echo DEFINES += OPIE_NEW_MALLOC >> $@
52endif 53endif
53ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 54ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
54 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 55 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
55endif 56endif
56 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 57 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
57$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 58$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
58 @echo Generating dependency information... 59 @echo Generating dependency information...
59# add to subdir-y, and add descend rules 60# add to subdir-y, and add descend rules
60 @cat $(TOPDIR)/packages | grep -v '^#' | \ 61 @cat $(TOPDIR)/packages | grep -v '^#' | \
61 awk '{print \ 62 awk '{print \
62 ".PHONY : " $$2 "\n" \ 63 ".PHONY : " $$2 "\n" \
63 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 64 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
64 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 65 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
65 cat $(TOPDIR)/packages | grep -v '^#' | \ 66 cat $(TOPDIR)/packages | grep -v '^#' | \
66 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 67 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
67 >> $(TOPDIR)/.depends 68 >> $(TOPDIR)/.depends
68# interpackage dependency generation 69# interpackage dependency generation
69 @cat $(TOPDIR)/packages | \ 70 @cat $(TOPDIR)/packages | \
70 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 71 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
71 72
72$(TOPDIR)/.depends.cfgs: 73$(TOPDIR)/.depends.cfgs:
73# config.in interdependencies 74# config.in interdependencies
74 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 75 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
75 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 76 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
76 @-rm -f dirs 77 @-rm -f dirs
77 78
78$(QTDIR)/stamp-headers : 79$(QTDIR)/stamp-headers :
79 @-rm -f $(QTDIR)/stamp-headers* 80 @-rm -f $(QTDIR)/stamp-headers*
80 ( cd $(QTDIR)/include; \ 81 ( cd $(QTDIR)/include; \
81 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 82 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
82 qcopchannel_qws.h qwindowsystem_qws.h \ 83 qcopchannel_qws.h qwindowsystem_qws.h \
83 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 84 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
84 touch $@ 85 touch $@
85 86
86$(QTDIR)/stamp-headers-x11 : 87$(QTDIR)/stamp-headers-x11 :
87 @-rm -f $(QTDIR)/stamp-headers* 88 @-rm -f $(QTDIR)/stamp-headers*
88 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 89 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
89 touch $@ 90 touch $@
90 91
91$(OPIEDIR)/stamp-headers : 92$(OPIEDIR)/stamp-headers :
92 @-rm -f $(OPIEDIR)/stamp-headers* 93 @-rm -f $(OPIEDIR)/stamp-headers*
93 mkdir -p $(TOPDIR)/include/qpe \ 94 mkdir -p $(TOPDIR)/include/qpe \
94 $(TOPDIR)/include/qtopia \ 95 $(TOPDIR)/include/qtopia \
95 $(TOPDIR)/include/opie \ 96 $(TOPDIR)/include/opie \
96 $(TOPDIR)/include/opie2 \ 97 $(TOPDIR)/include/opie2 \
97 $(TOPDIR)/include/qtopia/private 98 $(TOPDIR)/include/qtopia/private
98 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 99 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
99 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 100 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
100 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 101 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
101 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 102 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
102 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 103 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
103 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) 104 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
104 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 105 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
105 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 106 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
106 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 107 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
107 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 108 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
108 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 109 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
109 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 110 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
110 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 111 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
111 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 112 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
112 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 113 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
113 touch $@ 114 touch $@
114 115
115$(OPIEDIR)/stamp-headers-x11 : 116$(OPIEDIR)/stamp-headers-x11 :
116 @-rm -f $(OPIEDIR)/stamp-headers* 117 @-rm -f $(OPIEDIR)/stamp-headers*
117 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 118 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
118 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 119 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
119 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 120 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
120 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 121 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
121 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 122 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
122 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 123 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
123 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 124 ( cd include/opie && ln -sf ../../libsql/*.h .; )
124 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 125 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
125 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 126 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
126 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 127 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
127 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 128 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
128 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 129 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
129 touch $@ 130 touch $@
130 131
131$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 132$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
132 @-rm -f $@ 133 @-rm -f $@
133 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 134 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
134 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 135 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
135 @touch $@ 136 @touch $@
136 137
137$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake: 138$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
138 @$(call descend,$(shell dirname $@),$(shell basename $@)) 139 @$(call descend,$(shell dirname $@),$(shell basename $@))
139 140
140menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 141menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
141 $(TOPDIR)/scripts/kconfig/mconf ./config.in 142 $(TOPDIR)/scripts/kconfig/mconf ./config.in
142 @touch ./.config.stamp 143 @touch ./.config.stamp
143 144
144xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 145xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
145 $(TOPDIR)/scripts/kconfig/qconf ./config.in 146 $(TOPDIR)/scripts/kconfig/qconf ./config.in
146 @touch .config.stamp 147 @touch .config.stamp
147 148
148gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 149gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
149 $(TOPDIR)/scripts/kconfig/gconf ./config.in 150 $(TOPDIR)/scripts/kconfig/gconf ./config.in
150 @touch .config.stamp 151 @touch .config.stamp
151 152
152config: $(TOPDIR)/scripts/kconfig/conf ./config.in 153config: $(TOPDIR)/scripts/kconfig/conf ./config.in
153 $(TOPDIR)/scripts/kconfig/conf ./config.in 154 $(TOPDIR)/scripts/kconfig/conf ./config.in
154 @touch .config.stamp 155 @touch .config.stamp
155 156
156oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 157oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
157 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 158 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
158 @touch .config.stamp 159 @touch .config.stamp
159 160
160randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 161randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
161 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 162 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
162 @touch .config.stamp 163 @touch .config.stamp
163 164
164allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 165allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
165 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 166 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
166 @touch .config.stamp 167 @touch .config.stamp
167 168
168allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 169allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
169 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 170 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
170 @touch .config.stamp 171 @touch .config.stamp
171 172
172defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 173defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
173 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 174 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
174 @touch .config.stamp 175 @touch .config.stamp
175 176
176$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 177$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
177 178
178$(TOPDIR)/mkspecs/default : 179$(TOPDIR)/mkspecs/default :
179 ln -sf linux-g++ $@ 180 ln -sf linux-g++ $@
180 181
181$(TOPDIR)/scripts/subst : force 182$(TOPDIR)/scripts/subst : force
182 @( \ 183 @( \
183 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 184 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
184 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ 185 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
185 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ 186 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
186 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ 187 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
187 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ 188 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
188 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ 189 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
189 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 190 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
190 ) > $@ || ( rm -f $@; exit 1 ) 191 ) > $@ || ( rm -f $@; exit 1 )
191 192
192$(TOPDIR)/scripts/filesubst : force 193$(TOPDIR)/scripts/filesubst : force
193 @( \ 194 @( \
194 echo 's,\$$OPIEDIR/root/,/,g'; \ 195 echo 's,\$$OPIEDIR/root/,/,g'; \
195 echo 's,$(OPIEDIR)/root/,/,g'; \ 196 echo 's,$(OPIEDIR)/root/,/,g'; \
196 echo 's,\$$OPIEDIR,$(prefix),g'; \ 197 echo 's,\$$OPIEDIR,$(prefix),g'; \
197 echo 's,$(OPIEDIR),$(prefix),g'; \ 198 echo 's,$(OPIEDIR),$(prefix),g'; \
198 echo 's,\$$QTDIR,$(prefix),g'; \ 199 echo 's,\$$QTDIR,$(prefix),g'; \
199 echo 's,$(QTDIR),$(prefix),g'; \ 200 echo 's,$(QTDIR),$(prefix),g'; \
200 echo 's,^\(\./\)*root/,/,g'; \ 201 echo 's,^\(\./\)*root/,/,g'; \
201 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 202 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
202 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ 203 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
203 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ 204 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
204 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ 205 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
205 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ 206 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
206 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 207 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
207 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ 208 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
208 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ 209 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
209 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ 210 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
210 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 211 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
211 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ 212 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
212 ) > $@ || ( rm -f $@; exit 1 ) 213 ) > $@ || ( rm -f $@; exit 1 )
213 214
214## general rules ## 215## general rules ##
215 216
216define descend 217define descend
217 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 218 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
218endef 219endef
219 220
220define makefilegen 221define makefilegen
221 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ 222 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \
222 head -1 | awk '{print $$3}'` 223 head -1 | awk '{print $$3}'`
223endef 224endef
224 225
225define makecfg 226define makecfg
226 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 227 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
227endef 228endef
diff --git a/config.in b/config.in
index 166332a..e93eac8 100644
--- a/config.in
+++ b/config.in
@@ -1,244 +1,248 @@
1mainmenu "Opie Configuration" 1mainmenu "Opie Configuration"
2 2
3menu "Build Parameters" 3menu "Build Parameters"
4 4
5choice 5choice
6 prompt "Target Machine" 6 prompt "Target Machine"
7 default TARGET_X86 7 default TARGET_X86
8 help 8 help
9 Please select the architecture of the machine you will be 9 Please select the architecture of the machine you will be
10 building the OpenZaurus buildroot for. 10 building the OpenZaurus buildroot for.
11 11
12 config TARGET_X86 12 config TARGET_X86
13 boolean "Intel X86" 13 boolean "Intel X86"
14 14
15 config TARGET_MACOSX 15 config TARGET_MACOSX
16 boolean "Mac OS X (DARWIN)" 16 boolean "Mac OS X (DARWIN)"
17 17
18 config TARGET_SHARP 18 config TARGET_SHARP
19 boolean "Sharp Zaurus" 19 boolean "Sharp Zaurus"
20 20
21 config TARGET_IPAQ 21 config TARGET_IPAQ
22 boolean "iPAQ" 22 boolean "iPAQ"
23 23
24 config TARGET_RAMSES 24 config TARGET_RAMSES
25 boolean "Ramses" 25 boolean "Ramses"
26 26
27 config TARGET_SIMPAD 27 config TARGET_SIMPAD
28 boolean "SIMpad" 28 boolean "SIMpad"
29 29
30 config TARGET_YOPY 30 config TARGET_YOPY
31 boolean "Yopy 3500/3700" 31 boolean "Yopy 3500/3700"
32 32
33endchoice 33endchoice
34 34
35config OPTIMIZE 35config OPTIMIZE
36 boolean "Use optimizations" 36 boolean "Use optimizations"
37 default "y" if ! TARGET_X86 37 default "y" if ! TARGET_X86
38 38
39config DEBUG 39config DEBUG
40 boolean "Enable debug builds" 40 boolean "Enable debug builds"
41 default n 41 default n
42config RELEASE 42config RELEASE
43 bool 43 bool
44 default y 44 default y
45 depends !DEBUG 45 depends !DEBUG
46 46
47config QUICK_LAUNCH 47config QUICK_LAUNCH
48 boolean "Enable Quick Launch" 48 boolean "Enable Quick Launch"
49 default n 49 default n
50 50
51config QUICKLAUNCH_PATH
52 string "Path to quicklauncher"
53 default "./quicklauncher" if TARGET_X86
54 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
51 55
52config SPECFILE 56config SPECFILE
53 string 57 string
54 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 58 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
55 default "linux-g++" if TARGET_X86 && X11 59 default "linux-g++" if TARGET_X86 && X11
56 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 60 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
57 default "linux-g++" if TARGET_SHARP && X11 61 default "linux-g++" if TARGET_SHARP && X11
58 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 62 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
59 default "linux-g++" if TARGET_IPAQ && X11 63 default "linux-g++" if TARGET_IPAQ && X11
60 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) 64 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
61 default "linux-g++" if TARGET_RAMSES && X11 65 default "linux-g++" if TARGET_RAMSES && X11
62 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) 66 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
63 default "linux-g++" if TARGET_SIMPAD && X11 67 default "linux-g++" if TARGET_SIMPAD && X11
64 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) 68 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
65 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) 69 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
66 70
67config CUSTOMFILE 71config CUSTOMFILE
68 string 72 string
69 default "custom-ipaq.h" if TARGET_IPAQ 73 default "custom-ipaq.h" if TARGET_IPAQ
70 default "custom-sharp.h" if TARGET_SHARP 74 default "custom-sharp.h" if TARGET_SHARP
71 default "custom-ramses.h" if TARGET_RAMSES 75 default "custom-ramses.h" if TARGET_RAMSES
72 default "custom-ipaq.h" if TARGET_SIMPAD 76 default "custom-ipaq.h" if TARGET_SIMPAD
73 default "custom-yopy.h" if TARGET_YOPY 77 default "custom-yopy.h" if TARGET_YOPY
74 78
75config OPTIMIZATIONS 79config OPTIMIZATIONS
76 string "Optimization flags" 80 string "Optimization flags"
77 depends OPTIMIZE 81 depends OPTIMIZE
78 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ 82 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
79 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY 83 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
80 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP 84 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
81 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES 85 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
82 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD 86 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
83 87
84config EXPERIMENTAL 88config EXPERIMENTAL
85 bool "Prompt for development and/or incomplete items" 89 bool "Prompt for development and/or incomplete items"
86 default y 90 default y
87 91
88endmenu 92endmenu
89 93
90menu "Opie Compile Configs" 94menu "Opie Compile Configs"
91config OPIE_NO_OVERRIDE_QT 95config OPIE_NO_OVERRIDE_QT
92 boolean "Build Opie against an unpatched version of Qt" 96 boolean "Build Opie against an unpatched version of Qt"
93 default n 97 default n
94 98
95 99
96config OPIE_NO_BUILTIN_SHUTDOWN 100config OPIE_NO_BUILTIN_SHUTDOWN
97 boolean "Disable the built in shutdown application" 101 boolean "Disable the built in shutdown application"
98 default n 102 default n
99 103
100config OPIE_NO_BUILTIN_CALIBRATE 104config OPIE_NO_BUILTIN_CALIBRATE
101 boolean "Disable the built in calibrate application" 105 boolean "Disable the built in calibrate application"
102 default y if TARGET_YOPY 106 default y if TARGET_YOPY
103 default n 107 default n
104 108
105config OPIE_SOUND_FRAGMENT_SHIFT 109config OPIE_SOUND_FRAGMENT_SHIFT
106 string "The sound fragment used in Opie Player I" 110 string "The sound fragment used in Opie Player I"
107 default "14" if TARGET_IPAQ 111 default "14" if TARGET_IPAQ
108 default "16" if (!TARGET_IPAQ) 112 default "16" if (!TARGET_IPAQ)
109 113
110config USE_REALTIME_AUDIO_THREAD 114config USE_REALTIME_AUDIO_THREAD
111 boolean "Use a realtime thread in Opie Player I" 115 boolean "Use a realtime thread in Opie Player I"
112 default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP 116 default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
113 default n 117 default n
114 118
115config QT_QWS_ALLOW_OVERCLOCK 119config QT_QWS_ALLOW_OVERCLOCK
116 boolean "Allow the user to overclock the device" 120 boolean "Allow the user to overclock the device"
117 depends TARGET_RAMSES 121 depends TARGET_RAMSES
118 default n 122 default n
119 123
120config OPIE_HIGH_RES_SMALL_PHY 124config OPIE_HIGH_RES_SMALL_PHY
121 boolean "Resolution is bigger than physical scrren" 125 boolean "Resolution is bigger than physical scrren"
122 default y if TARGET_C700 126 default y if TARGET_C700
123 default n 127 default n
124 128
125config OPIE_NEW_ALLOC 129config OPIE_NEW_ALLOC
126 boolean "Use malloc and free for the implementation" 130 boolean "Use malloc and free for the implementation"
127 default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP 131 default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
128 default n 132 default n
129 133
130config OPIE_NO_SOUND_PCM_READ_BITS 134config OPIE_NO_SOUND_PCM_READ_BITS
131 boolean "there is not a pcm_read_bits io control" 135 boolean "there is not a pcm_read_bits io control"
132 default y if TARGET_SHARP 136 default y if TARGET_SHARP
133 default n 137 default n
134 138
135endmenu 139endmenu
136 140
137menu "Base" 141menu "Base"
138 choice 142 choice
139 prompt "Qpe Library Selection" 143 prompt "Qpe Library Selection"
140 default LIBQPE 144 default LIBQPE
141 source library/config.in 145 source library/config.in
142 source x11/config.in 146 source x11/config.in
143 endchoice 147 endchoice
144 source libopie/config.in 148 source libopie/config.in
145 source core/opie-login/config.in 149 source core/opie-login/config.in
146 source core/opiealarm/config.in 150 source core/opiealarm/config.in
147 source core/tools/quicklauncher/config.in 151 source core/tools/quicklauncher/config.in
148 source core/launcher/config.in 152 source core/launcher/config.in
149 source core/qws/config.in 153 source core/qws/config.in
150endmenu 154endmenu
151 155
152comment "" 156comment ""
153 157
154menu "Applets" 158menu "Applets"
155 source core/applets/config.in 159 source core/applets/config.in
156 source noncore/applets/config.in 160 source noncore/applets/config.in
157endmenu 161endmenu
158 162
159menu "Apps" 163menu "Apps"
160 source core/apps/config.in 164 source core/apps/config.in
161 source noncore/apps/config.in 165 source noncore/apps/config.in
162endmenu 166endmenu
163 167
164menu "Communications and Networking" 168menu "Communications and Networking"
165 source noncore/comm/config.in 169 source noncore/comm/config.in
166 source noncore/net/config.in 170 source noncore/net/config.in
167endmenu 171endmenu
168 172
169menu "Games" 173menu "Games"
170 source noncore/games/config.in 174 source noncore/games/config.in
171endmenu 175endmenu
172 176
173menu "Graphics and Multimedia" 177menu "Graphics and Multimedia"
174 source freetype/config.in 178 source freetype/config.in
175 source noncore/graphics/config.in 179 source noncore/graphics/config.in
176 source core/multimedia/config.in 180 source core/multimedia/config.in
177 source noncore/multimedia/config.in 181 source noncore/multimedia/config.in
178endmenu 182endmenu
179 183
180menu "Input methods" 184menu "Input methods"
181 source inputmethods/config.in 185 source inputmethods/config.in
182endmenu 186endmenu
183 187
184menu "Pim" 188menu "Pim"
185 source core/pim/config.in 189 source core/pim/config.in
186 menu "Today Plugins" 190 menu "Today Plugins"
187 source noncore/todayplugins/config.in 191 source noncore/todayplugins/config.in
188 source core/pim/today/plugins/config.in 192 source core/pim/today/plugins/config.in
189 endmenu 193 endmenu
190endmenu 194endmenu
191 195
192menu "Settings" 196menu "Settings"
193 source core/settings/config.in 197 source core/settings/config.in
194 source noncore/settings/config.in 198 source noncore/settings/config.in
195endmenu 199endmenu
196 200
197menu "Theming" 201menu "Theming"
198 source noncore/decorations/config.in 202 source noncore/decorations/config.in
199 source noncore/styles/config.in 203 source noncore/styles/config.in
200endmenu 204endmenu
201 205
202menu "Tools" 206menu "Tools"
203 source noncore/tools/config.in 207 source noncore/tools/config.in
204endmenu 208endmenu
205 209
206menu "Development" 210menu "Development"
207 source development/keyview/config.in 211 source development/keyview/config.in
208 #source development/debugviewer/config.in 212 #source development/debugviewer/config.in
209endmenu 213endmenu
210 214
211menu "Examples" 215menu "Examples"
212 config EXAMPLES 216 config EXAMPLES
213 boolean "Compile Example Application" 217 boolean "Compile Example Application"
214 source examples/config.in 218 source examples/config.in
215endmenu 219endmenu
216 220
217comment "" 221comment ""
218 222
219menu "Unsupported / Unmaintained" 223menu "Unsupported / Unmaintained"
220 source noncore/unsupported/config.in 224 source noncore/unsupported/config.in
221endmenu 225endmenu
222 226
223comment "" 227comment ""
224 depends on EXPERIMENTAL 228 depends on EXPERIMENTAL
225menu "Experimental" 229menu "Experimental"
226 depends on EXPERIMENTAL 230 depends on EXPERIMENTAL
227 source libopie2/config.in 231 source libopie2/config.in
228 232
229 config SQL_PIM_BACKEND 233 config SQL_PIM_BACKEND
230 bool "Add SQL-Backend support (experimental)" 234 bool "Add SQL-Backend support (experimental)"
231 default n 235 default n
232 help 236 help
233 This adds the SQL-Support, using SQLite. Which database is used 237 This adds the SQL-Support, using SQLite. Which database is used
234 by the backends is defined by the file "pimaccess.conf" in the 238 by the backends is defined by the file "pimaccess.conf" in the
235 directory "Settings". 239 directory "Settings".
236 There currently do exist to groups "[contact]" and "[todo]". You can 240 There currently do exist to groups "[contact]" and "[todo]". You can
237 select the used backend by the variable "usebackend=<type>", where 241 select the used backend by the variable "usebackend=<type>", where
238 <type> is "sql" or "xml". "xml" is the default ! 242 <type> is "sql" or "xml". "xml" is the default !
239 Important: The SQLite-library "libsqlite.so" must be installed ! 243 Important: The SQLite-library "libsqlite.so" must be installed !
240 depends ( LIBOPIE2DB ) 244 depends ( LIBOPIE2DB )
241 245
242 comment "SQL-Support needs libopie2db!" 246 comment "SQL-Support needs libopie2db!"
243 depends !( LIBOPIE2DB ) 247 depends !( LIBOPIE2DB )
244endmenu 248endmenu