|
diff --git a/Makefile b/Makefile index 13e1205..e1ae448 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -9,13 +9,13 @@ endif |
9 | |
9 | |
10 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
10 | noconfig_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 | |
15 | configs += $(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 |
15 | configs += $(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. |
|
|
|
|
@@ -172,12 +172,13 @@ endif |
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 .; ) |
|
|
diff --git a/config.in b/config.in index 2cd3160..60ebd65 100644 --- a/ config.in+++ b/ config.in |
|
@@ -221,12 +221,13 @@ menu "Pim" |
221 | source core/pim/today/plugins/config.in |
221 | source core/pim/today/plugins/config.in |
222 | endmenu |
222 | endmenu |
223 | |
223 | |
224 | menu "Settings" |
224 | menu "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 |
227 | endmenu |
228 | endmenu |
228 | |
229 | |
229 | menu "Theming" |
230 | menu "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 ---" |
|
|
diff --git a/packages b/packages index a43d9b3..0fcc08a 100644 --- a/ packages+++ b/ packages |
|
@@ -108,12 +108,16 @@ CONFIG_MEDIUMMOUNT noncore/settings/mediummount mediummount.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 |
| |
114 | CONFIG_MULTIAUTH_DUMMY noncore/securityplugins/dummy dummyplugin.pro |
| |
115 | CONFIG_MULTIAUTH_PIN noncore/securityplugins/pin pinplugin.pro |
| |
116 | CONFIG_MULTIAUTH_BLUEPING noncore/securityplugins/blueping bluepingplugin.pro |
| |
117 | CONFIG_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 |
|