summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index c940a05..a8a8c26 100644
--- a/Rules.make
+++ b/Rules.make
@@ -165,129 +165,129 @@ $(OPIEDIR)/stamp-headers :
165 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 165 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
166 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 166 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
167 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 167 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
168ifeq ($(CONFIG_LIBOPIE),y) 168ifeq ($(CONFIG_LIBOPIE),y)
169 # libopie1 169 # libopie1
170 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 170 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
171 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 171 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
172endif 172endif
173 # libopie2 173 # libopie2
174 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 174 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
175 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 175 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 176 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 177 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 178 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
180 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 180 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
182 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 182 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
183 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 183 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
185 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 185 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
186 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 186 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
187 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 187 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
188 # auxilliary libraries 188 # auxilliary libraries
189 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 189 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
190 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 190 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
191 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 191 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
192 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 192 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
193 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 193 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
194 # all 194 # all
195ifeq ($(CONFIG_LIBOPIE),y) 195ifeq ($(CONFIG_LIBOPIE),y)
196 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 196 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
197 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 197 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
198endif 198endif
199 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 199 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
200 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 200 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
201 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 201 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
202 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 202 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
203 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 203 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
204 touch $@ 204 touch $@
205 205
206$(OPIEDIR)/stamp-headers-x11 : 206$(OPIEDIR)/stamp-headers-x11 :
207 @-rm -f $(OPIEDIR)/stamp-headers* 207 @-rm -f $(OPIEDIR)/stamp-headers*
208 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 208 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
209 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 209 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
210 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 210 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
211 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 211 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
212 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 212 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
213 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 213 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
214 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 214 ( cd include/opie && ln -sf ../../libsql/*.h .; )
215 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 215 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
216 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 216 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
217 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 217 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
218 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 218 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
219 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 219 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
220 touch $@ 220 touch $@
221 221
222$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 222$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
223 @-rm -f $@ 223 @-rm -f $@
224 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 224 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
225 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 225 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
226 @touch $@ 226 @touch $@
227 227
228$(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: 228$(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:
229 @$(call descend,$(shell dirname $@),$(shell basename $@)) 229 +$(call descend,$(shell dirname $@),$(shell basename $@))
230 230
231menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 231menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
232 $(TOPDIR)/scripts/kconfig/mconf ./config.in 232 $(TOPDIR)/scripts/kconfig/mconf ./config.in
233 @touch ./.config.stamp 233 @touch ./.config.stamp
234 234
235xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 235xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
236 $(TOPDIR)/scripts/kconfig/qconf ./config.in 236 $(TOPDIR)/scripts/kconfig/qconf ./config.in
237 @touch .config.stamp 237 @touch .config.stamp
238 238
239gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 239gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
240 $(TOPDIR)/scripts/kconfig/gconf ./config.in 240 $(TOPDIR)/scripts/kconfig/gconf ./config.in
241 @touch .config.stamp 241 @touch .config.stamp
242 242
243config: $(TOPDIR)/scripts/kconfig/conf ./config.in 243config: $(TOPDIR)/scripts/kconfig/conf ./config.in
244 $(TOPDIR)/scripts/kconfig/conf ./config.in 244 $(TOPDIR)/scripts/kconfig/conf ./config.in
245 @touch .config.stamp 245 @touch .config.stamp
246 246
247oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 247oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
248 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 248 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
249 @touch .config.stamp 249 @touch .config.stamp
250 250
251randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 251randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
252 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 252 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
253 @touch .config.stamp 253 @touch .config.stamp
254 254
255allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 255allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
256 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 256 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
257 @touch .config.stamp 257 @touch .config.stamp
258 258
259allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 259allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
260 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 260 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
261 @touch .config.stamp 261 @touch .config.stamp
262 262
263defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 263defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
264 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 264 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
265 @touch .config.stamp 265 @touch .config.stamp
266 266
267$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 267$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
268 268
269$(TOPDIR)/mkspecs/default : 269$(TOPDIR)/mkspecs/default :
270 ln -sf linux-g++ $@ 270 ln -sf linux-g++ $@
271 271
272$(TOPDIR)/scripts/subst : force 272$(TOPDIR)/scripts/subst : force
273 @( \ 273 @( \
274 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 274 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
275 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ 275 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
276 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ 276 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
277 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ 277 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
278 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ 278 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
279 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ 279 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
280 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 280 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
281 ) > $@ || ( rm -f $@; exit 1 ) 281 ) > $@ || ( rm -f $@; exit 1 )
282 282
283$(TOPDIR)/scripts/filesubst : force 283$(TOPDIR)/scripts/filesubst : force
284 @( \ 284 @( \
285 echo 's,\$$OPIEDIR/root/,/,g'; \ 285 echo 's,\$$OPIEDIR/root/,/,g'; \
286 echo 's,$(OPIEDIR)/root/,/,g'; \ 286 echo 's,$(OPIEDIR)/root/,/,g'; \
287 echo 's,\$$OPIEDIR,$(prefix),g'; \ 287 echo 's,\$$OPIEDIR,$(prefix),g'; \
288 echo 's,$(OPIEDIR),$(prefix),g'; \ 288 echo 's,$(OPIEDIR),$(prefix),g'; \
289 echo 's,\$$QTDIR,$(prefix),g'; \ 289 echo 's,\$$QTDIR,$(prefix),g'; \
290 echo 's,$(QTDIR),$(prefix),g'; \ 290 echo 's,$(QTDIR),$(prefix),g'; \
291 echo 's,^\(\./\)*root/,/,g'; \ 291 echo 's,^\(\./\)*root/,/,g'; \
292 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 292 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
293 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ 293 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \