summaryrefslogtreecommitdiff
authorclem <clem>2004-06-15 13:56:31 (UTC)
committer clem <clem>2004-06-15 13:56:31 (UTC)
commit1525049ee89907e9cede5f2e475acf9f99bae6c4 (patch) (unidiff)
tree7aac4e7a528c2d2d782b9ec7209a1f31d6669707
parentae21fcb1c80ba1aec4f52b5b9120605d4b22a7e0 (diff)
downloadopie-1525049ee89907e9cede5f2e475acf9f99bae6c4.zip
opie-1525049ee89907e9cede5f2e475acf9f99bae6c4.tar.gz
opie-1525049ee89907e9cede5f2e475acf9f99bae6c4.tar.bz2
support of libopiesecurity2 and noncore/securityplugins
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Rules.make1
-rw-r--r--config.in1
-rw-r--r--packages4
4 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 13e1205..e1ae448 100644
--- a/Makefile
+++ b/Makefile
@@ -1,63 +1,63 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2 2
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4 4
5include $(TOPDIR)/Vars.make 5include $(TOPDIR)/Vars.make
6ifneq ($(wildcard $(TOPDIR)/Vars.local),) 6ifneq ($(wildcard $(TOPDIR)/Vars.local),)
7include $(TOPDIR)/Vars.local 7include $(TOPDIR)/Vars.local
8endif 8endif
9 9
10noconfig_targets := xconfig menuconfig config oldconfig randconfig \ 10noconfig_targets := xconfig menuconfig config oldconfig randconfig \
11 defconfig allyesconfig allnoconfig allmodconfig \ 11 defconfig allyesconfig allnoconfig allmodconfig \
12 clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \ 12 clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \
13 ipks 13 ipks
14 14
15configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/examples/config.in 15configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/examples/config.in $(TOPDIR)/noncore/securityplugins/config.in
16 16
17# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 17# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
18# in order to have a full set of config.in files. 18# in order to have a full set of config.in files.
19# .depends depends on $(TOPDIR)/.config 19# .depends depends on $(TOPDIR)/.config
20# everything else depends on .depends, to ensure the dependencies are 20# everything else depends on .depends, to ensure the dependencies are
21# intact. 21# intact.
22# 22#
23# NOTE: The order in which things happen in this makefile is 23# NOTE: The order in which things happen in this makefile is
24 # -critical-. Do not rearrange this! 24 # -critical-. Do not rearrange this!
25 25
26all : $(TOPDIR)/.config 26all : $(TOPDIR)/.config
27 27
28# 28#
29# The IPK creation is a very slow process. If you want to only create some 29# The IPK creation is a very slow process. If you want to only create some
30# IPKs, e.g. the ones in library, then do 30# IPKs, e.g. the ones in library, then do
31 #make ipks IPK_START=library 31 #make ipks IPK_START=library
32# and then only the *.control files in this directory will be processed 32# and then only the *.control files in this directory will be processed
33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config 33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
34 @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ 34 @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \
35 prerm=`echo $${ctrl/.control/.prerm}`; \ 35 prerm=`echo $${ctrl/.control/.prerm}`; \
36 preinst=`echo $${ctrl/.control/.preinst}`; \ 36 preinst=`echo $${ctrl/.control/.preinst}`; \
37 postrm=`echo $${ctrl/.control/.postrm}`; \ 37 postrm=`echo $${ctrl/.control/.postrm}`; \
38 postinst=`echo $${ctrl/.control/.postinst}`; \ 38 postinst=`echo $${ctrl/.control/.postinst}`; \
39 echo "Building ipk of $$ctrl"; \ 39 echo "Building ipk of $$ctrl"; \
40 cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ 40 cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \
41 done ) 41 done )
42 42
43ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config 43ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
44 @> $(OPIEDIR)/AllThreadedPackages 44 @> $(OPIEDIR)/AllThreadedPackages
45 @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \ 45 @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \
46 grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \ 46 grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \
47 done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages 47 done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages
48 @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \ 48 @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \
49 echo "Converting $$ctrl to -mt package"; \ 49 echo "Converting $$ctrl to -mt package"; \
50 nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \ 50 nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \
51 echo "Building ipk of $$ctrl"; \ 51 echo "Building ipk of $$ctrl"; \
52 [ -n $$nctrl ] && cd $(OPIEDIR) && $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$nctrl --prerm=$${nctrl/\.control$$/.prerm/} --preinst=$${nctrl/\.control$$/.preinst/} --postrm=$${nctrl/\.control$$/.postrm/} --postinst=$${nctrl/\.control$$/.postinst/} --strip=$(STRIP) $(OPIEDIR); \ 52 [ -n $$nctrl ] && cd $(OPIEDIR) && $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$nctrl --prerm=$${nctrl/\.control$$/.prerm/} --preinst=$${nctrl/\.control$$/.preinst/} --postrm=$${nctrl/\.control$$/.postrm/} --postinst=$${nctrl/\.control$$/.postinst/} --strip=$(STRIP) $(OPIEDIR); \
53 done 53 done
54 @rm -f $(OPIEDIR)/AllThreadedPackages 54 @rm -f $(OPIEDIR)/AllThreadedPackages
55 55
56FORCE: 56FORCE:
57 57
58$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 58$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
59 59
60all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 60all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
61 61
62clean-configs : 62clean-configs :
63 @echo "Wiping generated config.in files..." 63 @echo "Wiping generated config.in files..."
diff --git a/Rules.make b/Rules.make
index b78d763..779f4b1 100644
--- a/Rules.make
+++ b/Rules.make
@@ -130,96 +130,97 @@ $(TOPDIR)/.depends.cfgs:
130# config.in interdependencies 130# config.in interdependencies
131 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 131 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
132 @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 ) >> $@ 132 @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 ) >> $@
133 @-rm -f dirs 133 @-rm -f dirs
134 134
135$(QTDIR)/stamp-headers : 135$(QTDIR)/stamp-headers :
136 @-rm -f $(QTDIR)/stamp-headers* 136 @-rm -f $(QTDIR)/stamp-headers*
137 ( cd $(QTDIR)/include; \ 137 ( cd $(QTDIR)/include; \
138 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 138 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
139 qcopchannel_qws.h qwindowsystem_qws.h \ 139 qcopchannel_qws.h qwindowsystem_qws.h \
140 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 140 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
141 touch $@ 141 touch $@
142 142
143$(QTDIR)/stamp-headers-x11 : 143$(QTDIR)/stamp-headers-x11 :
144 @-rm -f $(QTDIR)/stamp-headers* 144 @-rm -f $(QTDIR)/stamp-headers*
145 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) 145 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)
146 touch $@ 146 touch $@
147 147
148$(OPIEDIR)/stamp-headers : 148$(OPIEDIR)/stamp-headers :
149 @-rm -f $(OPIEDIR)/stamp-headers* 149 @-rm -f $(OPIEDIR)/stamp-headers*
150 mkdir -p $(TOPDIR)/include/qpe \ 150 mkdir -p $(TOPDIR)/include/qpe \
151 $(TOPDIR)/include/qtopia \ 151 $(TOPDIR)/include/qtopia \
152 $(TOPDIR)/include/opie \ 152 $(TOPDIR)/include/opie \
153 $(TOPDIR)/include/opie2 \ 153 $(TOPDIR)/include/opie2 \
154 $(TOPDIR)/include/qtopia/private \ 154 $(TOPDIR)/include/qtopia/private \
155 $(TOPDIR)/include/sl 155 $(TOPDIR)/include/sl
156 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 156 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
157 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 157 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
158 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 158 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
159ifeq ($(CONFIG_LIBOPIE),y) 159ifeq ($(CONFIG_LIBOPIE),y)
160 # libopie1 160 # libopie1
161 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 161 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
162 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 162 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
163 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) 163 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
164endif 164endif
165 # libopie2 165 # libopie2
166 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 166 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
167 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 167 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
168 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 168 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
169 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 169 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
170 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 170 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
171 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 171 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
172 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 172 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
173 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) 173 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; )
174 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 174 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
175 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 175 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 176 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 177 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
178 # auxilliary libraries 179 # auxilliary libraries
179 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 180 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
180 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 181 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
181 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 182 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
182 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 183 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
183 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 184 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
184 # all 185 # all
185ifeq ($(CONFIG_LIBOPIE),y) 186ifeq ($(CONFIG_LIBOPIE),y)
186 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 187 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
187 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 188 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
188endif 189endif
189 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 190 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
190 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 191 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
191 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 192 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
192 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 193 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
193 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 194 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
194 touch $@ 195 touch $@
195 196
196$(OPIEDIR)/stamp-headers-x11 : 197$(OPIEDIR)/stamp-headers-x11 :
197 @-rm -f $(OPIEDIR)/stamp-headers* 198 @-rm -f $(OPIEDIR)/stamp-headers*
198 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 199 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
199 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 200 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
200 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 201 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
201 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 202 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
202 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 203 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
203 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 204 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
204 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 205 ( cd include/opie && ln -sf ../../libsql/*.h .; )
205 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 206 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
206 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 207 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
207 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 208 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
208 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 209 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
209 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 210 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
210 touch $@ 211 touch $@
211 212
212$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 213$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
213 @-rm -f $@ 214 @-rm -f $@
214 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 215 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
215 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 216 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
216 @touch $@ 217 @touch $@
217 218
218$(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: 219$(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:
219 @$(call descend,$(shell dirname $@),$(shell basename $@)) 220 @$(call descend,$(shell dirname $@),$(shell basename $@))
220 221
221menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 222menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
222 $(TOPDIR)/scripts/kconfig/mconf ./config.in 223 $(TOPDIR)/scripts/kconfig/mconf ./config.in
223 @touch ./.config.stamp 224 @touch ./.config.stamp
224 225
225xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 226xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
diff --git a/config.in b/config.in
index 2cd3160..60ebd65 100644
--- a/config.in
+++ b/config.in
@@ -179,85 +179,86 @@ menu "Base"
179 source core/tools/quicklauncher/config.in 179 source core/tools/quicklauncher/config.in
180 source core/launcher/config.in 180 source core/launcher/config.in
181 source core/symlinker/config.in 181 source core/symlinker/config.in
182endmenu 182endmenu
183 183
184comment "" 184comment ""
185 185
186menu "Applets" 186menu "Applets"
187 source core/applets/config.in 187 source core/applets/config.in
188 source noncore/applets/config.in 188 source noncore/applets/config.in
189endmenu 189endmenu
190 190
191menu "Apps" 191menu "Apps"
192 source core/apps/config.in 192 source core/apps/config.in
193 source noncore/apps/config.in 193 source noncore/apps/config.in
194endmenu 194endmenu
195 195
196menu "Communications and Networking" 196menu "Communications and Networking"
197 source noncore/comm/config.in 197 source noncore/comm/config.in
198 source noncore/net/config.in 198 source noncore/net/config.in
199endmenu 199endmenu
200 200
201menu "Games" 201menu "Games"
202 source noncore/games/config.in 202 source noncore/games/config.in
203endmenu 203endmenu
204 204
205menu "Graphics and Multimedia" 205menu "Graphics and Multimedia"
206 source freetype/config.in 206 source freetype/config.in
207 source noncore/graphics/config.in 207 source noncore/graphics/config.in
208 source core/multimedia/config.in 208 source core/multimedia/config.in
209 source noncore/multimedia/config.in 209 source noncore/multimedia/config.in
210endmenu 210endmenu
211 211
212menu "Input methods" 212menu "Input methods"
213 source inputmethods/config.in 213 source inputmethods/config.in
214endmenu 214endmenu
215 215
216menu "Pim" 216menu "Pim"
217 source core/obex/config.in 217 source core/obex/config.in
218 source core/pim/config.in 218 source core/pim/config.in
219 comment "Today Plugins ---" 219 comment "Today Plugins ---"
220 source noncore/todayplugins/config.in 220 source noncore/todayplugins/config.in
221 source core/pim/today/plugins/config.in 221 source core/pim/today/plugins/config.in
222endmenu 222endmenu
223 223
224menu "Settings" 224menu "Settings"
225 source core/settings/config.in 225 source core/settings/config.in
226 source noncore/settings/config.in 226 source noncore/settings/config.in
227 source noncore/securityplugins/config.in
227endmenu 228endmenu
228 229
229menu "Theming" 230menu "Theming"
230 comment "Decorations ---" 231 comment "Decorations ---"
231 source noncore/decorations/config.in 232 source noncore/decorations/config.in
232 comment "Styles ---" 233 comment "Styles ---"
233 source noncore/styles/config.in 234 source noncore/styles/config.in
234endmenu 235endmenu
235 236
236menu "Tools" 237menu "Tools"
237 source noncore/tools/config.in 238 source noncore/tools/config.in
238endmenu 239endmenu
239 240
240menu "Development" 241menu "Development"
241 source development/keyview/config.in 242 source development/keyview/config.in
242 #source development/debugviewer/config.in 243 #source development/debugviewer/config.in
243endmenu 244endmenu
244 245
245menu "Examples" 246menu "Examples"
246 config EXAMPLES 247 config EXAMPLES
247 boolean "Compile Example Application" 248 boolean "Compile Example Application"
248 source examples/config.in 249 source examples/config.in
249endmenu 250endmenu
250 251
251comment "" 252comment ""
252 253
253menu "Unsupported / Unmaintained" 254menu "Unsupported / Unmaintained"
254 source noncore/unsupported/config.in 255 source noncore/unsupported/config.in
255endmenu 256endmenu
256 257
257comment "" 258comment ""
258 depends on EXPERIMENTAL 259 depends on EXPERIMENTAL
259menu "Experimental" 260menu "Experimental"
260 depends on EXPERIMENTAL 261 depends on EXPERIMENTAL
261 source libslcompat/config.in 262 source libslcompat/config.in
262 source core/qws/config.in 263 source core/qws/config.in
263endmenu 264endmenu
diff --git a/packages b/packages
index a43d9b3..0fcc08a 100644
--- a/packages
+++ b/packages
@@ -66,96 +66,100 @@ CONFIG_KEYBOARD inputmethods/keyboard keyboard.pro
66 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro 66 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro
67 CONFIG_KEYVIEW development/keyviewkeyview.pro 67 CONFIG_KEYVIEW development/keyviewkeyview.pro
68CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro 68CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro
69 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro 69 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro
70 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro 70 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro
71 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro 71 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro
72 CONFIG_LAUNCHER core/launcherserver.pro 72 CONFIG_LAUNCHER core/launcherserver.pro
73 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro 73 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro
74 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro 74 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro
75 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro 75 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro
76 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro 76 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro
77 CONFIG_LIBMAIL noncore/unsupported/mail2/libmaillibmail.pro 77 CONFIG_LIBMAIL noncore/unsupported/mail2/libmaillibmail.pro
78CONFIG_LIBMAILWRAPPER noncore/net/mail/libmailwrapper libmailwrapper.pro 78CONFIG_LIBMAILWRAPPER noncore/net/mail/libmailwrapper libmailwrapper.pro
79 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro 79 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro
80 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro 80 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro
81 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro 81 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro
82 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro 82 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro
83 CONFIG_LIBOPIE2MM libopie2/opiemmopiemm.pro 83 CONFIG_LIBOPIE2MM libopie2/opiemmopiemm.pro
84 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro 84 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro
85 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro 85 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro
86CONFIG_PIMCONVERTER noncore/tools/pimconverter converter.pro 86CONFIG_PIMCONVERTER noncore/tools/pimconverter converter.pro
87 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro 87 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro
88 CONFIG_LIBOPIE2SECURITYlibopie2/opiesecurity opiesecurity.pro 88 CONFIG_LIBOPIE2SECURITYlibopie2/opiesecurity opiesecurity.pro
89 CONFIG_LIBOPIE libopielibopie.pro 89 CONFIG_LIBOPIE libopielibopie.pro
90 CONFIG_LIBOPIE_PIM libopie/pimpim.pro 90 CONFIG_LIBOPIE_PIM libopie/pimpim.pro
91 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro 91 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro
92 CONFIG_LIBQPE librarylibrary.pro 92 CONFIG_LIBQPE librarylibrary.pro
93 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 93 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
94CONFIG_LIBQRSYNC rsync rsync.pro 94CONFIG_LIBQRSYNC rsync rsync.pro
95 CONFIG_LIBQTAUX libqtauxlibqtaux.pro 95 CONFIG_LIBQTAUX libqtauxlibqtaux.pro
96 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro 96 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro
97 CONFIG_LIBSQL libsqllibsql.pro 97 CONFIG_LIBSQL libsqllibsql.pro
98CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro 98CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
99CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro 99CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
100 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro 100 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro
101 CONFIG_LIQUID noncore/styles/liquidliquid.pro 101 CONFIG_LIQUID noncore/styles/liquidliquid.pro
102 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro 102 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro
103 CONFIG_MAIL3 noncore/net/mail mail.pro 103 CONFIG_MAIL3 noncore/net/mail mail.pro
104CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro 104CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro
105 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro 105 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro
106CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro 106CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro
107 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro 107 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro
108 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro 108 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro
109 CONFIG_METAL noncore/styles/metalmetal.pro 109 CONFIG_METAL noncore/styles/metalmetal.pro
110 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro 110 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro
111 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro 111 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro
112 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro 112 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro
113 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro 113 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro
114CONFIG_MULTIAUTH_DUMMY noncore/securityplugins/dummy dummyplugin.pro
115CONFIG_MULTIAUTH_PIN noncore/securityplugins/pin pinplugin.pro
116CONFIG_MULTIAUTH_BLUEPING noncore/securityplugins/blueping bluepingplugin.pro
117CONFIG_MULTIAUTH_NOTICE noncore/securityplugins/notice noticeplugin.pro
114 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro 118 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro
115 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro 119 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro
116 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro 120 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro
117 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro 121 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro
118 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro 122 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro
119 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro 123 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro
120 CONFIG_OAPP core/apps/oappoapp.pro 124 CONFIG_OAPP core/apps/oappoapp.pro
121 CONFIG_OBEX core/obexobex.pro 125 CONFIG_OBEX core/obexobex.pro
122 CONFIG_ODICT noncore/apps/odictodict.pro 126 CONFIG_ODICT noncore/apps/odictodict.pro
123 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro 127 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro
124 CONFIG_OPIEALARM core/opiealarmopiealarm.pro 128 CONFIG_OPIEALARM core/opiealarmopiealarm.pro
125 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro 129 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro
126 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro 130 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro
127 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro 131 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro
128 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro 132 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro
129 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro 133 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro
130 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro 134 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro
131 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro 135 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro
132 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro 136 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro
133 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro 137 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro
134 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.pro 138 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.pro
135 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro 139 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro
136 CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro 140 CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro
137 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro 141 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro
138 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro 142 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro
139 CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro 143 CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro
140 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro 144 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro
141 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro 145 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro
142 CONFIG_OSEARCH core/pim/osearchosearch.pro 146 CONFIG_OSEARCH core/pim/osearchosearch.pro
143 CONFIG_OXYGEN noncore/apps/oxygenoxygen.pro 147 CONFIG_OXYGEN noncore/apps/oxygenoxygen.pro
144 CONFIG_PACKAGEMANAGER noncore/settings/packagemanagerpackagemanager.pro 148 CONFIG_PACKAGEMANAGER noncore/settings/packagemanagerpackagemanager.pro
145 CONFIG_PARASHOOT noncore/games/parashootparashoot.pro 149 CONFIG_PARASHOOT noncore/games/parashootparashoot.pro
146 CONFIG_PICKBOARD inputmethods/pickboardpickboard.pro 150 CONFIG_PICKBOARD inputmethods/pickboardpickboard.pro
147 CONFIG_POWERCHORD noncore/multimedia/powerchordpowerchord.pro 151 CONFIG_POWERCHORD noncore/multimedia/powerchordpowerchord.pro
148CONFIG_PPP noncore/settings/networksettings/ppp ppp.pro 152CONFIG_PPP noncore/settings/networksettings/ppp ppp.pro
149 CONFIG_PYQUICKLAUNCH-APPLET noncore/applets/pyquicklaunchpyquicklaunch.pro 153 CONFIG_PYQUICKLAUNCH-APPLET noncore/applets/pyquicklaunchpyquicklaunch.pro
150 CONFIG_PYQUICKLAUNCHER noncore/tools/pyquicklauncherpyquicklauncher.pro 154 CONFIG_PYQUICKLAUNCHER noncore/tools/pyquicklauncherpyquicklauncher.pro
151 CONFIG_PYTHON-EXAMPLESexamples/python bla.pro 155 CONFIG_PYTHON-EXAMPLESexamples/python bla.pro
152 CONFIG_QASHMONEY noncore/apps/qashmoneyqashmoney.pro 156 CONFIG_QASHMONEY noncore/apps/qashmoneyqashmoney.pro
153 CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro 157 CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro
154 CONFIG_QCOP core/apps/qcopqcop.pro 158 CONFIG_QCOP core/apps/qcopqcop.pro
155 CONFIG_QPDF noncore/unsupported/qpdfqpdf.pro 159 CONFIG_QPDF noncore/unsupported/qpdfqpdf.pro
156CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro 160CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
157 CONFIG_QWS core/qwsqws.pro 161 CONFIG_QWS core/qwsqws.pro
158 CONFIG_REMOTE noncore/tools/remoteremote.pro 162 CONFIG_REMOTE noncore/tools/remoteremote.pro
159 CONFIG_RESTARTAPPLET2 core/applets/restartapplet2restartapplet2.pro 163 CONFIG_RESTARTAPPLET2 core/applets/restartapplet2restartapplet2.pro
160 CONFIG_RESTARTAPPLET core/applets/restartappletrestartapplet.pro 164 CONFIG_RESTARTAPPLET core/applets/restartappletrestartapplet.pro
161 CONFIG_ROTATEAPPLET core/applets/rotateappletrotateapplet.pro 165 CONFIG_ROTATEAPPLET core/applets/rotateappletrotateapplet.pro