2 files changed, 44 insertions, 36 deletions
diff --git a/Makefile b/Makefile
index e25cb98..6399702 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-default:  dynamic
+indefault:  dynamic
 all: default docs
 LIBS=library libopie
@@ -10,45 +10,53 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
        inputmethods/unikeyboard \
        inputmethods/jumpx \
        inputmethods/kjumpx \
        inputmethods/dvorak \
-        launcher/batteryapplet \
+        core/applets/batteryapplet \
-        launcher/batteryapplet-ipaq \
+        core/applets/batteryapplet-ipaq \
-        launcher/irdaapplet \
+        core/applets/irdaapplet \
-        launcher/volumeapplet \
+        core/applets/volumeapplet \
-        launcher/clockapplet \
+        core/applets/clockapplet \
-        launcher/netmonapplet \
+        core/applets/netmonapplet \
-        launcher/screenshotapplet \
+        core/applets/screenshotapplet \
-        launcher/clipboardapplet \
+        core/applets/clipboardapplet \
-        launcher/cardmon \
+        core/applets/cardmon \
-        launcher/obex \
+        core/applets/obex \
-        launcher/vmemo \
+        core/applets/vmemo \
-        netsetup/dialup \
+        noncore/net/netsetup/dialup \
-        netsetup/lan \
+        noncore/net/netsetup/lan \
-        opiemail/ifaces/pop3 opiemail/ifaces/smtp \
+        core/multimedia/opieplayer/libmpeg3 \
-        core/opieplayer/libmpeg3 \
+        core/multimedia/opieplayer/libmad \
-        core/opieplayer/libmad \
+        core/multimedia/opieplayer/wavplugin \
-        core/opieplayer/wavplugin \
        noncore/mail/libmail \
        noncore/mail/bend \
-APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
+APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \
-    filebrowser helpbrowser minesweep core/opieplayer \
+    noncore/tools/clock core/pim/datebook core/apps/filebrowser \
-    settings/light-and-power \
+    core/apps/helpbrowser noncore/games/minesweep \
-    settings/language \
+    core/multimedia/opieplayer core/settings/light-and-power \
-    settings/rotation \
+    noncore/settings/language \
-    settings/appearance \
+    noncore/settings/rotation \
-    settings/security \
+    noncore/settings/appearance \
-    settings/sound \
+    core/settings/security \
-    settings/systemtime \
+    noncore/settings/sound \
-    settings/mediummount \
+    core/settings/systemtime \
-    settings/tabmanager \
+    noncore/settings/mediummount \
-    solitaire spreadsheet tetrix textedit \
+    noncore/settings/tabmanager \
-    todo wordgame embeddedkonsole launcher sysinfo \
+    noncore/games/solitaire noncore/apps/spreadsheet \
-    parashoot snake citytime showimg netsetup core/wlansetup tableviewer \
+    noncore/games/tetrix  core/apps/textedit  \
-    core/oipkg mindbreaker go qasteroids qcop fifteen keypebble  today opiemail/converter opiemail \
+    core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \
-    noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \
+    core/launcher core/apps/sysinfo \
-    noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh \
+    noncore/games/parashoot noncore/games/snake core/settings/citytime  \
+    noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \
+    noncore/apps/tableviewer   core/apps/oipkg noncore/games/mindbreaker \
+    noncore/games/go noncore/games/qasteroids core/apps/qcop \
+    noncore/games/fifteen noncore/comm/keypebble  \
+    core/pim/today  noncore/games/tictac noncore/net/opieftp  \
+    noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \
+    noncore/graphics/qpdf   noncore/games/kpacman noncore/apps/advancedfm  \
+    noncore/games/kbill noncore/tools/remote  \
+    noncore/tools/opie-sh \
    noncore/mail
 NONTMAKEAPPS := ipaq/opiealarm noncore/nethack
diff --git a/configure b/configure
index cfc4c39..7e9ab68 100755
--- a/configure
+++ b/configure
@@ -287,7 +287,7 @@ EOF
 done
 MAKE=make
 echo
-echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)."
+echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)."
 echo "To reconfigure, run $MAKE clean and configure."
 echo

