1 files changed, 72 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index 6399702..6181b71 100644
--- a/Makefile
+++ b/Makefile
@@ -4,59 +4,79 @@ all: default docs
 LIBS=library libopie
-COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
-        inputmethods/pickboard \
+INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
-        inputmethods/handwriting \
+        inputmethods/handwriting  inputmethods/unikeyboard \
-        inputmethods/unikeyboard \
+        inputmethods/jumpx inputmethods/kjumpx \
-        inputmethods/jumpx \
+        inputmethods/dvorak 
-        inputmethods/kjumpx \
-        inputmethods/dvorak \
+APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
-        core/applets/batteryapplet \
+        core/applets/irdaapplet core/applets/volumeapplet \
-        core/applets/batteryapplet-ipaq \
+        core/applets/clockapplet core/applets/netmonapplet \
-        core/applets/irdaapplet \
+        core/applets/screenshotapplet core/applets/clipboardapplet \
-        core/applets/volumeapplet \
+        core/applets/cardmon core/applets/obex \
-        core/applets/clockapplet \
+        core/applets/vmemo noncore/net/netsetup/dialup \
-        core/applets/netmonapplet \
+        noncore/net/netsetup/lan 
-        core/applets/screenshotapplet \
-        core/applets/clipboardapplet \
+MAIL= noncore/mail/libmail noncore/mail/bend 
-        core/applets/cardmon \
-        core/applets/obex \
+PLAYER = core/multimedia/opieplayer/libmpeg3 \
-        core/applets/vmemo \
-        noncore/net/netsetup/dialup \
-        noncore/net/netsetup/lan \
-        core/multimedia/opieplayer/libmpeg3 \
        core/multimedia/opieplayer/libmad \
-        core/multimedia/opieplayer/wavplugin \
+        core/multimedia/opieplayer/wavplugin 
-        noncore/mail/libmail \
-        noncore/mail/bend \
+        COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
-APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \
-    noncore/tools/clock core/pim/datebook core/apps/filebrowser \
+PIMAPPS = core/pim/addressbook core/pim/datebook \
-    core/apps/helpbrowser noncore/games/minesweep \
+         core/pim/today core/pim/todo 
-    core/multimedia/opieplayer core/settings/light-and-power \
-    noncore/settings/language \
+COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
-    noncore/settings/rotation \
+        core/apps/textedit core/apps/embeddedkonsole \
-    noncore/settings/appearance \
+        core/launcher core/apps/sysinfo \
-    core/settings/security \
+        core/apps/oipkg core/apps/qcop
-    noncore/settings/sound \
-    core/settings/systemtime \
+COREMULTIMEDIA = core/multimedia/opieplayer
-    noncore/settings/mediummount \
-    noncore/settings/tabmanager \
+CORESETTINGS = core/settings/light-and-power core/settings/security \
-    noncore/games/solitaire noncore/apps/spreadsheet \
+        core/settings/systemtime core/settings/citytime \
-    noncore/games/tetrix  core/apps/textedit  \
+        core/settings/wlansetup
-    core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \
-    core/launcher core/apps/sysinfo \
+NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
-    noncore/games/parashoot noncore/games/snake core/settings/citytime  \
+        noncore/settings/appearance noncore/settings/sound \
-    noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \
+        noncore/settings/mediummount \
-    noncore/apps/tableviewer   core/apps/oipkg noncore/games/mindbreaker \
+        noncore/settings/tabmanager noncore/settings/appskey 
-    noncore/games/go noncore/games/qasteroids core/apps/qcop \
-    noncore/games/fifteen noncore/comm/keypebble  \
+NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
-    core/pim/today  noncore/games/tictac noncore/net/opieftp  \
+         noncore/tools/remote noncore/tools/opie-sh 
-    noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \
-    noncore/graphics/qpdf   noncore/games/kpacman noncore/apps/advancedfm  \
+GAMES = noncore/games/minesweep noncore/games/solitaire \
-    noncore/games/kbill noncore/tools/remote  \
+        noncore/games/tetrix noncore/games/wordgame \
-    noncore/tools/opie-sh \
+        noncore/games/parashoot noncore/games/snake \
-    noncore/mail
+        noncore/games/mindbreaker \
+        noncore/games/go noncore/games/qasteroids \
+        noncore/games/fifteen noncore/games/tictac \
+        noncore/games/kcheckers noncore/games/kpacman \
+        noncore/games/kbill
+NONAPPS = noncore/apps/spreadsheet noncore/apps/tableviewer \
+        noncore/apps/advancedfm
+NONNET = noncore/net/netsetup noncore/net/opieftp \
+        noncore/mail
+NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
+        noncore/graphics/qpdf 
+NONCOMM = noncore/comm/keypebble
+APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
+        $(COREMULTIMEDIA) $(CORESETTINGS) \
+        $(NONCORESETTINGS) $(NONCORETOOLS) \
+        $(NOAPPS) $(NONNET) $(NONMULT) \
+        $(NONCOMM) $(GAMES)
+    
+    
 NONTMAKEAPPS := ipaq/opiealarm noncore/nethack

