9 files changed, 68 insertions, 68 deletions
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 5fca66e..6e007ec 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -5,6 +5,6 @@
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"
+        CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -137,6 +137,6 @@ REQUIRES=
 main.o: main.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
                mediaplayerstate.h \
                playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                audiowidget.h \
@@ -145,5 +145,5 @@ main.o: main.cpp \
                mediaplayer.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                mediaplayerplugininterface.h
@@ -151,4 +151,4 @@ main.o: main.cpp \
 loopcontrol.o: loopcontrol.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                loopcontrol.h \
@@ -157,4 +157,4 @@ loopcontrol.o: loopcontrol.cpp \
                mediaplayerplugininterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                mediaplayerstate.h
@@ -162,4 +162,4 @@ loopcontrol.o: loopcontrol.cpp \
 playlistselection.o: playlistselection.cpp \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                playlistselection.h
@@ -167,7 +167,7 @@ playlistselection.o: playlistselection.cpp \
 mediaplayerstate.o: mediaplayerstate.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
                mediaplayerplugininterface.h \
@@ -179,7 +179,7 @@ mediaplayerstate.o: mediaplayerstate.cpp \
 videowidget.o: videowidget.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                videowidget.h \
                mediaplayerplugininterface.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                mediaplayerstate.h
@@ -187,3 +187,3 @@ videowidget.o: videowidget.cpp \
 audiowidget.o: audiowidget.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                audiowidget.h \
@@ -192,9 +192,9 @@ audiowidget.o: audiowidget.cpp \
 playlistwidget.o: playlistwidget.cpp \
