1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e7344ab..fdea8b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,54 @@
 default:  dynamic
 all: default docs
 LIBS=library libopie
 COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
        inputmethods/pickboard \
        inputmethods/handwriting \
        inputmethods/unikeyboard \
        inputmethods/jumpx \
        inputmethods/dvorak \
        launcher/batteryapplet \
        launcher/irdaapplet \
        launcher/volumeapplet \
        launcher/clockapplet \
        launcher/netmonapplet \
        launcher/screenshotapplet \
        launcher/vmemo \
        netsetup/dialup \
        netsetup/lan \
        opiemail/ifaces/pop3 opiemail/ifaces/smtp \
-        mpegplayer/libmpeg3 \
+        core/opieplayer/libmpeg3 \
-        mpegplayer/libmad \
+        core/opieplayer/libmad \
-        mpegplayer/wavplugin \
+        core/opieplayer/wavplugin \
        cardmon \
        sdmon 
 APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
-    filebrowser helpbrowser minesweep mpegplayer \
+    filebrowser helpbrowser minesweep core/opieplayer \
    settings/light-and-power \
    settings/language \
    settings/rotation \
    settings/appearance \
    settings/security \
    settings/sound \
    settings/systemtime \
    solitaire spreadsheet tetrix textedit \
    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 noncore/appskey noncore/qpdf \
    noncore/kpacman noncore/advancedfm
 NONTMAKEAPPS := noncore/nethack
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 dynamic: $(APPS) $(NONTMAKEAPPS)
 docs: $(DOCS)
 $(COMPONENTS): $(LIBS)

diff --git a/Makefile b/Makefile index e7344ab..fdea8b6 100644 --- a/Makefile +++ b/Makefile
@@ -1,54 +1,54 @@
1	default: dynamic	1	default: dynamic
2		2
3	all: default docs	3	all: default docs
4		4
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	launcher/batteryapplet \	13	launcher/batteryapplet \
14	launcher/irdaapplet \	14	launcher/irdaapplet \
15	launcher/volumeapplet \	15	launcher/volumeapplet \
16	launcher/clockapplet \	16	launcher/clockapplet \
17	launcher/netmonapplet \	17	launcher/netmonapplet \
18	launcher/screenshotapplet \	18	launcher/screenshotapplet \
19	launcher/vmemo \	19	launcher/vmemo \
20	netsetup/dialup \	20	netsetup/dialup \
21	netsetup/lan \	21	netsetup/lan \
22	opiemail/ifaces/pop3 opiemail/ifaces/smtp \	22	opiemail/ifaces/pop3 opiemail/ifaces/smtp \
23	mpegplayer/libmpeg3 \	23	core/opieplayer/libmpeg3 \
24	mpegplayer/libmad \	24	core/opieplayer/libmad \
25	mpegplayer/wavplugin \	25	core/opieplayer/wavplugin \
26	cardmon \	26	cardmon \
27	sdmon	27	sdmon
28		28
29	APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \	29	APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
30	filebrowser helpbrowser minesweep mpegplayer \	30	filebrowser helpbrowser minesweep core/opieplayer \
31	settings/light-and-power \	31	settings/light-and-power \
32	settings/language \	32	settings/language \
33	settings/rotation \	33	settings/rotation \
34	settings/appearance \	34	settings/appearance \
35	settings/security \	35	settings/security \
36	settings/sound \	36	settings/sound \
37	settings/systemtime \	37	settings/systemtime \
38	solitaire spreadsheet tetrix textedit \	38	solitaire spreadsheet tetrix textedit \
39	todo wordgame embeddedkonsole launcher sysinfo \	39	todo wordgame embeddedkonsole launcher sysinfo \
40	parashoot snake citytime showimg netsetup tableviewer \	40	parashoot snake citytime showimg netsetup tableviewer \
41	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \	41	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
42	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \	42	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \
43	noncore/kpacman noncore/advancedfm	43	noncore/kpacman noncore/advancedfm
44		44
45	NONTMAKEAPPS := noncore/nethack	45	NONTMAKEAPPS := noncore/nethack
46		46
47	DOCS = docs/src/opie-policy	47	DOCS = docs/src/opie-policy
48	single: mpegplayer/libmpeg3	48	single: mpegplayer/libmpeg3
49		49
50	dynamic: $(APPS) $(NONTMAKEAPPS)	50	dynamic: $(APPS) $(NONTMAKEAPPS)
51		51
52	docs: $(DOCS)	52	docs: $(DOCS)
53		53
54	$(COMPONENTS): $(LIBS)	54	$(COMPONENTS): $(LIBS)