diff --git a/Makefile b/Makefile index 6399702..6181b71 100644 --- a/Makefile +++ b/Makefile
@@ -4,59 +4,79 @@ all: default docs
4		4
5	LIBS=library libopie	5	LIBS=library libopie
6		6
7	COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \	7
8	inputmethods/pickboard \	8	INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
9	inputmethods/handwriting \	9	inputmethods/handwriting inputmethods/unikeyboard \
10	inputmethods/unikeyboard \	10	inputmethods/jumpx inputmethods/kjumpx \
11	inputmethods/jumpx \	11	inputmethods/dvorak
12	inputmethods/kjumpx \	12
13	inputmethods/dvorak \	13	APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
14	core/applets/batteryapplet \	14	core/applets/irdaapplet core/applets/volumeapplet \
15	core/applets/batteryapplet-ipaq \	15	core/applets/clockapplet core/applets/netmonapplet \
16	core/applets/irdaapplet \	16	core/applets/screenshotapplet core/applets/clipboardapplet \
17	core/applets/volumeapplet \	17	core/applets/cardmon core/applets/obex \
18	core/applets/clockapplet \	18	core/applets/vmemo noncore/net/netsetup/dialup \
19	core/applets/netmonapplet \	19	noncore/net/netsetup/lan
20	core/applets/screenshotapplet \	20
21	core/applets/clipboardapplet \	21	MAIL= noncore/mail/libmail noncore/mail/bend
22	core/applets/cardmon \	22
23	core/applets/obex \	23	PLAYER = core/multimedia/opieplayer/libmpeg3 \
24	core/applets/vmemo \
25	noncore/net/netsetup/dialup \
26	noncore/net/netsetup/lan \
27	core/multimedia/opieplayer/libmpeg3 \
28	core/multimedia/opieplayer/libmad \	24	core/multimedia/opieplayer/libmad \
29	core/multimedia/opieplayer/wavplugin \	25	core/multimedia/opieplayer/wavplugin
30	noncore/mail/libmail \	26
31	noncore/mail/bend \	27	COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
32		28
33	APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \	29
34	noncore/tools/clock core/pim/datebook core/apps/filebrowser \	30	PIMAPPS = core/pim/addressbook core/pim/datebook \
35	core/apps/helpbrowser noncore/games/minesweep \	31	core/pim/today core/pim/todo
36	core/multimedia/opieplayer core/settings/light-and-power \	32
37	noncore/settings/language \	33	COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
38	noncore/settings/rotation \	34	core/apps/textedit core/apps/embeddedkonsole \
39	noncore/settings/appearance \	35	core/launcher core/apps/sysinfo \
40	core/settings/security \	36	core/apps/oipkg core/apps/qcop
41	noncore/settings/sound \	37
42	core/settings/systemtime \	38	COREMULTIMEDIA = core/multimedia/opieplayer
43	noncore/settings/mediummount \	39
44	noncore/settings/tabmanager \	40	CORESETTINGS = core/settings/light-and-power core/settings/security \
45	noncore/games/solitaire noncore/apps/spreadsheet \	41	core/settings/systemtime core/settings/citytime \
46	noncore/games/tetrix core/apps/textedit \	42	core/settings/wlansetup
47	core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \	43
48	core/launcher core/apps/sysinfo \	44	NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
49	noncore/games/parashoot noncore/games/snake core/settings/citytime \	45	noncore/settings/appearance noncore/settings/sound \
50	noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \	46	noncore/settings/mediummount \
51	noncore/apps/tableviewer core/apps/oipkg noncore/games/mindbreaker \	47	noncore/settings/tabmanager noncore/settings/appskey
52	noncore/games/go noncore/games/qasteroids core/apps/qcop \	48
53	noncore/games/fifteen noncore/comm/keypebble \	49	NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
54	core/pim/today noncore/games/tictac noncore/net/opieftp \	50	noncore/tools/remote noncore/tools/opie-sh
55	noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \	51
56	noncore/graphics/qpdf noncore/games/kpacman noncore/apps/advancedfm \	52	GAMES = noncore/games/minesweep noncore/games/solitaire \
57	noncore/games/kbill noncore/tools/remote \	53	noncore/games/tetrix noncore/games/wordgame \
58	noncore/tools/opie-sh \	54	noncore/games/parashoot noncore/games/snake \
59	noncore/mail	55	noncore/games/mindbreaker \
		56	noncore/games/go noncore/games/qasteroids \
		57	noncore/games/fifteen noncore/games/tictac \
		58	noncore/games/kcheckers noncore/games/kpacman \
		59	noncore/games/kbill
		60
		61	NONAPPS = noncore/apps/spreadsheet noncore/apps/tableviewer \
		62	noncore/apps/advancedfm
		63
		64	NONNET = noncore/net/netsetup noncore/net/opieftp \
		65	noncore/mail
		66
		67	NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
		68	noncore/graphics/qpdf
		69
		70
		71	NONCOMM = noncore/comm/keypebble
		72
		73	APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
		74	$(COREMULTIMEDIA) $(CORESETTINGS) \
		75	$(NONCORESETTINGS) $(NONCORETOOLS) \
		76	$(NOAPPS) $(NONNET) $(NONMULT) \
		77	$(NONCOMM) $(GAMES)
		78
		79
60		80
61	NONTMAKEAPPS := ipaq/opiealarm noncore/nethack	81	NONTMAKEAPPS := ipaq/opiealarm noncore/nethack
62		82