-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 | |||
@@ -99,10 +99,12 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
99 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 99 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
100 | 100 | ||
101 | moc: $(SRCMOC) | 101 | moc: $(SRCMOC) |
102 | 102 | ||
103 | tmake: | 103 | tmake: Makefile.in |
104 | tmake mpegplayer.pro | 104 | |
105 | Makefile.in: mpegplayer.pro | ||
106 | tmake mpegplayer.pro -o Makefile.in | ||
105 | 107 | ||
106 | clean: | 108 | clean: |
107 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 109 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
108 | -rm -f *~ core | 110 | -rm -f *~ core |
@@ -134,102 +136,59 @@ REQUIRES= | |||
134 | 136 | ||
135 | ####### Compile | 137 | ####### Compile |
136 | 138 | ||
137 | main.o: main.cpp \ | 139 | main.o: main.cpp \ |
138 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | ||
139 | mediaplayerstate.h \ | 140 | mediaplayerstate.h \ |
140 | playlistwidget.h \ | 141 | playlistwidget.h \ |
141 | $(OPIEDIR)/include/qpe/applnk.h \ | ||
142 | audiowidget.h \ | 142 | audiowidget.h \ |
143 | videowidget.h \ | 143 | videowidget.h \ |
144 | loopcontrol.h \ | 144 | loopcontrol.h \ |
145 | mediaplayer.h \ | 145 | mediaplayer.h |
146 | $(OPIEDIR)/include/qpe/qlibrary.h \ | ||
147 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
148 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
149 | mediaplayerplugininterface.h | ||
150 | 146 | ||
151 | loopcontrol.o: loopcontrol.cpp \ | 147 | loopcontrol.o: loopcontrol.cpp \ |
152 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | ||
153 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ | ||
154 | loopcontrol.h \ | 148 | loopcontrol.h \ |
155 | videowidget.h \ | 149 | videowidget.h \ |
156 | audiodevice.h \ | 150 | audiodevice.h \ |
157 | mediaplayerplugininterface.h \ | ||
158 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
159 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
160 | mediaplayerstate.h | 151 | mediaplayerstate.h |
161 | 152 | ||
162 | playlistselection.o: playlistselection.cpp \ | 153 | playlistselection.o: playlistselection.cpp \ |
163 | $(OPIEDIR)/include/qpe/applnk.h \ | ||
164 | $(OPIEDIR)/include/qpe/resource.h \ | ||
165 | playlistselection.h | 154 | playlistselection.h |
166 | 155 | ||
167 | mediaplayerstate.o: mediaplayerstate.cpp \ | 156 | mediaplayerstate.o: mediaplayerstate.cpp \ |
168 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | ||
169 | $(OPIEDIR)/include/qpe/qlibrary.h \ | ||
170 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
171 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
172 | $(OPIEDIR)/include/qpe/config.h \ | ||
173 | mediaplayerplugininterface.h \ | ||
174 | mediaplayerstate.h \ | 157 | mediaplayerstate.h \ |
175 | libmad/libmadpluginimpl.h \ | 158 | libmad/libmadpluginimpl.h \ |
176 | libmpeg3/libmpeg3pluginimpl.h \ | 159 | libmpeg3/libmpeg3pluginimpl.h \ |
177 | wavplugin/wavpluginimpl.h | 160 | wavplugin/wavpluginimpl.h |
178 | 161 | ||
179 | videowidget.o: videowidget.cpp \ | 162 | videowidget.o: videowidget.cpp \ |
180 | $(OPIEDIR)/include/qpe/resource.h \ | ||
181 | videowidget.h \ | 163 | videowidget.h \ |
182 | mediaplayerplugininterface.h \ | ||
183 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
184 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
185 | mediaplayerstate.h | 164 | mediaplayerstate.h |
186 | 165 | ||
187 | audiowidget.o: audiowidget.cpp \ | 166 | audiowidget.o: audiowidget.cpp \ |
188 | $(OPIEDIR)/include/qpe/resource.h \ | ||
189 | audiowidget.h \ | 167 | audiowidget.h \ |
190 | mediaplayerstate.h | 168 | mediaplayerstate.h |
191 | 169 | ||
192 | playlistwidget.o: playlistwidget.cpp \ | 170 | playlistwidget.o: playlistwidget.cpp \ |
193 | $(OPIEDIR)/include/qpe/qpemenubar.h \ | ||
194 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | ||
195 | $(OPIEDIR)/include/qpe/fileselector.h \ | ||
196 | $(OPIEDIR)/include/qpe/applnk.h \ | ||
197 | $(OPIEDIR)/include/qpe/config.h \ | ||
198 | $(OPIEDIR)/include/qpe/global.h \ | ||
199 | $(OPIEDIR)/include/qpe/resource.h \ | ||
200 | playlistselection.h \ | 171 | playlistselection.h \ |
201 | playlistwidget.h \ | 172 | playlistwidget.h \ |
202 | mediaplayerstate.h | 173 | mediaplayerstate.h |
203 | 174 | ||
204 | mediaplayer.o: mediaplayer.cpp \ | 175 | mediaplayer.o: mediaplayer.cpp \ |
205 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | ||
206 | $(OPIEDIR)/include/qpe/qlibrary.h \ | ||
207 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
208 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
209 | $(OPIEDIR)/include/qpe/resource.h \ | ||
210 | $(OPIEDIR)/include/qpe/config.h \ | ||
211 | mediaplayer.h \ | 176 | mediaplayer.h \ |
212 | mediaplayerplugininterface.h \ | ||
213 | playlistwidget.h \ | 177 | playlistwidget.h \ |
214 | $(OPIEDIR)/include/qpe/applnk.h \ | ||
215 | audiowidget.h \ | 178 | audiowidget.h \ |
216 | loopcontrol.h \ | 179 | loopcontrol.h \ |
217 | audiodevice.h \ | 180 | audiodevice.h \ |
218 | mediaplayerstate.h | 181 | mediaplayerstate.h |
219 | 182 | ||
220 | audiodevice.o: audiodevice.cpp \ | 183 | audiodevice.o: audiodevice.cpp \ |
221 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 184 | audiodevice.h |
222 | $(OPIEDIR)/include/qpe/config.h \ | ||
223 | audiodevice.h \ | ||
224 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h | ||
225 | 185 | ||
226 | moc_loopcontrol.o: moc_loopcontrol.cpp \ | 186 | moc_loopcontrol.o: moc_loopcontrol.cpp \ |
227 | loopcontrol.h | 187 | loopcontrol.h |
228 | 188 | ||
229 | moc_playlistselection.o: moc_playlistselection.cpp \ | 189 | moc_playlistselection.o: moc_playlistselection.cpp \ |
230 | playlistselection.h \ | 190 | playlistselection.h |
231 | $(OPIEDIR)/include/qpe/applnk.h | ||
232 | 191 | ||
233 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ | 192 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ |
234 | mediaplayerstate.h | 193 | mediaplayerstate.h |
235 | 194 | ||
@@ -239,17 +198,12 @@ moc_videowidget.o: moc_videowidget.cpp \ | |||
239 | moc_audiowidget.o: moc_audiowidget.cpp \ | 198 | moc_audiowidget.o: moc_audiowidget.cpp \ |
240 | audiowidget.h | 199 | audiowidget.h |
241 | 200 | ||
242 | moc_playlistwidget.o: moc_playlistwidget.cpp \ | 201 | moc_playlistwidget.o: moc_playlistwidget.cpp \ |
243 | playlistwidget.h \ | 202 | playlistwidget.h |
244 | $(OPIEDIR)/include/qpe/applnk.h | ||
245 | 203 | ||
246 | moc_mediaplayer.o: moc_mediaplayer.cpp \ | 204 | moc_mediaplayer.o: moc_mediaplayer.cpp \ |
247 | mediaplayer.h \ | 205 | mediaplayer.h |
248 | $(OPIEDIR)/include/qpe/qlibrary.h \ | ||
249 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
250 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
251 | mediaplayerplugininterface.h | ||
252 | 206 | ||
253 | moc_audiodevice.o: moc_audiodevice.cpp \ | 207 | moc_audiodevice.o: moc_audiodevice.cpp \ |
254 | audiodevice.h | 208 | audiodevice.h |
255 | 209 | ||
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 | |||
@@ -5,9 +5,9 @@ | |||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) | 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) | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include | 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) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
@@ -144,17 +144,14 @@ REQUIRES= | |||
144 | ####### Compile | 144 | ####### Compile |
145 | 145 | ||
146 | libflashplugin.o: libflashplugin.cpp \ | 146 | libflashplugin.o: libflashplugin.cpp \ |
147 | libflashplugin.h \ | 147 | libflashplugin.h \ |
148 | flash.h \ | 148 | flash.h |
149 | ../mediaplayerplugininterface.h | ||
150 | 149 | ||
151 | libflashpluginimpl.o: libflashpluginimpl.cpp \ | 150 | libflashpluginimpl.o: libflashpluginimpl.cpp \ |
152 | libflashplugin.h \ | 151 | libflashplugin.h \ |
153 | flash.h \ | 152 | flash.h \ |
154 | ../mediaplayerplugininterface.h \ | 153 | libflashpluginimpl.h |
155 | libflashpluginimpl.h \ | ||
156 | ../mediaplayerplugininterface.h | ||
157 | 154 | ||
158 | adpcm.o: adpcm.cc \ | 155 | adpcm.o: adpcm.cc \ |
159 | swf.h \ | 156 | swf.h \ |
160 | flash.h \ | 157 | flash.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 | |||
@@ -99,10 +99,12 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
99 | $(SYSCONF_LINK_LIB) | 99 | $(SYSCONF_LINK_LIB) |
100 | 100 | ||
101 | moc: $(SRCMOC) | 101 | moc: $(SRCMOC) |
102 | 102 | ||
103 | tmake: | 103 | tmake: Makefile.in |
104 | tmake libmad.pro | 104 | |
105 | Makefile.in: libmad.pro | ||
106 | tmake libmad.pro -o Makefile.in | ||
105 | 107 | ||
106 | clean: | 108 | clean: |
107 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 109 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
108 | -rm -f *~ core | 110 | -rm -f *~ core |
@@ -213,14 +215,11 @@ huffman.o: huffman.c \ | |||
213 | huffman.h | 215 | huffman.h |
214 | 216 | ||
215 | libmadplugin.o: libmadplugin.cpp \ | 217 | libmadplugin.o: libmadplugin.cpp \ |
216 | libmadplugin.h \ | 218 | libmadplugin.h \ |
217 | ../mediaplayerplugininterface.h \ | ||
218 | mad.h | 219 | mad.h |
219 | 220 | ||
220 | libmadpluginimpl.o: libmadpluginimpl.cpp \ | 221 | libmadpluginimpl.o: libmadpluginimpl.cpp \ |
221 | libmadplugin.h \ | 222 | libmadplugin.h \ |
222 | ../mediaplayerplugininterface.h \ | 223 | libmadpluginimpl.h |
223 | libmadpluginimpl.h \ | ||
224 | ../mediaplayerplugininterface.h | ||
225 | 224 | ||
226 | 225 | ||
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 | |||
@@ -128,10 +128,12 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
128 | $(SYSCONF_LINK_LIB) | 128 | $(SYSCONF_LINK_LIB) |
129 | 129 | ||
130 | moc: $(SRCMOC) | 130 | moc: $(SRCMOC) |
131 | 131 | ||
132 | tmake: | 132 | tmake: Makefile.in |
133 | tmake libmpeg3.pro | 133 | |
134 | Makefile.in: libmpeg3.pro | ||
135 | tmake libmpeg3.pro -o Makefile.in | ||
134 | 136 | ||
135 | clean: | 137 | clean: |
136 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 138 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
137 | -rm -f *~ core | 139 | -rm -f *~ core |
@@ -175,10 +177,9 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
175 | mpeg3private.inc \ | 177 | mpeg3private.inc \ |
176 | audio/mpeg3audio.h \ | 178 | audio/mpeg3audio.h \ |
177 | mpeg3vtrack.h \ | 179 | mpeg3vtrack.h \ |
178 | video/mpeg3video.h \ | 180 | video/mpeg3video.h \ |
179 | mpeg3protos.h \ | 181 | mpeg3protos.h |
180 | ../mediaplayerplugininterface.h | ||
181 | 182 | ||
182 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | 183 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ |
183 | libmpeg3plugin.h \ | 184 | libmpeg3plugin.h \ |
184 | libmpeg3.h \ | 185 | libmpeg3.h \ |
@@ -192,11 +193,9 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | |||
192 | audio/mpeg3audio.h \ | 193 | audio/mpeg3audio.h \ |
193 | mpeg3vtrack.h \ | 194 | mpeg3vtrack.h \ |
194 | video/mpeg3video.h \ | 195 | video/mpeg3video.h \ |
195 | mpeg3protos.h \ | 196 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | 197 | libmpeg3pluginimpl.h |
197 | libmpeg3pluginimpl.h \ | ||
198 | ../mediaplayerplugininterface.h | ||
199 | 198 | ||
200 | bitstream.o: bitstream.c \ | 199 | bitstream.o: bitstream.c \ |
201 | mpeg3private.h \ | 200 | mpeg3private.h \ |
202 | mpeg3atrack.h \ | 201 | mpeg3atrack.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 | |||
@@ -64,10 +64,12 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
64 | $(SYSCONF_LINK_LIB) | 64 | $(SYSCONF_LINK_LIB) |
65 | 65 | ||
66 | moc: $(SRCMOC) | 66 | moc: $(SRCMOC) |
67 | 67 | ||
68 | tmake: | 68 | tmake: Makefile.in |
69 | tmake wavplugin.pro | 69 | |
70 | Makefile.in: wavplugin.pro | ||
71 | tmake wavplugin.pro -o Makefile.in | ||
70 | 72 | ||
71 | clean: | 73 | clean: |
72 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 74 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
73 | -rm -f *~ core | 75 | -rm -f *~ core |
@@ -99,14 +101,11 @@ REQUIRES= | |||
99 | 101 | ||
100 | ####### Compile | 102 | ####### Compile |
101 | 103 | ||
102 | wavplugin.o: wavplugin.cpp \ | 104 | wavplugin.o: wavplugin.cpp \ |
103 | wavplugin.h \ | 105 | wavplugin.h |
104 | ../mediaplayerplugininterface.h | ||
105 | 106 | ||
106 | wavpluginimpl.o: wavpluginimpl.cpp \ | 107 | wavpluginimpl.o: wavpluginimpl.cpp \ |
107 | wavplugin.h \ | 108 | wavplugin.h \ |
108 | ../mediaplayerplugininterface.h \ | 109 | wavpluginimpl.h |
109 | wavpluginimpl.h \ | ||
110 | ../mediaplayerplugininterface.h | ||
111 | 110 | ||
112 | 111 | ||