1 files changed, 5 insertions, 6 deletions
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
@@ -7,220 +7,219 @@ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
        INCPATH =-I$(OPIEDIR)/include -I..
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe -lm $(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= madplugin
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =libmad_version.h \
                fixed.h \
                bit.h \
                timer.h \
                stream.h \
                frame.h \
                synth.h \
                decoder.h \
                layer12.h \
                layer3.h \
                huffman.h \
                libmad_global.h \
                mad.h \
                libmadplugin.h \
                libmadpluginimpl.h
        SOURCES =version.c \
                fixed.c \
                bit.c \
                timer.c \
                stream.c \
                frame.c \
                synth.c \
                decoder.c \
                layer12.c \
                layer3.c \
                huffman.c \
                libmadplugin.cpp \
                libmadpluginimpl.cpp
        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: Makefile.in
-        tmake libmad.pro
+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
 stream.o: stream.c \
                libmad_global.h \
                bit.h \
                stream.h
 frame.o: frame.c \
                libmad_global.h \
                bit.h \
                stream.h \
                frame.h \
                fixed.h \
                timer.h \
                layer12.h \
                layer3.h
 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
-                libmadpluginimpl.h \
-                ../mediaplayerplugininterface.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
@@ -7,220 +7,219 @@ 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$(OPIEDIR)/include -I..	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 -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe -lm $(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
17	DESTDIR = ../../plugins/codecs/	17	DESTDIR = ../../plugins/codecs/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= madplugin	21	TARGET= madplugin
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =libmad_version.h \	26	HEADERS =libmad_version.h \
27	fixed.h \	27	fixed.h \
28	bit.h \	28	bit.h \
29	timer.h \	29	timer.h \
30	stream.h \	30	stream.h \
31	frame.h \	31	frame.h \
32	synth.h \	32	synth.h \
33	decoder.h \	33	decoder.h \
34	layer12.h \	34	layer12.h \
35	layer3.h \	35	layer3.h \
36	huffman.h \	36	huffman.h \
37	libmad_global.h \	37	libmad_global.h \
38	mad.h \	38	mad.h \
39	libmadplugin.h \	39	libmadplugin.h \
40	libmadpluginimpl.h	40	libmadpluginimpl.h
41	SOURCES =version.c \	41	SOURCES =version.c \
42	fixed.c \	42	fixed.c \
43	bit.c \	43	bit.c \
44	timer.c \	44	timer.c \
45	stream.c \	45	stream.c \
46	frame.c \	46	frame.c \
47	synth.c \	47	synth.c \
48	decoder.c \	48	decoder.c \
49	layer12.c \	49	layer12.c \
50	layer3.c \	50	layer3.c \
51	huffman.c \	51	huffman.c \
52	libmadplugin.cpp \	52	libmadplugin.cpp \
53	libmadpluginimpl.cpp	53	libmadpluginimpl.cpp
54	OBJECTS =version.o \	54	OBJECTS =version.o \
55	fixed.o \	55	fixed.o \
56	bit.o \	56	bit.o \
57	timer.o \	57	timer.o \
58	stream.o \	58	stream.o \
59	frame.o \	59	frame.o \
60	synth.o \	60	synth.o \
61	decoder.o \	61	decoder.o \
62	layer12.o \	62	layer12.o \
63	layer3.o \	63	layer3.o \
64	huffman.o \	64	huffman.o \
65	libmadplugin.o \	65	libmadplugin.o \
66	libmadpluginimpl.o	66	libmadpluginimpl.o
67	INTERFACES =	67	INTERFACES =
68	UICDECLS =	68	UICDECLS =
69	UICIMPLS =	69	UICIMPLS =
70	SRCMOC =	70	SRCMOC =
71	OBJMOC =	71	OBJMOC =
72		72
73		73
74	####### Implicit rules	74	####### Implicit rules
75		75
76	.SUFFIXES: .cpp .cxx .cc .C .c	76	.SUFFIXES: .cpp .cxx .cc .C .c
77		77
78	.cpp.o:	78	.cpp.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
96	all: $(DESTDIR)$(SYSCONF_LINK_TARGET)	96	all: $(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
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
109	-rm -f allmoc.cpp	111	-rm -f allmoc.cpp
110		112
111	####### Extension Modules	113	####### Extension Modules
112		114
113	listpromodules:	115	listpromodules:
114	@echo	116	@echo
115		117
116	listallmodules:	118	listallmodules:
117	@echo	119	@echo
118		120
119	listaddonpromodules:	121	listaddonpromodules:
120	@echo	122	@echo
121		123
122	listaddonentmodules:	124	listaddonentmodules:
123	@echo	125	@echo
124		126
125		127
126	REQUIRES=	128	REQUIRES=
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
137	version.o: version.c \	139	version.o: version.c \
138	libmad_global.h \	140	libmad_global.h \
139	libmad_version.h	141	libmad_version.h
140		142
141	fixed.o: fixed.c \	143	fixed.o: fixed.c \
142	libmad_global.h \	144	libmad_global.h \
143	fixed.h	145	fixed.h
144		146
145	bit.o: bit.c \	147	bit.o: bit.c \
146	libmad_global.h \	148	libmad_global.h \
147	bit.h	149	bit.h
148		150
149	timer.o: timer.c \	151	timer.o: timer.c \
150	libmad_global.h \	152	libmad_global.h \
151	timer.h	153	timer.h
152		154
153	stream.o: stream.c \	155	stream.o: stream.c \
154	libmad_global.h \	156	libmad_global.h \
155	bit.h \	157	bit.h \
156	stream.h	158	stream.h
157		159
158	frame.o: frame.c \	160	frame.o: frame.c \
159	libmad_global.h \	161	libmad_global.h \
160	bit.h \	162	bit.h \
161	stream.h \	163	stream.h \
162	frame.h \	164	frame.h \
163	fixed.h \	165	fixed.h \
164	timer.h \	166	timer.h \
165	layer12.h \	167	layer12.h \
166	layer3.h	168	layer3.h
167		169
168	synth.o: synth.c \	170	synth.o: synth.c \
169	libmad_global.h \	171	libmad_global.h \
170	fixed.h \	172	fixed.h \
171	frame.h \	173	frame.h \
172	timer.h \	174	timer.h \
173	stream.h \	175	stream.h \
174	bit.h \	176	bit.h \
175	synth.h \	177	synth.h \
176	D.dat	178	D.dat
177		179
178	decoder.o: decoder.c \	180	decoder.o: decoder.c \
179	libmad_global.h \	181	libmad_global.h \
180	stream.h \	182	stream.h \
181	bit.h \	183	bit.h \
182	frame.h \	184	frame.h \
183	fixed.h \	185	fixed.h \
184	timer.h \	186	timer.h \
185	synth.h \	187	synth.h \
186	decoder.h	188	decoder.h
187		189
188	layer12.o: layer12.c \	190	layer12.o: layer12.c \
189	libmad_global.h \	191	libmad_global.h \
190	fixed.h \	192	fixed.h \
191	bit.h \	193	bit.h \
192	stream.h \	194	stream.h \
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
199	layer3.o: layer3.c \	201	layer3.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
211	huffman.o: huffman.c \	213	huffman.o: huffman.c \
212	libmad_global.h \	214	libmad_global.h \
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