1 files changed, 6 insertions, 7 deletions
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: Makefile.in
-        tmake libmpeg3.pro
+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 \
+                mpeg3protos.h
-                ../mediaplayerplugininterface.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
-                libmpeg3pluginimpl.h \
-                ../mediaplayerplugininterface.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/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 \
84	video/getpicture.o \	84	video/getpicture.o \
85	video/headers.o \	85	video/headers.o \
86	video/idct.o \	86	video/idct.o \
87	video/macroblocks.o \	87	video/macroblocks.o \
88	video/mmxtest.o \	88	video/mmxtest.o \
89	video/motion.o \	89	video/motion.o \
90	video/mpeg3video.o \	90	video/mpeg3video.o \
91	video/output.o \	91	video/output.o \
92	video/reconstruct.o \	92	video/reconstruct.o \
93	video/seek.o \	93	video/seek.o \
94	video/slice.o \	94	video/slice.o \
95	video/vlc.o	95	video/vlc.o
96	INTERFACES =	96	INTERFACES =
97	UICDECLS =	97	UICDECLS =
98	UICIMPLS =	98	UICIMPLS =
99	SRCMOC =	99	SRCMOC =
100	OBJMOC =	100	OBJMOC =
101		101
102		102
103	####### Implicit rules	103	####### Implicit rules
104		104
105	.SUFFIXES: .cpp .cxx .cc .C .c	105	.SUFFIXES: .cpp .cxx .cc .C .c
106		106
107	.cpp.o:	107	.cpp.o:
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
125	all: $(DESTDIR)$(SYSCONF_LINK_TARGET)	125	all: $(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
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
138	-rm -f allmoc.cpp	140	-rm -f allmoc.cpp
139		141
140	####### Extension Modules	142	####### Extension Modules
141		143
142	listpromodules:	144	listpromodules:
143	@echo	145	@echo
144		146
145	listallmodules:	147	listallmodules:
146	@echo	148	@echo
147		149
148	listaddonpromodules:	150	listaddonpromodules:
149	@echo	151	@echo
150		152
151	listaddonentmodules:	153	listaddonentmodules:
152	@echo	154	@echo
153		155
154		156
155	REQUIRES=	157	REQUIRES=
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
166	libmpeg3plugin.o: libmpeg3plugin.cpp \	168	libmpeg3plugin.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
182	libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \	183	libmpeg3pluginimpl.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
200	bitstream.o: bitstream.c \	199	bitstream.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
213	libmpeg3.o: libmpeg3.c \	212	libmpeg3.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 \
223	mpeg3vtrack.h \	222	mpeg3vtrack.h \
224	video/mpeg3video.h \	223	video/mpeg3video.h \
225	mpeg3protos.h	224	mpeg3protos.h
226		225
227	mpeg3atrack.o: mpeg3atrack.c \	226	mpeg3atrack.o: mpeg3atrack.c \
228	libmpeg3.h \	227	libmpeg3.h \
229	mpeg3private.h \	228	mpeg3private.h \
230	mpeg3atrack.h \	229	mpeg3atrack.h \
231	mpeg3demux.h \	230	mpeg3demux.h \
232	mpeg3title.h \	231	mpeg3title.h \
233	mpeg3io.h \	232	mpeg3io.h \
234	mpeg3css.h \	233	mpeg3css.h \
235	mpeg3private.inc \	234	mpeg3private.inc \
236	audio/mpeg3audio.h \	235	audio/mpeg3audio.h \
237	mpeg3vtrack.h \	236	mpeg3vtrack.h \
238	video/mpeg3video.h \	237	video/mpeg3video.h \
239	mpeg3protos.h	238	mpeg3protos.h
240		239
241	mpeg3css.o: mpeg3css.c \	240	mpeg3css.o: mpeg3css.c \
242	mpeg3css.h \	241	mpeg3css.h \
243	mpeg3private.h \	242	mpeg3private.h \
244	mpeg3atrack.h \	243	mpeg3atrack.h \
245	mpeg3demux.h \	244	mpeg3demux.h \
246	mpeg3title.h \	245	mpeg3title.h \