summaryrefslogtreecommitdiff
path: root/core/multimedia
authorkergoth <kergoth>2002-01-31 18:35:48 (UTC)
committer kergoth <kergoth>2002-01-31 18:35:48 (UTC)
commit2802e5a2b474101a50bf95e707061ca5542876fd (patch) (unidiff)
treea1015514ef9e48df091903cccf0d3174e272f663 /core/multimedia
parent48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff)
downloadopie-2802e5a2b474101a50bf95e707061ca5542876fd.zip
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2
*** empty log message ***
Diffstat (limited to 'core/multimedia') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libflash/Makefile.in9
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in11
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in13
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in13
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
@@ -79,197 +79,151 @@ OBJMOC = moc_loopcontrol.o \
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80 80
81.cxx.o: 81.cxx.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83 83
84.cc.o: 84.cc.o:
85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
86 86
87.C.o: 87.C.o:
88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
89 89
90.c.o: 90.c.o:
91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
92 92
93####### Build rules 93####### Build rules
94 94
95 95
96all: $(DESTDIR)$(TARGET) 96all: $(DESTDIR)$(TARGET)
97 97
98$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(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
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake mpegplayer.pro 104
105Makefile.in: mpegplayer.pro
106 tmake mpegplayer.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
113listpromodules: 115listpromodules:
114 @echo 116 @echo
115 117
116listallmodules: 118listallmodules:
117 @echo 119 @echo
118 120
119listaddonpromodules: 121listaddonpromodules:
120 @echo 122 @echo
121 123
122listaddonentmodules: 124listaddonentmodules:
123 @echo 125 @echo
124 126
125 127
126REQUIRES= 128REQUIRES=
127 129
128####### Sub-libraries 130####### Sub-libraries
129 131
130 132
131###### Combined headers 133###### Combined headers
132 134
133 135
134 136
135####### Compile 137####### Compile
136 138
137main.o: main.cpp \ 139main.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
151loopcontrol.o: loopcontrol.cpp \ 147loopcontrol.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
162playlistselection.o: playlistselection.cpp \ 153playlistselection.o: playlistselection.cpp \
163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(OPIEDIR)/include/qpe/resource.h \
165 playlistselection.h 154 playlistselection.h
166 155
167mediaplayerstate.o: mediaplayerstate.cpp \ 156mediaplayerstate.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
179videowidget.o: videowidget.cpp \ 162videowidget.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
187audiowidget.o: audiowidget.cpp \ 166audiowidget.o: audiowidget.cpp \
188 $(OPIEDIR)/include/qpe/resource.h \
189 audiowidget.h \ 167 audiowidget.h \
190 mediaplayerstate.h 168 mediaplayerstate.h
191 169
192playlistwidget.o: playlistwidget.cpp \ 170playlistwidget.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
204mediaplayer.o: mediaplayer.cpp \ 175mediaplayer.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
220audiodevice.o: audiodevice.cpp \ 183audiodevice.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
226moc_loopcontrol.o: moc_loopcontrol.cpp \ 186moc_loopcontrol.o: moc_loopcontrol.cpp \
227 loopcontrol.h 187 loopcontrol.h
228 188
229moc_playlistselection.o: moc_playlistselection.cpp \ 189moc_playlistselection.o: moc_playlistselection.cpp \
230 playlistselection.h \ 190 playlistselection.h
231 $(OPIEDIR)/include/qpe/applnk.h
232 191
233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 192moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
234 mediaplayerstate.h 193 mediaplayerstate.h
235 194
236moc_videowidget.o: moc_videowidget.cpp \ 195moc_videowidget.o: moc_videowidget.cpp \
237 videowidget.h 196 videowidget.h
238 197
239moc_audiowidget.o: moc_audiowidget.cpp \ 198moc_audiowidget.o: moc_audiowidget.cpp \
240 audiowidget.h 199 audiowidget.h
241 200
242moc_playlistwidget.o: moc_playlistwidget.cpp \ 201moc_playlistwidget.o: moc_playlistwidget.cpp \
243 playlistwidget.h \ 202 playlistwidget.h
244 $(OPIEDIR)/include/qpe/applnk.h
245 203
246moc_mediaplayer.o: moc_mediaplayer.cpp \ 204moc_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
253moc_audiodevice.o: moc_audiodevice.cpp \ 207moc_audiodevice.o: moc_audiodevice.cpp \
254 audiodevice.h 208 audiodevice.h
255 209
256moc_loopcontrol.cpp: loopcontrol.h 210moc_loopcontrol.cpp: loopcontrol.h
257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp 211 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
258 212
259moc_playlistselection.cpp: playlistselection.h 213moc_playlistselection.cpp: playlistselection.h
260 $(MOC) playlistselection.h -o moc_playlistselection.cpp 214 $(MOC) playlistselection.h -o moc_playlistselection.cpp
261 215
262moc_mediaplayerstate.cpp: mediaplayerstate.h 216moc_mediaplayerstate.cpp: mediaplayerstate.h
263 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp 217 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
264 218
265moc_videowidget.cpp: videowidget.h 219moc_videowidget.cpp: videowidget.h
266 $(MOC) videowidget.h -o moc_videowidget.cpp 220 $(MOC) videowidget.h -o moc_videowidget.cpp
267 221
268moc_audiowidget.cpp: audiowidget.h 222moc_audiowidget.cpp: audiowidget.h
269 $(MOC) audiowidget.h -o moc_audiowidget.cpp 223 $(MOC) audiowidget.h -o moc_audiowidget.cpp
270 224
271moc_playlistwidget.cpp: playlistwidget.h 225moc_playlistwidget.cpp: playlistwidget.h
272 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp 226 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp
273 227
274moc_mediaplayer.cpp: mediaplayer.h 228moc_mediaplayer.cpp: mediaplayer.h
275 $(MOC) mediaplayer.h -o moc_mediaplayer.cpp 229 $(MOC) mediaplayer.h -o moc_mediaplayer.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,33 +1,33 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
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)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/codecs/ 17DESTDIR = ../../plugins/codecs/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= flashplugin 21 TARGET= flashplugin
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =libflashplugin.h \ 26 HEADERS =libflashplugin.h \
27 libflashpluginimpl.h 27 libflashpluginimpl.h
28 SOURCES =libflashplugin.cpp \ 28 SOURCES =libflashplugin.cpp \
29 libflashpluginimpl.cpp \ 29 libflashpluginimpl.cpp \
30 adpcm.cc \ 30 adpcm.cc \
31 character.cc \ 31 character.cc \
32 flash.cc \ 32 flash.cc \
33 graphic16.cc \ 33 graphic16.cc \
@@ -124,57 +124,54 @@ listpromodules:
124 124
125listallmodules: 125listallmodules:
126 @echo 126 @echo
127 127
128listaddonpromodules: 128listaddonpromodules:
129 @echo 129 @echo
130 130
131listaddonentmodules: 131listaddonentmodules:
132 @echo 132 @echo
133 133
134 134
135REQUIRES= 135REQUIRES=
136 136
137####### Sub-libraries 137####### Sub-libraries
138 138
139 139
140###### Combined headers 140###### Combined headers
141 141
142 142
143 143
144####### Compile 144####### Compile
145 145
146libflashplugin.o: libflashplugin.cpp \ 146libflashplugin.o: libflashplugin.cpp \
147 libflashplugin.h \ 147 libflashplugin.h \
148 flash.h \ 148 flash.h
149 ../mediaplayerplugininterface.h
150 149
151libflashpluginimpl.o: libflashpluginimpl.cpp \ 150libflashpluginimpl.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
158adpcm.o: adpcm.cc \ 155adpcm.o: adpcm.cc \
159 swf.h \ 156 swf.h \
160 flash.h \ 157 flash.h \
161 matrix.h \ 158 matrix.h \
162 cxform.h \ 159 cxform.h \
163 rect.h \ 160 rect.h \
164 jpeglib.h \ 161 jpeglib.h \
165 jconfig.h \ 162 jconfig.h \
166 jmorecfg.h \ 163 jmorecfg.h \
167 jerror.h \ 164 jerror.h \
168 graphic.h \ 165 graphic.h \
169 character.h \ 166 character.h \
170 bitmap.h \ 167 bitmap.h \
171 shape.h \ 168 shape.h \
172 displaylist.h \ 169 displaylist.h \
173 sound.h \ 170 sound.h \
174 button.h \ 171 button.h \
175 font.h \ 172 font.h \
176 text.h \ 173 text.h \
177 adpcm.h \ 174 adpcm.h \
178 program.h \ 175 program.h \
179 sprite.h \ 176 sprite.h \
180 script.h \ 177 script.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
@@ -79,50 +79,52 @@ OBJMOC =
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80 80
81.cxx.o: 81.cxx.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83 83
84.cc.o: 84.cc.o:
85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
86 86
87.C.o: 87.C.o:
88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
89 89
90.c.o: 90.c.o:
91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
92 92
93####### Build rules 93####### Build rules
94 94
95 95
96all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 96all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
97 97
98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
99 $(SYSCONF_LINK_LIB) 99 $(SYSCONF_LINK_LIB)
100 100
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake libmad.pro 104
105Makefile.in: libmad.pro
106 tmake libmad.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
113listpromodules: 115listpromodules:
114 @echo 116 @echo
115 117
116listallmodules: 118listallmodules:
117 @echo 119 @echo
118 120
119listaddonpromodules: 121listaddonpromodules:
120 @echo 122 @echo
121 123
122listaddonentmodules: 124listaddonentmodules:
123 @echo 125 @echo
124 126
125 127
126REQUIRES= 128REQUIRES=
127 129
128####### Sub-libraries 130####### Sub-libraries
@@ -193,34 +195,31 @@ layer12.o: layer12.c \
193 frame.h \ 195 frame.h \
194 timer.h \ 196 timer.h \
195 layer12.h \ 197 layer12.h \
196 sf_table.dat \ 198 sf_table.dat \
197 qc_table.dat 199 qc_table.dat
198 200
199layer3.o: layer3.c \ 201layer3.o: layer3.c \
200 libmad_global.h \ 202 libmad_global.h \
201 fixed.h \ 203 fixed.h \
202 bit.h \ 204 bit.h \
203 stream.h \ 205 stream.h \
204 frame.h \ 206 frame.h \
205 timer.h \ 207 timer.h \
206 huffman.h \ 208 huffman.h \
207 layer3.h \ 209 layer3.h \
208 rq_table.dat \ 210 rq_table.dat \
209 imdct_s.dat 211 imdct_s.dat
210 212
211huffman.o: huffman.c \ 213huffman.o: huffman.c \
212 libmad_global.h \ 214 libmad_global.h \
213 huffman.h 215 huffman.h
214 216
215libmadplugin.o: libmadplugin.cpp \ 217libmadplugin.o: libmadplugin.cpp \
216 libmadplugin.h \ 218 libmadplugin.h \
217 ../mediaplayerplugininterface.h \
218 mad.h 219 mad.h
219 220
220libmadpluginimpl.o: libmadpluginimpl.cpp \ 221libmadpluginimpl.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
@@ -108,115 +108,114 @@ OBJMOC =
108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
109 109
110.cxx.o: 110.cxx.o:
111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
112 112
113.cc.o: 113.cc.o:
114 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 114 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
115 115
116.C.o: 116.C.o:
117 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 117 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
118 118
119.c.o: 119.c.o:
120 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 120 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
121 121
122####### Build rules 122####### Build rules
123 123
124 124
125all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 125all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
126 126
127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
128 $(SYSCONF_LINK_LIB) 128 $(SYSCONF_LINK_LIB)
129 129
130moc: $(SRCMOC) 130moc: $(SRCMOC)
131 131
132tmake: 132tmake: Makefile.in
133 tmake libmpeg3.pro 133
134Makefile.in: libmpeg3.pro
135 tmake libmpeg3.pro -o Makefile.in
134 136
135clean: 137clean:
136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 138 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
137 -rm -f *~ core 139 -rm -f *~ core
138 -rm -f allmoc.cpp 140 -rm -f allmoc.cpp
139 141
140####### Extension Modules 142####### Extension Modules
141 143
142listpromodules: 144listpromodules:
143 @echo 145 @echo
144 146
145listallmodules: 147listallmodules:
146 @echo 148 @echo
147 149
148listaddonpromodules: 150listaddonpromodules:
149 @echo 151 @echo
150 152
151listaddonentmodules: 153listaddonentmodules:
152 @echo 154 @echo
153 155
154 156
155REQUIRES= 157REQUIRES=
156 158
157####### Sub-libraries 159####### Sub-libraries
158 160
159 161
160###### Combined headers 162###### Combined headers
161 163
162 164
163 165
164####### Compile 166####### Compile
165 167
166libmpeg3plugin.o: libmpeg3plugin.cpp \ 168libmpeg3plugin.o: libmpeg3plugin.cpp \
167 libmpeg3plugin.h \ 169 libmpeg3plugin.h \
168 libmpeg3.h \ 170 libmpeg3.h \
169 mpeg3private.h \ 171 mpeg3private.h \
170 mpeg3atrack.h \ 172 mpeg3atrack.h \
171 mpeg3demux.h \ 173 mpeg3demux.h \
172 mpeg3title.h \ 174 mpeg3title.h \
173 mpeg3io.h \ 175 mpeg3io.h \
174 mpeg3css.h \ 176 mpeg3css.h \
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
182libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ 183libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
183 libmpeg3plugin.h \ 184 libmpeg3plugin.h \
184 libmpeg3.h \ 185 libmpeg3.h \
185 mpeg3private.h \ 186 mpeg3private.h \
186 mpeg3atrack.h \ 187 mpeg3atrack.h \
187 mpeg3demux.h \ 188 mpeg3demux.h \
188 mpeg3title.h \ 189 mpeg3title.h \
189 mpeg3io.h \ 190 mpeg3io.h \
190 mpeg3css.h \ 191 mpeg3css.h \
191 mpeg3private.inc \ 192 mpeg3private.inc \
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
200bitstream.o: bitstream.c \ 199bitstream.o: bitstream.c \
201 mpeg3private.h \ 200 mpeg3private.h \
202 mpeg3atrack.h \ 201 mpeg3atrack.h \
203 mpeg3demux.h \ 202 mpeg3demux.h \
204 mpeg3title.h \ 203 mpeg3title.h \
205 mpeg3io.h \ 204 mpeg3io.h \
206 mpeg3css.h \ 205 mpeg3css.h \
207 mpeg3private.inc \ 206 mpeg3private.inc \
208 audio/mpeg3audio.h \ 207 audio/mpeg3audio.h \
209 mpeg3vtrack.h \ 208 mpeg3vtrack.h \
210 video/mpeg3video.h \ 209 video/mpeg3video.h \
211 mpeg3protos.h 210 mpeg3protos.h
212 211
213libmpeg3.o: libmpeg3.c \ 212libmpeg3.o: libmpeg3.c \
214 libmpeg3.h \ 213 libmpeg3.h \
215 mpeg3private.h \ 214 mpeg3private.h \
216 mpeg3atrack.h \ 215 mpeg3atrack.h \
217 mpeg3demux.h \ 216 mpeg3demux.h \
218 mpeg3title.h \ 217 mpeg3title.h \
219 mpeg3io.h \ 218 mpeg3io.h \
220 mpeg3css.h \ 219 mpeg3css.h \
221 mpeg3private.inc \ 220 mpeg3private.inc \
222 audio/mpeg3audio.h \ 221 audio/mpeg3audio.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
@@ -44,69 +44,68 @@ OBJMOC =
44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45 45
46.cxx.o: 46.cxx.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48 48
49.cc.o: 49.cc.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51 51
52.C.o: 52.C.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54 54
55.c.o: 55.c.o:
56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
57 57
58####### Build rules 58####### Build rules
59 59
60 60
61all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 61all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
62 62
63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
64 $(SYSCONF_LINK_LIB) 64 $(SYSCONF_LINK_LIB)
65 65
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: 68tmake: Makefile.in
69 tmake wavplugin.pro 69
70Makefile.in: wavplugin.pro
71 tmake wavplugin.pro -o Makefile.in
70 72
71clean: 73clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 75 -rm -f *~ core
74 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
75 77
76####### Extension Modules 78####### Extension Modules
77 79
78listpromodules: 80listpromodules:
79 @echo 81 @echo
80 82
81listallmodules: 83listallmodules:
82 @echo 84 @echo
83 85
84listaddonpromodules: 86listaddonpromodules:
85 @echo 87 @echo
86 88
87listaddonentmodules: 89listaddonentmodules:
88 @echo 90 @echo
89 91
90 92
91REQUIRES= 93REQUIRES=
92 94
93####### Sub-libraries 95####### Sub-libraries
94 96
95 97
96###### Combined headers 98###### Combined headers
97 99
98 100
99 101
100####### Compile 102####### Compile
101 103
102wavplugin.o: wavplugin.cpp \ 104wavplugin.o: wavplugin.cpp \
103 wavplugin.h \ 105 wavplugin.h
104 ../mediaplayerplugininterface.h
105 106
106wavpluginimpl.o: wavpluginimpl.cpp \ 107wavpluginimpl.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