-rw-r--r-- | core/multimedia/opieplayer/Makefile.in | 64 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/Makefile.in | 9 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 11 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/Makefile.in | 13 |
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 @@ -55,226 +55,180 @@ UICDECLS = UICIMPLS = SRCMOC = moc_loopcontrol.cpp \ moc_playlistselection.cpp \ moc_mediaplayerstate.cpp \ moc_videowidget.cpp \ moc_audiowidget.cpp \ moc_playlistwidget.cpp \ moc_mediaplayer.cpp \ moc_audiodevice.cpp OBJMOC = moc_loopcontrol.o \ moc_playlistselection.o \ moc_mediaplayerstate.o \ moc_videowidget.o \ moc_audiowidget.o \ moc_playlistwidget.o \ moc_mediaplayer.o \ moc_audiodevice.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 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) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### 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 moc_videowidget.o: moc_videowidget.cpp \ videowidget.h 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 moc_loopcontrol.cpp: loopcontrol.h $(MOC) loopcontrol.h -o moc_loopcontrol.cpp moc_playlistselection.cpp: playlistselection.h $(MOC) playlistselection.h -o moc_playlistselection.cpp moc_mediaplayerstate.cpp: mediaplayerstate.h $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp moc_videowidget.cpp: videowidget.h $(MOC) videowidget.h -o moc_videowidget.cpp moc_audiowidget.cpp: audiowidget.h $(MOC) audiowidget.h -o moc_audiowidget.cpp moc_playlistwidget.cpp: playlistwidget.h $(MOC) playlistwidget.h -o moc_playlistwidget.cpp moc_mediaplayer.cpp: mediaplayer.h $(MOC) mediaplayer.h -o moc_mediaplayer.cpp moc_audiodevice.cpp: audiodevice.h $(MOC) audiodevice.h -o moc_audiodevice.cpp 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 @@ -1,57 +1,57 @@ ############################################################################# ####### Compiler, tools and options 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) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/codecs/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = flashplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = libflashplugin.h \ libflashpluginimpl.h SOURCES = libflashplugin.cpp \ libflashpluginimpl.cpp \ adpcm.cc \ character.cc \ flash.cc \ graphic16.cc \ matrix.cc \ script.cc \ sprite.cc \ bitmap.cc \ cxform.cc \ font.cc \ graphic24.cc \ movie.cc \ shape.cc \ sqrt.cc \ button.cc \ displaylist.cc \ graphic.cc \ graphic32.cc \ program.cc \ sound.cc \ text.cc OBJECTS = libflashplugin.o \ libflashpluginimpl.o \ adpcm.o \ character.o \ flash.o \ graphic16.o \ matrix.o \ @@ -100,105 +100,102 @@ OBJMOC = ####### Build rules all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: Makefile.in Makefile.in: libflash.pro tmake libflash.pro -o Makefile.in clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile 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 \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h character.o: character.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.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 @@ -55,98 +55,100 @@ OBJECTS = version.o \ fixed.o \ bit.o \ timer.o \ stream.o \ frame.o \ synth.o \ decoder.o \ layer12.o \ layer3.o \ huffman.o \ libmadplugin.o \ libmadpluginimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) 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) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile version.o: version.c \ libmad_global.h \ libmad_version.h fixed.o: fixed.c \ libmad_global.h \ fixed.h bit.o: bit.c \ libmad_global.h \ bit.h timer.o: timer.c \ libmad_global.h \ timer.h @@ -169,58 +171,55 @@ synth.o: synth.c \ libmad_global.h \ fixed.h \ frame.h \ timer.h \ stream.h \ bit.h \ synth.h \ D.dat decoder.o: decoder.c \ libmad_global.h \ stream.h \ bit.h \ frame.h \ fixed.h \ timer.h \ synth.h \ decoder.h layer12.o: layer12.c \ libmad_global.h \ fixed.h \ bit.h \ stream.h \ frame.h \ timer.h \ layer12.h \ sf_table.dat \ qc_table.dat layer3.o: layer3.c \ libmad_global.h \ fixed.h \ bit.h \ stream.h \ frame.h \ timer.h \ huffman.h \ layer3.h \ rq_table.dat \ imdct_s.dat huffman.o: huffman.c \ libmad_global.h \ huffman.h 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 @@ -84,163 +84,162 @@ OBJECTS = libmpeg3plugin.o \ video/getpicture.o \ video/headers.o \ video/idct.o \ video/macroblocks.o \ video/mmxtest.o \ video/motion.o \ video/mpeg3video.o \ video/output.o \ video/reconstruct.o \ video/seek.o \ video/slice.o \ video/vlc.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) 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) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile libmpeg3plugin.o: libmpeg3plugin.cpp \ libmpeg3plugin.h \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ - mpeg3protos.h \ - ../mediaplayerplugininterface.h + mpeg3protos.h libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ libmpeg3plugin.h \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h \ - ../mediaplayerplugininterface.h \ - libmpeg3pluginimpl.h \ - ../mediaplayerplugininterface.h + libmpeg3pluginimpl.h bitstream.o: bitstream.c \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h libmpeg3.o: libmpeg3.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3atrack.o: mpeg3atrack.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3css.o: mpeg3css.c \ mpeg3css.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.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 @@ -20,93 +20,92 @@ VER_MIN = 0 VER_PATCH = 0 TARGET = wavplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = wavplugin.h \ wavpluginimpl.h SOURCES = wavplugin.cpp \ wavpluginimpl.cpp OBJECTS = wavplugin.o \ wavpluginimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cc.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) 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) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### 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 |