|
diff --git a/Makefile b/Makefile index ad2f54d..a7213fb 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,47 +1,47 @@ |
1 | #!/usr/bin/make -f |
1 | #!/usr/bin/make -f |
2 | |
2 | |
3 | export TOPDIR:=$(shell pwd) |
3 | export TOPDIR:=$(shell pwd) |
4 | |
4 | |
5 | include $(TOPDIR)/Vars.make |
5 | include $(TOPDIR)/Vars.make |
6 | ifneq ($(wildcard $(TOPDIR)/Vars.local),) |
6 | ifneq ($(wildcard $(TOPDIR)/Vars.local),) |
7 | include $(TOPDIR)/Vars.local |
7 | include $(TOPDIR)/Vars.local |
8 | endif |
8 | 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 |
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 |
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 | |
26 | all : $(TOPDIR)/.config |
26 | all : $(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 |
33 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config |
33 | ipks: $(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|sed -e 's,\.control$$,.prerm,'`; \ |
35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ |
36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ |
38 | postinst=`echo $$ctrl|sed -e 's,\.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 | |
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
44 | |
44 | |
45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
46 | |
46 | |
47 | clean-configs : |
47 | clean-configs : |
|
|
diff --git a/config.in b/config.in index c6ee7a6..b910bda 100644 --- a/ config.in+++ b/ config.in |
|
@@ -120,38 +120,44 @@ menu "Graphics and Multimedia" |
120 | endmenu |
120 | endmenu |
121 | |
121 | |
122 | menu "Input methods" |
122 | menu "Input methods" |
123 | source inputmethods/config.in |
123 | source inputmethods/config.in |
124 | endmenu |
124 | endmenu |
125 | |
125 | |
126 | menu "Pim" |
126 | menu "Pim" |
127 | source core/pim/config.in |
127 | source core/pim/config.in |
128 | menu "Today Plugins" |
128 | menu "Today Plugins" |
129 | source noncore/todayplugins/config.in |
129 | source noncore/todayplugins/config.in |
130 | source core/pim/today/plugins/config.in |
130 | source core/pim/today/plugins/config.in |
131 | endmenu |
131 | endmenu |
132 | endmenu |
132 | endmenu |
133 | |
133 | |
134 | menu "Settings" |
134 | menu "Settings" |
135 | source core/settings/config.in |
135 | source core/settings/config.in |
136 | source noncore/settings/config.in |
136 | source noncore/settings/config.in |
137 | endmenu |
137 | endmenu |
138 | |
138 | |
139 | menu "Theming" |
139 | menu "Theming" |
140 | source noncore/decorations/config.in |
140 | source noncore/decorations/config.in |
141 | source noncore/styles/config.in |
141 | source noncore/styles/config.in |
142 | endmenu |
142 | endmenu |
143 | |
143 | |
144 | menu "Tools" |
144 | menu "Tools" |
145 | source noncore/tools/config.in |
145 | source noncore/tools/config.in |
146 | endmenu |
146 | endmenu |
147 | |
147 | |
148 | menu "Development" |
148 | menu "Development" |
149 | source development/keyview/config.in |
149 | source development/keyview/config.in |
150 | endmenu |
150 | endmenu |
151 | |
151 | |
| |
152 | menu "Examples" |
| |
153 | config EXAMPLES |
| |
154 | boolean "Compile Example Application" |
| |
155 | source examples/config.in |
| |
156 | endmenu |
| |
157 | |
152 | comment "" |
158 | comment "" |
153 | depends on EXPERIMENTAL |
159 | depends on EXPERIMENTAL |
154 | menu "Experimental" |
160 | menu "Experimental" |
155 | depends on EXPERIMENTAL |
161 | depends on EXPERIMENTAL |
156 | source libopie2/config.in |
162 | source libopie2/config.in |
157 | endmenu |
163 | endmenu |
|
|
diff --git a/packages b/packages index eaa02a1..232f2d9 100644 --- a/ packages+++ b/ packages |
|
@@ -144,32 +144,36 @@ CONFIG_SYSINFO noncore/apps/sysinfo sysinfo.pro |
144 | CONFIG_TABLEVIEWER noncore/apps/tableviewertableviewer.pro |
144 | CONFIG_TABLEVIEWER noncore/apps/tableviewertableviewer.pro |
145 | CONFIG_TABMANAGER noncore/settings/tabmanagertabmanager.pro |
145 | CONFIG_TABMANAGER noncore/settings/tabmanagertabmanager.pro |
146 | CONFIG_TABOAPP core/apps/taboapptaboapp.pro |
146 | CONFIG_TABOAPP core/apps/taboapptaboapp.pro |
147 | CONFIG_TEST libsql/testtest.pro |
147 | CONFIG_TEST libsql/testtest.pro |
148 | CONFIG_TEST noncore/apps/opie-console/testtest.pro |
148 | CONFIG_TEST noncore/apps/opie-console/testtest.pro |
149 | CONFIG_TETRIX noncore/games/tetrixtetrix.pro |
149 | CONFIG_TETRIX noncore/games/tetrixtetrix.pro |
150 | CONFIG_TEXTEDIT core/apps/textedittextedit.pro |
150 | CONFIG_TEXTEDIT core/apps/textedittextedit.pro |
151 | CONFIG_THEME noncore/styles/themetheme.pro |
151 | CONFIG_THEME noncore/styles/themetheme.pro |
152 | CONFIG_TICTAC noncore/games/tictactictac.pro |
152 | CONFIG_TICTAC noncore/games/tictactictac.pro |
153 | CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro |
153 | CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro |
154 | CONFIG_TODAY core/pim/todaytoday.pro |
154 | CONFIG_TODAY core/pim/todaytoday.pro |
155 | CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro |
155 | CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro |
156 | CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebookdatebook.pro |
156 | CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebookdatebook.pro |
157 | CONFIG_TODAY_FORTUNE noncore/todayplugins/fortunefortune.pro |
157 | CONFIG_TODAY_FORTUNE noncore/todayplugins/fortunefortune.pro |
158 | CONFIG_TODAY_MAIL core/pim/today/plugins/mailmail.pro |
158 | CONFIG_TODAY_MAIL core/pim/today/plugins/mailmail.pro |
159 | CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stocktickerstockticker.pro |
159 | CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stocktickerstockticker.pro |
160 | CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro |
160 | CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro |
161 | CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolisttodolist.pro |
161 | CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolisttodolist.pro |
162 | CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro |
162 | CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro |
163 | CONFIG_TODO core/pim/todotodo.pro |
163 | CONFIG_TODO core/pim/todotodo.pro |
164 | CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro |
164 | CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro |
165 | CONFIG_UNIKEYBOARD inputmethods/unikeyboardunikeyboard.pro |
165 | CONFIG_UNIKEYBOARD inputmethods/unikeyboardunikeyboard.pro |
166 | CONFIG_USERMANAGER noncore/settings/usermanagerusermanager.pro |
166 | CONFIG_USERMANAGER noncore/settings/usermanagerusermanager.pro |
167 | CONFIG_VMEMO core/applets/vmemovmemo.pro |
167 | CONFIG_VMEMO core/applets/vmemovmemo.pro |
168 | CONFIG_VOLUMEAPPLET core/applets/volumeappletvolumeapplet.pro |
168 | CONFIG_VOLUMEAPPLET core/applets/volumeappletvolumeapplet.pro |
169 | CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavpluginwavplugin.pro |
169 | CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavpluginwavplugin.pro |
170 | CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro |
170 | CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro |
171 | CONFIG_WIRELESSAPPLET noncore/applets/wirelessappletwirelessapplet.pro |
171 | CONFIG_WIRELESSAPPLET noncore/applets/wirelessappletwirelessapplet.pro |
172 | CONFIG_WLAN noncore/settings/networksettings/wlanwlan.pro |
172 | CONFIG_WLAN noncore/settings/networksettings/wlanwlan.pro |
173 | CONFIG_PPP noncore/settings/networksettings/pppppp.pro |
173 | CONFIG_PPP noncore/settings/networksettings/pppppp.pro |
174 | CONFIG_WORDGAME noncore/games/wordgamewordgame.pro |
174 | CONFIG_WORDGAME noncore/games/wordgamewordgame.pro |
175 | CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro |
175 | CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro |
| |
176 | CONFIG_MAIN_TAB_EXAMPLE examples/main-tabexample.pro |
| |
177 | CONFIG_SIMPLE_EXAMPLE examples/simpleexample.pro |
| |
178 | CONFIG_SIMPLE_ICON examples/simple-iconexample.pro |
| |
179 | CONFIG_SIMPLE_MAIN examples/simple-mainexample.pro |
|