-                $(QPEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
-                $(QPEDIR)/include/qpe/qpetoolbar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
-                $(QPEDIR)/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/global.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
                playlistselection.h \
@@ -204,8 +204,8 @@ playlistwidget.o: playlistwidget.cpp \
 mediaplayer.o: mediaplayer.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
                mediaplayer.h \
@@ -213,3 +213,3 @@ mediaplayer.o: mediaplayer.cpp \
                playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
                audiowidget.h \
@@ -220,6 +220,6 @@ mediaplayer.o: mediaplayer.cpp \
 audiodevice.o: audiodevice.cpp \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
                audiodevice.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
@@ -230,3 +230,3 @@ moc_playlistselection.o: moc_playlistselection.cpp \
                playlistselection.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/applnk.h
@@ -243,3 +243,3 @@ moc_playlistwidget.o: moc_playlistwidget.cpp \
                playlistwidget.h \
-                $(QPEDIR)/include/qpe/applnk.h
+                $(OPIEDIR)/include/qpe/applnk.h
@@ -247,5 +247,5 @@ moc_mediaplayer.o: moc_mediaplayer.cpp \
                mediaplayer.h \
-                $(QPEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/qlibrary.h \
-                $(QPEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                $(QPEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
                mediaplayerplugininterface.h
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index d144f0b..bf97fbf 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -10,4 +10,4 @@ TARGET		=   flashplugin
        DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 9e17769..19ded26 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -5,6 +5,6 @@
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include -I..
+        INCPATH =-I$(OPIEDIR)/include -I..
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index e3f75b7..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -8,4 +8,4 @@ TARGET		=   madplugin
        DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lm
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -5,6 +5,6 @@
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include -I..
+        INCPATH =-I$(OPIEDIR)/include -I..
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index e2c35d3..b1426d1 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -38,4 +38,4 @@ TARGET		=   mpeg3plugin
        DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index d6952f8..3b8d4b0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
        CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
@@ -9,4 +9,4 @@ SOURCES		= main.cpp \
        TARGET  = mpegplayer
-        INCLUDEPATH+= $(QPEDIR)/include
+        INCLUDEPATH+= $(OPIEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread
@@ -14,3 +14,3 @@ LIBS            += -lqpe -lpthread
        # INTERFACES= 
-# INCLUDEPATH += $(QPEDIR)/include
+# INCLUDEPATH += $(OPIEDIR)/include
 # CONFIG+=static
@@ -18,3 +18,3 @@ LIBS            += -lqpe -lpthread
        # LIBS  += libmpeg3/libmpeg3.a -lpthread
-        # LIBS  += $(QPEDIR)/plugins/codecs/liblibmadplugin.so
+        # LIBS  += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index c9203f8..e9fec6c 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -5,6 +5,6 @@
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
-        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
-        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
+        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include -I..
+        INCPATH =-I$(OPIEDIR)/include -I..
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 4663813..2160431 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -6,4 +6,4 @@ TARGET		=   wavplugin
        DESTDIR         =   ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ../$(QPEDIR)/include ..
+DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe

diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in index 5fca66e..6e007ec 100644 --- a/core/multimedia/opieplayer/Makefile.in +++ b/core/multimedia/opieplayer/Makefile.in
@@ -5,6 +5,6 @@
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"	8	CFLAGS =$(SYSCONF_CFLAGS)
9	INCPATH =-I$(QPEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC = $(SYSCONF_UIC)
16		16
17	DESTDIR = $(QPEDIR)/bin/	17	DESTDIR = $(OPIEDIR)/bin/
18	VER_MAJ = 1	18	VER_MAJ = 1
@@ -137,6 +137,6 @@ REQUIRES=
137	main.o: main.cpp \	137	main.o: main.cpp \
138	$(QPEDIR)/include/qpe/qpeapplication.h \	138	$(OPIEDIR)/include/qpe/qpeapplication.h \
139	mediaplayerstate.h \	139	mediaplayerstate.h \
140	playlistwidget.h \	140	playlistwidget.h \
141	$(QPEDIR)/include/qpe/applnk.h \	141	$(OPIEDIR)/include/qpe/applnk.h \
142	audiowidget.h \	142	audiowidget.h \
@@ -145,5 +145,5 @@ main.o: main.cpp \
145	mediaplayer.h \	145	mediaplayer.h \
146	$(QPEDIR)/include/qpe/qlibrary.h \	146	$(OPIEDIR)/include/qpe/qlibrary.h \
147	$(QPEDIR)/include/qpe/qcom.h \	147	$(OPIEDIR)/include/qpe/qcom.h \
148	$(QPEDIR)/include/qpe/quuid.h \	148	$(OPIEDIR)/include/qpe/quuid.h \
149	mediaplayerplugininterface.h	149	mediaplayerplugininterface.h
@@ -151,4 +151,4 @@ main.o: main.cpp \
151	loopcontrol.o: loopcontrol.cpp \	151	loopcontrol.o: loopcontrol.cpp \
152	$(QPEDIR)/include/qpe/qpeapplication.h \	152	$(OPIEDIR)/include/qpe/qpeapplication.h \
153	$(QPEDIR)/include/qpe/qcopenvelope_qws.h \	153	$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
154	loopcontrol.h \	154	loopcontrol.h \
@@ -157,4 +157,4 @@ loopcontrol.o: loopcontrol.cpp \
157	mediaplayerplugininterface.h \	157	mediaplayerplugininterface.h \
158	$(QPEDIR)/include/qpe/qcom.h \	158	$(OPIEDIR)/include/qpe/qcom.h \
159	$(QPEDIR)/include/qpe/quuid.h \	159	$(OPIEDIR)/include/qpe/quuid.h \
160	mediaplayerstate.h	160	mediaplayerstate.h
@@ -162,4 +162,4 @@ loopcontrol.o: loopcontrol.cpp \
162	playlistselection.o: playlistselection.cpp \	162	playlistselection.o: playlistselection.cpp \
163	$(QPEDIR)/include/qpe/applnk.h \	163	$(OPIEDIR)/include/qpe/applnk.h \
164	$(QPEDIR)/include/qpe/resource.h \	164	$(OPIEDIR)/include/qpe/resource.h \
165	playlistselection.h	165	playlistselection.h
@@ -167,7 +167,7 @@ playlistselection.o: playlistselection.cpp \
167	mediaplayerstate.o: mediaplayerstate.cpp \	167	mediaplayerstate.o: mediaplayerstate.cpp \
168	$(QPEDIR)/include/qpe/qpeapplication.h \	168	$(OPIEDIR)/include/qpe/qpeapplication.h \
169	$(QPEDIR)/include/qpe/qlibrary.h \	169	$(OPIEDIR)/include/qpe/qlibrary.h \
170	$(QPEDIR)/include/qpe/qcom.h \	170	$(OPIEDIR)/include/qpe/qcom.h \
171	$(QPEDIR)/include/qpe/quuid.h \	171	$(OPIEDIR)/include/qpe/quuid.h \
172	$(QPEDIR)/include/qpe/config.h \	172	$(OPIEDIR)/include/qpe/config.h \
173	mediaplayerplugininterface.h \	173	mediaplayerplugininterface.h \
@@ -179,7 +179,7 @@ mediaplayerstate.o: mediaplayerstate.cpp \
179	videowidget.o: videowidget.cpp \	179	videowidget.o: videowidget.cpp \
180	$(QPEDIR)/include/qpe/resource.h \	180	$(OPIEDIR)/include/qpe/resource.h \
181	videowidget.h \	181	videowidget.h \
182	mediaplayerplugininterface.h \	182	mediaplayerplugininterface.h \
183	$(QPEDIR)/include/qpe/qcom.h \	183	$(OPIEDIR)/include/qpe/qcom.h \
184	$(QPEDIR)/include/qpe/quuid.h \	184	$(OPIEDIR)/include/qpe/quuid.h \
185	mediaplayerstate.h	185	mediaplayerstate.h
@@ -187,3 +187,3 @@ videowidget.o: videowidget.cpp \
187	audiowidget.o: audiowidget.cpp \	187	audiowidget.o: audiowidget.cpp \
188	$(QPEDIR)/include/qpe/resource.h \	188	$(OPIEDIR)/include/qpe/resource.h \
189	audiowidget.h \	189	audiowidget.h \
@@ -192,9 +192,9 @@ audiowidget.o: audiowidget.cpp \
192	playlistwidget.o: playlistwidget.cpp \	192	playlistwidget.o: playlistwidget.cpp \
193	$(QPEDIR)/include/qpe/qpemenubar.h \	193	$(OPIEDIR)/include/qpe/qpemenubar.h \
194	$(QPEDIR)/include/qpe/qpetoolbar.h \	194	$(OPIEDIR)/include/qpe/qpetoolbar.h \
195	$(QPEDIR)/include/qpe/fileselector.h \	195	$(OPIEDIR)/include/qpe/fileselector.h \
196	$(QPEDIR)/include/qpe/applnk.h \	196	$(OPIEDIR)/include/qpe/applnk.h \
197	$(QPEDIR)/include/qpe/config.h \	197	$(OPIEDIR)/include/qpe/config.h \
198	$(QPEDIR)/include/qpe/global.h \	198	$(OPIEDIR)/include/qpe/global.h \
199	$(QPEDIR)/include/qpe/resource.h \	199	$(OPIEDIR)/include/qpe/resource.h \
200	playlistselection.h \	200	playlistselection.h \
@@ -204,8 +204,8 @@ playlistwidget.o: playlistwidget.cpp \
204	mediaplayer.o: mediaplayer.cpp \	204	mediaplayer.o: mediaplayer.cpp \
205	$(QPEDIR)/include/qpe/qpeapplication.h \	205	$(OPIEDIR)/include/qpe/qpeapplication.h \
206	$(QPEDIR)/include/qpe/qlibrary.h \	206	$(OPIEDIR)/include/qpe/qlibrary.h \
207	$(QPEDIR)/include/qpe/qcom.h \	207	$(OPIEDIR)/include/qpe/qcom.h \
208	$(QPEDIR)/include/qpe/quuid.h \	208	$(OPIEDIR)/include/qpe/quuid.h \
209	$(QPEDIR)/include/qpe/resource.h \	209	$(OPIEDIR)/include/qpe/resource.h \
210	$(QPEDIR)/include/qpe/config.h \	210	$(OPIEDIR)/include/qpe/config.h \
211	mediaplayer.h \	211	mediaplayer.h \
@@ -213,3 +213,3 @@ mediaplayer.o: mediaplayer.cpp \
213	playlistwidget.h \	213	playlistwidget.h \
214	$(QPEDIR)/include/qpe/applnk.h \	214	$(OPIEDIR)/include/qpe/applnk.h \
215	audiowidget.h \	215	audiowidget.h \
@@ -220,6 +220,6 @@ mediaplayer.o: mediaplayer.cpp \
220	audiodevice.o: audiodevice.cpp \	220	audiodevice.o: audiodevice.cpp \
221	$(QPEDIR)/include/qpe/qpeapplication.h \	221	$(OPIEDIR)/include/qpe/qpeapplication.h \
222	$(QPEDIR)/include/qpe/config.h \	222	$(OPIEDIR)/include/qpe/config.h \
223	audiodevice.h \	223	audiodevice.h \
224	$(QPEDIR)/include/qpe/qcopenvelope_qws.h	224	$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
225		225
@@ -230,3 +230,3 @@ moc_playlistselection.o: moc_playlistselection.cpp \
230	playlistselection.h \	230	playlistselection.h \
231	$(QPEDIR)/include/qpe/applnk.h	231	$(OPIEDIR)/include/qpe/applnk.h
232		232
@@ -243,3 +243,3 @@ moc_playlistwidget.o: moc_playlistwidget.cpp \
243	playlistwidget.h \	243	playlistwidget.h \
244	$(QPEDIR)/include/qpe/applnk.h	244	$(OPIEDIR)/include/qpe/applnk.h
245		245
@@ -247,5 +247,5 @@ moc_mediaplayer.o: moc_mediaplayer.cpp \
247	mediaplayer.h \	247	mediaplayer.h \
248	$(QPEDIR)/include/qpe/qlibrary.h \	248	$(OPIEDIR)/include/qpe/qlibrary.h \
249	$(QPEDIR)/include/qpe/qcom.h \	249	$(OPIEDIR)/include/qpe/qcom.h \
250	$(QPEDIR)/include/qpe/quuid.h \	250	$(OPIEDIR)/include/qpe/quuid.h \
251	mediaplayerplugininterface.h	251	mediaplayerplugininterface.h


diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro index d144f0b..bf97fbf 100644 --- a/core/multimedia/opieplayer/libflash/libflash.pro +++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -10,4 +10,4 @@ TARGET = flashplugin
10	DESTDIR = ../../plugins/codecs	10	DESTDIR = ../../plugins/codecs
11	INCLUDEPATH += $(QPEDIR)/include ..	11	INCLUDEPATH += $(OPIEDIR)/include ..
12	DEPENDPATH += ../$(QPEDIR)/include ..	12	DEPENDPATH += ../$(OPIEDIR)/include ..
13	LIBS += -lqpe	13	LIBS += -lqpe


diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 9e17769..19ded26 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -5,6 +5,6 @@
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include -I..	9	INCPATH =-I$(OPIEDIR)/include -I..
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)


diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index e3f75b7..6c40a15 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -8,4 +8,4 @@ TARGET = madplugin
8	DESTDIR = ../../plugins/codecs	8	DESTDIR = ../../plugins/codecs
9	INCLUDEPATH += $(QPEDIR)/include ..	9	INCLUDEPATH += $(OPIEDIR)/include ..
10	DEPENDPATH += ../$(QPEDIR)/include ..	10	DEPENDPATH += ../$(OPIEDIR)/include ..
11	LIBS += -lqpe -lm	11	LIBS += -lqpe -lm


diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 1817902..9881815 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -5,6 +5,6 @@
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include -I..	9	INCPATH =-I$(OPIEDIR)/include -I..
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)


diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index e2c35d3..b1426d1 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -38,4 +38,4 @@ TARGET = mpeg3plugin
38	DESTDIR = ../../plugins/codecs	38	DESTDIR = ../../plugins/codecs
39	INCLUDEPATH += $(QPEDIR)/include ..	39	INCLUDEPATH += $(OPIEDIR)/include ..
40	DEPENDPATH += ../$(QPEDIR)/include ..	40	DEPENDPATH += ../$(OPIEDIR)/include ..
41	LIBS += -lqpe -lpthread -lm	41	LIBS += -lqpe -lpthread -lm


diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro index d6952f8..3b8d4b0 100644 --- a/core/multimedia/opieplayer/mpegplayer.pro +++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -2,3 +2,3 @@ TEMPLATE = app
2	CONFIG = qt warn_on release	2	CONFIG = qt warn_on release
3	DESTDIR = $(QPEDIR)/bin	3	DESTDIR = $(OPIEDIR)/bin
4	HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \	4	HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
@@ -9,4 +9,4 @@ SOURCES = main.cpp \
9	TARGET = mpegplayer	9	TARGET = mpegplayer
10	INCLUDEPATH+= $(QPEDIR)/include	10	INCLUDEPATH+= $(OPIEDIR)/include
11	DEPENDPATH+= $(QPEDIR)/include	11	DEPENDPATH+= $(OPIEDIR)/include
12	LIBS += -lqpe -lpthread	12	LIBS += -lqpe -lpthread
@@ -14,3 +14,3 @@ LIBS += -lqpe -lpthread
14	# INTERFACES=	14	# INTERFACES=
15	# INCLUDEPATH += $(QPEDIR)/include	15	# INCLUDEPATH += $(OPIEDIR)/include
16	# CONFIG+=static	16	# CONFIG+=static
@@ -18,3 +18,3 @@ LIBS += -lqpe -lpthread
18	# LIBS += libmpeg3/libmpeg3.a -lpthread	18	# LIBS += libmpeg3/libmpeg3.a -lpthread
19	# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so	19	# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
20		20


diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index c9203f8..e9fec6c 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -5,6 +5,6 @@
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"	8	CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9	INCPATH =-I$(QPEDIR)/include -I..	9	INCPATH =-I$(OPIEDIR)/include -I..
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)


diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro index 4663813..2160431 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -6,4 +6,4 @@ TARGET = wavplugin
6	DESTDIR = ../../plugins/codecs	6	DESTDIR = ../../plugins/codecs
7	INCLUDEPATH += $(QPEDIR)/include ..	7	INCLUDEPATH += $(OPIEDIR)/include ..
8	DEPENDPATH += ../$(QPEDIR)/include ..	8	DEPENDPATH += ../$(OPIEDIR)/include ..
9	LIBS += -lqpe	9	LIBS += -lqpe