diff --git a/Makefile b/Makefile index e25cb98..6399702 100644 --- a/Makefile +++ b/Makefile
@@ -1,5 +1,5 @@
1	default: dynamic	1	indefault: dynamic
2		2
3	all: default docs	3	all: default docs
4		4
5	LIBS=library libopie	5	LIBS=library libopie
@@ -10,45 +10,53 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
10	inputmethods/unikeyboard \	10	inputmethods/unikeyboard \
11	inputmethods/jumpx \	11	inputmethods/jumpx \
12	inputmethods/kjumpx \	12	inputmethods/kjumpx \
13	inputmethods/dvorak \	13	inputmethods/dvorak \
14	launcher/batteryapplet \	14	core/applets/batteryapplet \
15	launcher/batteryapplet-ipaq \	15	core/applets/batteryapplet-ipaq \
16	launcher/irdaapplet \	16	core/applets/irdaapplet \
17	launcher/volumeapplet \	17	core/applets/volumeapplet \
18	launcher/clockapplet \	18	core/applets/clockapplet \
19	launcher/netmonapplet \	19	core/applets/netmonapplet \
20	launcher/screenshotapplet \	20	core/applets/screenshotapplet \
21	launcher/clipboardapplet \	21	core/applets/clipboardapplet \
22	launcher/cardmon \	22	core/applets/cardmon \
23	launcher/obex \	23	core/applets/obex \
24	launcher/vmemo \	24	core/applets/vmemo \
25	netsetup/dialup \	25	noncore/net/netsetup/dialup \
26	netsetup/lan \	26	noncore/net/netsetup/lan \
27	opiemail/ifaces/pop3 opiemail/ifaces/smtp \	27	core/multimedia/opieplayer/libmpeg3 \
28	core/opieplayer/libmpeg3 \	28	core/multimedia/opieplayer/libmad \
29	core/opieplayer/libmad \	29	core/multimedia/opieplayer/wavplugin \
30	core/opieplayer/wavplugin \
31	noncore/mail/libmail \	30	noncore/mail/libmail \
32	noncore/mail/bend \	31	noncore/mail/bend \
33		32
34	APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \	33	APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \
35	filebrowser helpbrowser minesweep core/opieplayer \	34	noncore/tools/clock core/pim/datebook core/apps/filebrowser \
36	settings/light-and-power \	35	core/apps/helpbrowser noncore/games/minesweep \
37	settings/language \	36	core/multimedia/opieplayer core/settings/light-and-power \
38	settings/rotation \	37	noncore/settings/language \
39	settings/appearance \	38	noncore/settings/rotation \
40	settings/security \	39	noncore/settings/appearance \
41	settings/sound \	40	core/settings/security \
42	settings/systemtime \	41	noncore/settings/sound \
43	settings/mediummount \	42	core/settings/systemtime \
44	settings/tabmanager \	43	noncore/settings/mediummount \
45	solitaire spreadsheet tetrix textedit \	44	noncore/settings/tabmanager \
46	todo wordgame embeddedkonsole launcher sysinfo \	45	noncore/games/solitaire noncore/apps/spreadsheet \
47	parashoot snake citytime showimg netsetup core/wlansetup tableviewer \	46	noncore/games/tetrix core/apps/textedit \
48	core/oipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \	47	core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \
49	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \	48	core/launcher core/apps/sysinfo \
50	noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh \	49	noncore/games/parashoot noncore/games/snake core/settings/citytime \
		50	noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \
		51	noncore/apps/tableviewer core/apps/oipkg noncore/games/mindbreaker \
		52	noncore/games/go noncore/games/qasteroids core/apps/qcop \
		53	noncore/games/fifteen noncore/comm/keypebble \
		54	core/pim/today noncore/games/tictac noncore/net/opieftp \
		55	noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \
		56	noncore/graphics/qpdf noncore/games/kpacman noncore/apps/advancedfm \
		57	noncore/games/kbill noncore/tools/remote \
		58	noncore/tools/opie-sh \
51	noncore/mail	59	noncore/mail
52		60
53	NONTMAKEAPPS := ipaq/opiealarm noncore/nethack	61	NONTMAKEAPPS := ipaq/opiealarm noncore/nethack
54		62


diff --git a/configure b/configure index cfc4c39..7e9ab68 100755 --- a/configure +++ b/configure
@@ -287,7 +287,7 @@ EOF
287	done	287	done
288		288
289	MAKE=make	289	MAKE=make
290	echo	290	echo
291	echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)."	291	echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)."
292	echo "To reconfigure, run $MAKE clean and configure."	292	echo "To reconfigure, run $MAKE clean and configure."
293	echo	293	echo