1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 24a9050..01aba30 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,22 @@ all: default docs
 LIBS=library libopie
 COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
        inputmethods/pickboard \
        inputmethods/handwriting \
        inputmethods/unikeyboard \
        inputmethods/jumpx \
        inputmethods/dvorak \
-        taskbar/batteryapplet \
+        launcher/batteryapplet \
-        taskbar/volumeapplet \
+        launcher/volumeapplet \
-        taskbar/clockapplet \
+        launcher/clockapplet \
-        taskbar/netmonapplet \
+        launcher/netmonapplet \
-        taskbar/screenshotapplet \
+        launcher/screenshotapplet \
-        taskbar/vmemo \
+        launcher/vmemo \
        netsetup/dialup \
        netsetup/lan \
        opiemail/ifaces/pop3 opiemail/ifaces/smtp \
        mpegplayer/libmpeg3 \
        mpegplayer/libmad \
        mpegplayer/wavplugin \
        cardmon \
        sdmon 
@@ -30,17 +30,17 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
    settings/light-and-power \
    settings/language \
    settings/rotation \
    settings/appearance \
    settings/security \
    settings/sound \
    settings/systemtime \
    solitaire spreadsheet tetrix textedit \
-    todo wordgame embeddedkonsole taskbar sysinfo \
+    todo wordgame embeddedkonsole launcher sysinfo \
    parashoot snake citytime showimg netsetup tableviewer \
    qipkg mindbreaker go qasteroids qcop fifteen keypebble  today opiemail/converter opiemail \
    noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 dynamic: $(APPS)

diff --git a/Makefile b/Makefile index 24a9050..01aba30 100644 --- a/Makefile +++ b/Makefile
@@ -5,22 +5,22 @@ all: default docs
5	LIBS=library libopie	5	LIBS=library libopie
6		6
7	COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \	7	COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
8	inputmethods/pickboard \	8	inputmethods/pickboard \
9	inputmethods/handwriting \	9	inputmethods/handwriting \
10	inputmethods/unikeyboard \	10	inputmethods/unikeyboard \
11	inputmethods/jumpx \	11	inputmethods/jumpx \
12	inputmethods/dvorak \	12	inputmethods/dvorak \
13	taskbar/batteryapplet \	13	launcher/batteryapplet \
14	taskbar/volumeapplet \	14	launcher/volumeapplet \
15	taskbar/clockapplet \	15	launcher/clockapplet \
16	taskbar/netmonapplet \	16	launcher/netmonapplet \
17	taskbar/screenshotapplet \	17	launcher/screenshotapplet \
18	taskbar/vmemo \	18	launcher/vmemo \
19	netsetup/dialup \	19	netsetup/dialup \
20	netsetup/lan \	20	netsetup/lan \
21	opiemail/ifaces/pop3 opiemail/ifaces/smtp \	21	opiemail/ifaces/pop3 opiemail/ifaces/smtp \
22	mpegplayer/libmpeg3 \	22	mpegplayer/libmpeg3 \
23	mpegplayer/libmad \	23	mpegplayer/libmad \
24	mpegplayer/wavplugin \	24	mpegplayer/wavplugin \
25	cardmon \	25	cardmon \
26	sdmon	26	sdmon
@@ -30,17 +30,17 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
30	settings/light-and-power \	30	settings/light-and-power \
31	settings/language \	31	settings/language \
32	settings/rotation \	32	settings/rotation \
33	settings/appearance \	33	settings/appearance \
34	settings/security \	34	settings/security \
35	settings/sound \	35	settings/sound \
36	settings/systemtime \	36	settings/systemtime \
37	solitaire spreadsheet tetrix textedit \	37	solitaire spreadsheet tetrix textedit \
38	todo wordgame embeddedkonsole taskbar sysinfo \	38	todo wordgame embeddedkonsole launcher sysinfo \
39	parashoot snake citytime showimg netsetup tableviewer \	39	parashoot snake citytime showimg netsetup tableviewer \
40	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \	40	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
41	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers	41	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
42		42
43	DOCS = docs/src/opie-policy	43	DOCS = docs/src/opie-policy
44	single: mpegplayer/libmpeg3	44	single: mpegplayer/libmpeg3
45		45
46	dynamic: $(APPS)	46	dynamic: $(APPS)