*** empty log message ***

5 files changed, 29 insertions, 81 deletions

diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake mpegplayer.pro
+tmake: Makefile.in
+
+Makefile.in: mpegplayer.pro
+	tmake mpegplayer.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -135,100 +137,57 @@ REQUIRES=
 ####### Compile
 
 main.o: main.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		mediaplayerstate.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		videowidget.h \
 		loopcontrol.h \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 loopcontrol.o: loopcontrol.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		loopcontrol.h \
 		videowidget.h \
 		audiodevice.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 playlistselection.o: playlistselection.cpp \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h
 
 mediaplayerstate.o: mediaplayerstate.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		mediaplayerplugininterface.h \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		videowidget.h \
-		mediaplayerplugininterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 audiowidget.o: audiowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
 		audiowidget.h \
 		mediaplayerstate.h
 
 playlistwidget.o: playlistwidget.cpp \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/fileselector.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h \
 		playlistwidget.h \
 		mediaplayerstate.h
 
 mediaplayer.o: mediaplayer.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayer.h \
-		mediaplayerplugininterface.h \
 		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
 		audiodevice.h \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		audiodevice.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+		audiodevice.h
 
 moc_loopcontrol.o: moc_loopcontrol.cpp \
 		loopcontrol.h
 
 moc_playlistselection.o: moc_playlistselection.cpp \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistselection.h
 
 moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
 		mediaplayerstate.h
@@ -240,15 +199,10 @@ moc_audiowidget.o: moc_audiowidget.cpp \
 		audiowidget.h
 
 moc_playlistwidget.o: moc_playlistwidget.cpp \
-		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h
+		playlistwidget.h
 
 moc_mediaplayer.o: moc_mediaplayer.cpp \
-		mediaplayer.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		mediaplayerplugininterface.h
+		mediaplayer.h
 
 moc_audiodevice.o: moc_audiodevice.cpp \
 		audiodevice.h
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -6,7 +6,7 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include -I..
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
@@ -145,15 +145,12 @@ REQUIRES=
 
 libflashplugin.o: libflashplugin.cpp \
 		libflashplugin.h \
-		flash.h \
-		../mediaplayerplugininterface.h
+		flash.h
 
 libflashpluginimpl.o: libflashpluginimpl.cpp \
 		libflashplugin.h \
 		flash.h \
-		../mediaplayerplugininterface.h \
-		libflashpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libflashpluginimpl.h
 
 adpcm.o: adpcm.cc \
 		swf.h \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -100,8 +100,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmad.pro
+tmake: Makefile.in
+
+Makefile.in: libmad.pro
+	tmake libmad.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -214,13 +216,10 @@ huffman.o: huffman.c \
 
 libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
 		mad.h
 
 libmadpluginimpl.o: libmadpluginimpl.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
-		libmadpluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmadpluginimpl.h
 
 
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -129,8 +129,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake libmpeg3.pro
+tmake: Makefile.in
+
+Makefile.in: libmpeg3.pro
+	tmake libmpeg3.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -176,8 +178,7 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
-		mpeg3protos.h \
-		../mediaplayerplugininterface.h
+		mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
@@ -193,9 +194,7 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
-		../mediaplayerplugininterface.h \
-		libmpeg3pluginimpl.h \
-		../mediaplayerplugininterface.h
+		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
 		mpeg3private.h \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake wavplugin.pro
+tmake: Makefile.in
+
+Makefile.in: wavplugin.pro
+	tmake wavplugin.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -100,13 +102,10 @@ REQUIRES=
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
-		wavplugin.h \
-		../mediaplayerplugininterface.h
+		wavplugin.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
-		../mediaplayerplugininterface.h \
-		wavpluginimpl.h \
-		../mediaplayerplugininterface.h
+		wavpluginimpl.h