summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-30 21:22:13 (UTC)
committer zecke <zecke>2003-08-30 21:22:13 (UTC)
commit1ac46a7eb18e8755891a489888d0b8bb71ef8455 (patch) (unidiff)
treed882419f408748db5dd6cbd9b2734b90cb72afea
parent75e0c0607c4abf0568e90ddb0789592b93f1d491 (diff)
downloadopie-1ac46a7eb18e8755891a489888d0b8bb71ef8455.zip
opie-1ac46a7eb18e8755891a489888d0b8bb71ef8455.tar.gz
opie-1ac46a7eb18e8755891a489888d0b8bb71ef8455.tar.bz2
include a new menu for examples and the examples apps
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--config.in6
-rw-r--r--packages4
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ad2f54d..a7213fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,63 +1,63 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2 2
3export TOPDIR:=$(shell pwd) 3export TOPDIR:=$(shell pwd)
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 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
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|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
45all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 45all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
46 46
47clean-configs : 47clean-configs :
48 @echo "Wiping generated config.in files..." 48 @echo "Wiping generated config.in files..."
49 @-rm -f $(configs) 49 @-rm -f $(configs)
50 50
51ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) 51ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),)
52 include $(TOPDIR)/.depends.cfgs 52 include $(TOPDIR)/.depends.cfgs
53endif 53endif
54 54
55all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 55all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
56 56
57$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 57$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
58 $(call descend,scripts/kconfig,conf) 58 $(call descend,scripts/kconfig,conf)
59 @if [ ! -e $@ ]; then \ 59 @if [ ! -e $@ ]; then \
60 cp $(TOPDIR)/def-configs/opie $@; \ 60 cp $(TOPDIR)/def-configs/opie $@; \
61 fi 61 fi
62 @$(MAKE) -C scripts/kconfig conf 62 @$(MAKE) -C scripts/kconfig conf
63 ./scripts/kconfig/conf -s ./config.in 63 ./scripts/kconfig/conf -s ./config.in
diff --git a/config.in b/config.in
index c6ee7a6..b910bda 100644
--- a/config.in
+++ b/config.in
@@ -104,54 +104,60 @@ endmenu
104 104
105menu "Communications and Networking" 105menu "Communications and Networking"
106 source noncore/comm/config.in 106 source noncore/comm/config.in
107 source noncore/mail/config.in 107 source noncore/mail/config.in
108 source noncore/net/config.in 108 source noncore/net/config.in
109endmenu 109endmenu
110 110
111menu "Games" 111menu "Games"
112 source noncore/games/config.in 112 source noncore/games/config.in
113endmenu 113endmenu
114 114
115menu "Graphics and Multimedia" 115menu "Graphics and Multimedia"
116 source freetype/config.in 116 source freetype/config.in
117 source noncore/graphics/config.in 117 source noncore/graphics/config.in
118 source core/multimedia/config.in 118 source core/multimedia/config.in
119 source noncore/multimedia/config.in 119 source noncore/multimedia/config.in
120endmenu 120endmenu
121 121
122menu "Input methods" 122menu "Input methods"
123 source inputmethods/config.in 123 source inputmethods/config.in
124endmenu 124endmenu
125 125
126menu "Pim" 126menu "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
132endmenu 132endmenu
133 133
134menu "Settings" 134menu "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
137endmenu 137endmenu
138 138
139menu "Theming" 139menu "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
142endmenu 142endmenu
143 143
144menu "Tools" 144menu "Tools"
145 source noncore/tools/config.in 145 source noncore/tools/config.in
146endmenu 146endmenu
147 147
148menu "Development" 148menu "Development"
149 source development/keyview/config.in 149 source development/keyview/config.in
150endmenu 150endmenu
151 151
152menu "Examples"
153 config EXAMPLES
154 boolean "Compile Example Application"
155 source examples/config.in
156endmenu
157
152comment "" 158comment ""
153 depends on EXPERIMENTAL 159 depends on EXPERIMENTAL
154menu "Experimental" 160menu "Experimental"
155 depends on EXPERIMENTAL 161 depends on EXPERIMENTAL
156 source libopie2/config.in 162 source libopie2/config.in
157endmenu 163endmenu
diff --git a/packages b/packages
index eaa02a1..232f2d9 100644
--- a/packages
+++ b/packages
@@ -128,48 +128,52 @@ CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro
128 CONFIG_ROTATEAPPLET core/applets/rotateappletrotateapplet.pro 128 CONFIG_ROTATEAPPLET core/applets/rotateappletrotateapplet.pro
129 CONFIG_ROTATION noncore/settings/rotationrotation.pro 129 CONFIG_ROTATION noncore/settings/rotationrotation.pro
130 CONFIG_RUNAPPLET core/applets/runappletrunapplet.pro 130 CONFIG_RUNAPPLET core/applets/runappletrunapplet.pro
131 CONFIG_SCREENSHOTAPPLET core/applets/screenshotappletscreenshotapplet.pro 131 CONFIG_SCREENSHOTAPPLET core/applets/screenshotappletscreenshotapplet.pro
132 CONFIG_SECURITY core/settings/securitysecurity.pro 132 CONFIG_SECURITY core/settings/securitysecurity.pro
133 CONFIG_SFCAVE noncore/games/sfcavesfcave.pro 133 CONFIG_SFCAVE noncore/games/sfcavesfcave.pro
134 CONFIG_SFCAVE-SDL noncore/games/sfcave-sdlsfcave-sdl.pro 134 CONFIG_SFCAVE-SDL noncore/games/sfcave-sdlsfcave-sdl.pro
135 CONFIG_SHOWIMG noncore/multimedia/showimgshowimg.pro 135 CONFIG_SHOWIMG noncore/multimedia/showimgshowimg.pro
136 CONFIG_SIMPLE noncore/tools/calc2/simplesimple.pro 136 CONFIG_SIMPLE noncore/tools/calc2/simplesimple.pro
137 CONFIG_SINGLE singlesingle.pro 137 CONFIG_SINGLE singlesingle.pro
138 CONFIG_SNAKE noncore/games/snakesnake.pro 138 CONFIG_SNAKE noncore/games/snakesnake.pro
139 CONFIG_SOLITAIRE noncore/games/solitairesolitaire.pro 139 CONFIG_SOLITAIRE noncore/games/solitairesolitaire.pro
140 CONFIG_SOUND noncore/settings/soundsound.pro 140 CONFIG_SOUND noncore/settings/soundsound.pro
141 CONFIG_SSHKEYS noncore/settings/sshkeyssshkeys.pro 141 CONFIG_SSHKEYS noncore/settings/sshkeyssshkeys.pro
142 CONFIG_SUSPENDAPPLET core/applets/suspendappletsuspendapplet.pro 142 CONFIG_SUSPENDAPPLET core/applets/suspendappletsuspendapplet.pro
143 CONFIG_SYSINFO noncore/apps/sysinfosysinfo.pro 143 CONFIG_SYSINFO noncore/apps/sysinfosysinfo.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
155CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro 155CONFIG_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