]>
Commit | Line | Data |
---|---|---|
4a55007c JB |
1 | --- ffmpeg/libavcodec/libpostproc/Makefile.orig 2006-01-27 00:42:28.000000000 +0100 |
2 | +++ ffmpeg/libavcodec/libpostproc/Makefile 2006-01-29 13:37:17.993360000 +0100 | |
3 | @@ -4,25 +4,22 @@ | |
d7493de8 | 4 | VPATH=$(SRC_PATH)/libavcodec/libpostproc |
2a60eebe | 5 | |
4a55007c JB |
6 | NAME=postproc |
7 | -ifeq ($(BUILD_SHARED),yes) | |
8 | LIBVERSION=$(SPPVERSION) | |
9 | LIBMAJOR=$(SPPMAJOR) | |
2a60eebe | 10 | -endif |
2a60eebe | 11 | |
4a55007c JB |
12 | -OBJS=postprocess.o |
13 | -SOBJS=postprocess_pic.o | |
14 | +OBJS=postprocess.lo | |
2a60eebe | 15 | |
05e1eb2f | 16 | CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC) |
2a60eebe | 17 | # -I/usr/X11R6/include/ |
4a55007c JB |
18 | |
19 | .SUFFIXES: .c .o | |
2a60eebe JB |
20 | |
21 | # .PHONY: all clean | |
22 | ||
23 | -.c.o: | |
d7493de8 | 24 | - $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $< |
4a55007c | 25 | +%.lo : %.c |
ddf64b63 | 26 | + libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $< |
2a60eebe | 27 | |
4a55007c JB |
28 | -all: $(SWSLIB) $(LIB) $(SLIBNAME) |
29 | +all: $(SWSLIB) $(LIB) | |
2a60eebe JB |
30 | |
31 | clean: | |
4a55007c JB |
32 | rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll |
33 | @@ -36,37 +33,21 @@ | |
2a60eebe JB |
34 | $(CC) -MM $(CFLAGS) postprocess.c 1>.depend |
35 | ||
4a55007c | 36 | ifeq ($(BUILD_SHARED),yes) |
2a60eebe JB |
37 | -postprocess_pic.o: postprocess.c |
38 | - $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $< | |
39 | - | |
4a55007c JB |
40 | -$(SLIBNAME): $(SOBJS) |
41 | - $(CC) $(SHFLAGS) -o $(SLIBNAME) $(SOBJS) | |
ff0ca760 | 42 | +RPATH= -rpath $(libdir) |
2a60eebe JB |
43 | +else |
44 | +RPATH= | |
45 | endif | |
46 | ||
4a55007c | 47 | $(LIB): $(OBJS) |
2a60eebe | 48 | - rm -f $@ |
4a55007c | 49 | - $(AR) rc $@ $(OBJS) |
2a60eebe | 50 | - $(RANLIB) $@ |
ddf64b63 | 51 | + libtool --mode=link --tag=CC $(CC) -o $(LIB) $(OBJS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :` |
2a60eebe JB |
52 | |
53 | install: all | |
4a55007c | 54 | -ifeq ($(BUILD_SHARED),yes) |
d7493de8 | 55 | -ifeq ($(CONFIG_WIN32),yes) |
4a55007c | 56 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" |
d7493de8 JB |
57 | -else |
58 | - install -d $(libdir) | |
4a55007c JB |
59 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ |
60 | - $(libdir)/$(SLIBNAME_WITH_VERSION) | |
61 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
62 | - $(libdir)/$(SLIBNAME_WITH_MAJOR) | |
63 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
64 | - $(libdir)/$(SLIBNAME) | |
d7493de8 | 65 | - $(LDCONFIG) || true |
4a55007c | 66 | -endif |
d7493de8 JB |
67 | -endif |
68 | - mkdir -p $(prefix)/include/postproc | |
69 | - install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h | |
4a55007c JB |
70 | - install -d $(libdir)/pkgconfig |
71 | - install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig | |
72 | + install -d $(DESTDIR)$(libdir) | |
73 | + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir) | |
d7493de8 JB |
74 | + install -d $(DESTDIR)$(prefix)/include/postproc |
75 | + install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h | |
4a55007c JB |
76 | + install -d $(DESTDIR)$(libdir)/pkgconfig |
77 | + install -m 644 ../../libpostproc.pc $(DESTDIR)$(libdir)/pkgconfig | |
2a60eebe JB |
78 | |
79 | ||
d7493de8 | 80 | # |
4a55007c JB |
81 | --- ffmpeg/libavcodec/Makefile.orig 2006-01-27 00:42:28.000000000 +0100 |
82 | +++ ffmpeg/libavcodec/Makefile 2006-01-29 13:45:46.901164750 +0100 | |
83 | @@ -9,311 +9,312 @@ | |
05e1eb2f | 84 | # NOTE: -I.. is needed to include config.h |
d7493de8 | 85 | CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS) |
539b540f | 86 | |
d7493de8 | 87 | -OBJS= bitstream.o utils.o mem.o allcodecs.o \ |
2a60eebe | 88 | - mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ |
ff0ca760 | 89 | - mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \ |
2a60eebe JB |
90 | - motion_est.o imgconvert.o imgresample.o \ |
91 | - mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \ | |
d7493de8 JB |
92 | - ratecontrol.o adpcm.o eval.o error_resilience.o \ |
93 | - fft.o mdct.o raw.o golomb.o cabac.o\ | |
94 | - dpcm.o adx.o faandct.o parser.o g726.o \ | |
4a55007c JB |
95 | - vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \ |
96 | - opt.o | |
d7493de8 JB |
97 | +OBJS= bitstream.lo utils.lo mem.lo allcodecs.lo \ |
98 | + mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo\ | |
ff0ca760 | 99 | + mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo resample2.lo dsputil.lo \ |
2a60eebe JB |
100 | + motion_est.lo imgconvert.lo imgresample.lo \ |
101 | + mpeg12.lo mpegaudiodec.lo pcm.lo simple_idct.lo \ | |
d7493de8 JB |
102 | + ratecontrol.lo adpcm.lo eval.lo error_resilience.lo \ |
103 | + fft.lo mdct.lo raw.lo golomb.lo cabac.lo\ | |
104 | + dpcm.lo adx.lo faandct.lo parser.lo g726.lo \ | |
4a55007c JB |
105 | + vp3dsp.lo h264idct.lo rangecoder.lo pnm.lo h263.lo msmpeg4.lo h263dec.lo \ |
106 | + opt.lo | |
d7493de8 JB |
107 | |
108 | ifeq ($(CONFIG_AASC_DECODER),yes) | |
109 | - OBJS+= aasc.o | |
110 | + OBJS+= aasc.lo | |
111 | endif | |
112 | ifeq ($(CONFIG_ALAC_DECODER),yes) | |
113 | - OBJS+= alac.o | |
114 | + OBJS+= alac.lo | |
115 | endif | |
116 | ifneq ($(CONFIG_ASV1_DECODER)$(CONFIG_ASV1_ENCODER)$(CONFIG_ASV2_DECODER)$(CONFIG_ASV2_ENCODER),) | |
117 | - OBJS+= asv1.o | |
118 | + OBJS+= asv1.lo | |
119 | endif | |
120 | ifeq ($(CONFIG_CINEPAK_DECODER),yes) | |
121 | - OBJS+= cinepak.o | |
122 | + OBJS+= cinepak.lo | |
4a55007c JB |
123 | endif |
124 | ifeq ($(CONFIG_COOK_DECODER),yes) | |
125 | - OBJS+= cook.o | |
126 | + OBJS+= cook.lo | |
d7493de8 JB |
127 | endif |
128 | ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),) | |
129 | - OBJS+= cljr.o | |
130 | + OBJS+= cljr.lo | |
131 | endif | |
132 | ifeq ($(CONFIG_CYUV_DECODER),yes) | |
133 | - OBJS+= cyuv.o | |
134 | + OBJS+= cyuv.lo | |
4a55007c JB |
135 | endif |
136 | ifeq ($(CONFIG_DVBSUB_DECODER),yes) | |
137 | - OBJS+= dvbsubdec.o | |
138 | + OBJS+= dvbsubdec.lo | |
139 | endif | |
140 | ifeq ($(CONFIG_DVBSUB_ENCODER),yes) | |
141 | - OBJS+= dvbsub.o | |
142 | + OBJS+= dvbsub.lo | |
143 | endif | |
144 | ifeq ($(CONFIG_DVDSUB_DECODER),yes) | |
145 | - OBJS+= dvdsub.o | |
146 | + OBJS+= dvdsub.lo | |
147 | endif | |
148 | ifeq ($(CONFIG_DVDSUB_ENCODER),yes) | |
149 | - OBJS+= dvdsubenc.o | |
150 | + OBJS+= dvdsubenc.lo | |
d7493de8 JB |
151 | endif |
152 | ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),) | |
153 | - OBJS+= dv.o | |
154 | + OBJS+= dv.lo | |
155 | endif | |
156 | ifeq ($(CONFIG_EIGHTBPS_DECODER),yes) | |
157 | - OBJS+= 8bps.o | |
158 | + OBJS+= 8bps.lo | |
159 | endif | |
160 | ifneq ($(CONFIG_FFV1_DECODER)$(CONFIG_FFV1_ENCODER),) | |
161 | - OBJS+= ffv1.o | |
162 | + OBJS+= ffv1.lo | |
163 | endif | |
164 | ifeq ($(CONFIG_FLAC_DECODER),yes) | |
165 | - OBJS+= flac.o | |
166 | + OBJS+= flac.lo | |
167 | endif | |
168 | ifeq ($(CONFIG_FLIC_DECODER),yes) | |
169 | - OBJS+= flicvideo.o | |
170 | + OBJS+= flicvideo.lo | |
171 | endif | |
172 | ifeq ($(CONFIG_FOURXM_DECODER),yes) | |
173 | - OBJS+= 4xm.o | |
174 | + OBJS+= 4xm.lo | |
175 | endif | |
176 | ifeq ($(CONFIG_FRAPS_DECODER),yes) | |
177 | - OBJS+= fraps.o | |
178 | + OBJS+= fraps.lo | |
179 | endif | |
180 | ifneq ($(CONFIG_H261_DECODER)$(CONFIG_H261_ENCODER),) | |
181 | - OBJS+= h261.o | |
182 | + OBJS+= h261.lo | |
183 | endif | |
184 | ifneq ($(CONFIG_H264_DECODER)$(CONFIG_SVQ3_DECODER),) | |
185 | - OBJS+= h264.o | |
186 | + OBJS+= h264.lo | |
187 | endif | |
188 | ifneq ($(CONFIG_HUFFYUV_DECODER)$(CONFIG_HUFFYUV_ENCODER)$(CONFIG_FFVHUFF_DECODER)$(CONFIG_FFVHUFF_ENCODER),) | |
189 | - OBJS+= huffyuv.o | |
190 | + OBJS+= huffyuv.lo | |
191 | endif | |
192 | ifeq ($(CONFIG_IDCIN_DECODER),yes) | |
193 | - OBJS+= idcinvideo.o | |
194 | + OBJS+= idcinvideo.lo | |
195 | endif | |
196 | ifeq ($(CONFIG_INDEO2_DECODER),yes) | |
197 | - OBJS+= indeo2.o | |
198 | + OBJS+= indeo2.lo | |
199 | endif | |
200 | ifeq ($(CONFIG_INDEO3_DECODER),yes) | |
201 | - OBJS+= indeo3.o | |
202 | + OBJS+= indeo3.lo | |
203 | endif | |
204 | ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes) | |
205 | - OBJS+= interplayvideo.o | |
206 | + OBJS+= interplayvideo.lo | |
207 | endif | |
208 | ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),) | |
209 | - OBJS+= lcl.o | |
210 | + OBJS+= lcl.lo | |
211 | endif | |
212 | ifeq ($(CONFIG_LOCO_DECODER),yes) | |
213 | - OBJS+= loco.o | |
214 | + OBJS+= loco.lo | |
215 | endif | |
216 | ifneq ($(CONFIG_MACE3_DECODER)$(CONFIG_MACE6_DECODER),) | |
217 | - OBJS+= mace.o | |
218 | + OBJS+= mace.lo | |
219 | endif | |
220 | ifeq ($(CONFIG_MSRLE_DECODER),yes) | |
221 | - OBJS+= msrle.o | |
222 | + OBJS+= msrle.lo | |
223 | endif | |
224 | ifeq ($(CONFIG_MSVIDEO1_DECODER),yes) | |
225 | - OBJS+= msvideo1.o | |
226 | + OBJS+= msvideo1.lo | |
227 | endif | |
228 | ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),) | |
229 | - OBJS+= png.o | |
230 | + OBJS+= png.lo | |
4a55007c JB |
231 | endif |
232 | ifeq ($(CONFIG_QDM2_DECODER),yes) | |
233 | - OBJS+= qdm2.o | |
234 | + OBJS+= qdm2.lo | |
d7493de8 JB |
235 | endif |
236 | ifeq ($(CONFIG_QDRAW_DECODER),yes) | |
237 | - OBJS+= qdrw.o | |
238 | + OBJS+= qdrw.lo | |
239 | endif | |
240 | ifeq ($(CONFIG_QPEG_DECODER),yes) | |
241 | - OBJS+= qpeg.o | |
242 | + OBJS+= qpeg.lo | |
243 | endif | |
244 | ifeq ($(CONFIG_QTRLE_DECODER),yes) | |
245 | - OBJS+= qtrle.o | |
246 | + OBJS+= qtrle.lo | |
247 | endif | |
248 | ifeq ($(CONFIG_RA_144_DECODER),yes) | |
249 | - OBJS+= ra144.o | |
250 | + OBJS+= ra144.lo | |
251 | endif | |
252 | ifeq ($(CONFIG_RA_288_DECODER),yes) | |
253 | - OBJS+= ra288.o | |
254 | + OBJS+= ra288.lo | |
255 | endif | |
256 | ifeq ($(CONFIG_ROQ_DECODER),yes) | |
257 | - OBJS+= roqvideo.o | |
258 | + OBJS+= roqvideo.lo | |
259 | endif | |
260 | ifeq ($(CONFIG_RPZA_DECODER),yes) | |
261 | - OBJS+= rpza.o | |
262 | + OBJS+= rpza.lo | |
263 | endif | |
264 | ifneq ($(CONFIG_RV10_DECODER)$(CONFIG_RV20_DECODER)$(CONFIG_RV10_ENCODER)$(CONFIG_RV20_ENCODER),) | |
265 | - OBJS+= rv10.o | |
266 | + OBJS+= rv10.lo | |
267 | endif | |
268 | ifeq ($(CONFIG_SHORTEN_DECODER),yes) | |
269 | - OBJS+= shorten.o | |
270 | + OBJS+= shorten.lo | |
271 | endif | |
272 | ifeq ($(CONFIG_SMC_DECODER),yes) | |
273 | - OBJS+= smc.o | |
274 | + OBJS+= smc.lo | |
275 | endif | |
276 | ifneq ($(CONFIG_SNOW_DECODER)$(CONFIG_SNOW_ENCODER),) | |
277 | - OBJS+= snow.o | |
278 | + OBJS+= snow.lo | |
279 | endif | |
280 | ifneq ($(CONFIG_SONIC_DECODER)$(CONFIG_SONIC_ENCODER)$(CONFIG_SONIC_LS_ENCODER),) | |
281 | - OBJS+= sonic.o | |
282 | + OBJS+= sonic.lo | |
283 | endif | |
284 | ifneq ($(CONFIG_SVQ1_DECODER)$(CONFIG_SVQ1_ENCODER),) | |
285 | - OBJS+= svq1.o | |
286 | + OBJS+= svq1.lo | |
287 | endif | |
288 | ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes) | |
289 | - OBJS+= truemotion1.o | |
290 | + OBJS+= truemotion1.lo | |
4a55007c JB |
291 | endif |
292 | ifeq ($(CONFIG_TRUEMOTION2_DECODER),yes) | |
293 | - OBJS+= truemotion2.o | |
294 | + OBJS+= truemotion2.lo | |
295 | endif | |
296 | ifeq ($(CONFIG_TRUESPEECH_DECODER),yes) | |
297 | - OBJS+= truespeech.o | |
298 | + OBJS+= truespeech.lo | |
d7493de8 JB |
299 | endif |
300 | ifeq ($(CONFIG_TSCC_DECODER),yes) | |
301 | - OBJS+= tscc.o | |
302 | + OBJS+= tscc.lo | |
4a55007c JB |
303 | endif |
304 | ifeq ($(CONFIG_CSCD_DECODER),yes) | |
305 | - OBJS+= cscd.o | |
306 | - OBJS+= lzo.o | |
307 | + OBJS+= cscd.lo | |
308 | + OBJS+= lzo.lo | |
d7493de8 JB |
309 | endif |
310 | ifeq ($(CONFIG_ULTI_DECODER),yes) | |
311 | - OBJS+= ulti.o | |
312 | + OBJS+= ulti.lo | |
313 | endif | |
314 | ifneq ($(CONFIG_VC9_DECODER)$(CONFIG_WMV3_DECODER),) | |
315 | - OBJS+= vc9.o | |
316 | + OBJS+= vc9.lo | |
317 | endif | |
318 | ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),) | |
319 | - OBJS+= vcr1.o | |
320 | + OBJS+= vcr1.lo | |
321 | endif | |
322 | ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),) | |
323 | - OBJS+= vmdav.o | |
324 | + OBJS+= vmdav.lo | |
325 | endif | |
326 | ifeq ($(CONFIG_VORBIS_DECODER),yes) | |
327 | - OBJS+= vorbis.o | |
328 | + OBJS+= vorbis.lo | |
329 | endif | |
330 | ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),) | |
331 | - OBJS+= vp3.o | |
332 | + OBJS+= vp3.lo | |
333 | endif | |
334 | ifeq ($(CONFIG_VQA_DECODER),yes) | |
335 | - OBJS+= vqavideo.o | |
336 | + OBJS+= vqavideo.lo | |
337 | endif | |
338 | ifneq ($(CONFIG_WMAV1_DECODER)$(CONFIG_WMAV2_DECODER),) | |
339 | - OBJS+= wmadec.o | |
340 | + OBJS+= wmadec.lo | |
341 | endif | |
342 | ifeq ($(CONFIG_WNV1_DECODER),yes) | |
343 | - OBJS+= wnv1.o | |
344 | + OBJS+= wnv1.lo | |
345 | endif | |
346 | ifeq ($(CONFIG_WS_SND1_DECODER),yes) | |
347 | - OBJS+= ws-snd1.o | |
348 | + OBJS+= ws-snd1.lo | |
349 | endif | |
350 | ifneq ($(CONFIG_XAN_WC3_DECODER)$(CONFIG_XAN_WC4_DECODER),) | |
351 | - OBJS+= xan.o | |
352 | + OBJS+= xan.lo | |
353 | endif | |
354 | ifeq ($(CONFIG_XL_DECODER),yes) | |
355 | - OBJS+= xl.o | |
356 | + OBJS+= xl.lo | |
357 | endif | |
4a55007c JB |
358 | ifeq ($(CONFIG_BMP_DECODER),yes) |
359 | - OBJS+= bmp.o | |
360 | + OBJS+= bmp.lo | |
361 | endif | |
362 | ||
d7493de8 | 363 | AMROBJS= |
2a60eebe JB |
364 | ifeq ($(AMR_NB),yes) |
365 | ifeq ($(AMR_NB_FIXED),yes) | |
d7493de8 | 366 | -AMROBJS= amr.o |
2a60eebe | 367 | -AMREXTRALIBS+= amr/*.o |
d7493de8 | 368 | +AMROBJS= amr.lo |
2a60eebe JB |
369 | +AMREXTRALIBS+= amr/*.lo |
370 | AMRLIBS=amrlibs | |
371 | CLEANAMR=cleanamr | |
372 | else | |
d7493de8 JB |
373 | -AMROBJS= amr.o |
374 | -OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o | |
375 | +AMROBJS= amr.lo | |
376 | +OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo | |
2a60eebe JB |
377 | CLEANAMR=cleanamrfloat |
378 | endif | |
379 | endif | |
ff0ca760 JB |
380 | |
381 | ifeq ($(HAVE_PTHREADS),yes) | |
382 | -OBJS+= pthread.o | |
383 | +OBJS+= pthread.lo | |
384 | endif | |
385 | ||
386 | ifeq ($(HAVE_W32THREADS),yes) | |
387 | -OBJS+= w32thread.o | |
388 | +OBJS+= w32thread.lo | |
389 | endif | |
390 | ||
d7493de8 JB |
391 | ifeq ($(HAVE_BEOSTHREADS),yes) |
392 | -OBJS+= beosthread.o | |
393 | +OBJS+= beosthread.lo | |
394 | endif | |
395 | ||
ff0ca760 | 396 | ifeq ($(AMR_WB),yes) |
d7493de8 JB |
397 | -AMROBJS= amr.o |
398 | -OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \ | |
ff0ca760 JB |
399 | - amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \ |
400 | - amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \ | |
401 | - amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \ | |
402 | - amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \ | |
403 | - amrwb_float/enc_util.o amrwb_float/if_rom.o | |
d7493de8 JB |
404 | +AMROBJS= amr.lo |
405 | +OBJS+= amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \ | |
ff0ca760 JB |
406 | + amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \ |
407 | + amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \ | |
408 | + amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \ | |
409 | + amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \ | |
410 | + amrwb_float/enc_util.lo amrwb_float/if_rom.lo | |
411 | endif | |
d7493de8 | 412 | OBJS+= $(AMROBJS) |
ff0ca760 JB |
413 | CLEANAMRWB=cleanamrwbfloat |
414 | ASM_OBJS= | |
2a60eebe | 415 | |
2a60eebe JB |
416 | ifeq ($(HAVE_XVMC_ACCEL),yes) |
417 | -OBJS+= xvmcvideo.o | |
418 | +OBJS+= xvmcvideo.lo | |
419 | endif | |
539b540f JB |
420 | |
421 | # currently using liba52 for ac3 decoding | |
422 | ifeq ($(CONFIG_AC3),yes) | |
423 | -OBJS+= a52dec.o | |
424 | +OBJS+= a52dec.lo | |
425 | ||
426 | # using builtin liba52 or runtime linked liba52.so.0 | |
427 | ifneq ($(CONFIG_A52BIN),yes) | |
428 | -OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \ | |
2a60eebe | 429 | - liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o |
539b540f | 430 | +OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \ |
2a60eebe JB |
431 | + liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo |
432 | endif | |
433 | endif | |
434 | ||
4a55007c | 435 | -EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF) |
d7493de8 JB |
436 | +EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la |
437 | ||
438 | # currently using libdts for dts decoding | |
439 | ifeq ($(CONFIG_DTS),yes) | |
440 | -OBJS+= dtsdec.o | |
441 | +OBJS+= dtsdec.lo | |
442 | CFLAGS += $(DTS_INC) | |
d7493de8 JB |
443 | endif |
444 | ||
2a60eebe JB |
445 | ifeq ($(CONFIG_FAAD),yes) |
446 | -OBJS+= faad.o | |
447 | +OBJS+= faad.lo | |
ff0ca760 JB |
448 | endif |
449 | ||
450 | ifeq ($(CONFIG_FAAC),yes) | |
451 | -OBJS+= faac.o | |
452 | +OBJS+= faac.lo | |
ff0ca760 | 453 | endif |
2a60eebe | 454 | |
d7493de8 JB |
455 | ifeq ($(CONFIG_XVID),yes) |
456 | -OBJS+= xvidff.o | |
4a55007c | 457 | -OBJS+= xvid_rc.o |
d7493de8 | 458 | +OBJS+= xvidff.lo |
4a55007c | 459 | +OBJS+= xvid_rc.lo |
d7493de8 JB |
460 | endif |
461 | ||
462 | ifeq ($(CONFIG_X264),yes) | |
463 | -OBJS+= x264.o | |
464 | +OBJS+= x264.lo | |
d7493de8 JB |
465 | endif |
466 | ||
2a60eebe | 467 | ifeq ($(CONFIG_PP),yes) |
4a55007c | 468 | ifeq ($(BUILD_SHARED),yes) |
d7493de8 | 469 | -EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF) |
2a60eebe | 470 | +EXTRALIBS += libpostproc/libpostproc.la |
d7493de8 | 471 | +EXTRADEPS += libpostproc/libpostproc.la |
2a60eebe JB |
472 | else |
473 | # LIBS += libpostproc/libpostproc.a ... should be fixed | |
474 | -OBJS += libpostproc/postprocess.o | |
475 | +OBJS += libpostproc/postprocess.lo | |
539b540f JB |
476 | endif |
477 | endif | |
478 | ||
479 | ifeq ($(CONFIG_MP3LAME),yes) | |
480 | -OBJS += mp3lameaudio.o | |
481 | +OBJS += mp3lameaudio.lo | |
539b540f JB |
482 | endif |
483 | ||
d7493de8 JB |
484 | ifeq ($(CONFIG_LIBOGG),yes) |
485 | ifeq ($(CONFIG_LIBVORBIS),yes) | |
539b540f JB |
486 | -OBJS += oggvorbis.o |
487 | +OBJS += oggvorbis.lo | |
d7493de8 JB |
488 | endif |
489 | ifeq ($(CONFIG_LIBTHEORA), yes) | |
490 | -OBJS += oggtheora.o | |
491 | +OBJS += oggtheora.lo | |
d7493de8 | 492 | endif |
539b540f JB |
493 | endif |
494 | ||
d7493de8 JB |
495 | ifeq ($(CONFIG_LIBGSM),yes) |
496 | -OBJS += libgsm.o | |
497 | +OBJS += libgsm.lo | |
d7493de8 JB |
498 | endif |
499 | ||
4a55007c JB |
500 | ifeq ($(TARGET_GPROF),yes) |
501 | @@ -323,33 +324,33 @@ | |
539b540f JB |
502 | |
503 | # i386 mmx specific stuff | |
504 | ifeq ($(TARGET_MMX),yes) | |
505 | -OBJS += i386/fdct_mmx.o i386/cputest.o \ | |
506 | - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ | |
507 | - i386/idct_mmx.o i386/motion_est_mmx.o \ | |
ff0ca760 JB |
508 | - i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ |
509 | - i386/vp3dsp_sse2.o | |
539b540f JB |
510 | +OBJS += i386/fdct_mmx.lo i386/cputest.lo \ |
511 | + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \ | |
512 | + i386/idct_mmx.lo i386/motion_est_mmx.lo \ | |
ff0ca760 JB |
513 | + i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \ |
514 | + i386/vp3dsp_sse2.lo | |
4a55007c JB |
515 | ifeq ($(CONFIG_GPL),yes) |
516 | -OBJS += i386/idct_mmx_xvid.o | |
517 | +OBJS += i386/idct_mmx_xvid.lo | |
518 | endif | |
2a60eebe JB |
519 | ifdef TARGET_BUILTIN_VECTOR |
520 | -i386/fft_sse.o: CFLAGS+= -msse | |
521 | +i386/fft_sse.lo: CFLAGS+= -msse | |
ff0ca760 | 522 | depend: CFLAGS+= -msse |
539b540f | 523 | endif |
05e1eb2f | 524 | endif |
539b540f JB |
525 | |
526 | # armv4l specific stuff | |
527 | ifeq ($(TARGET_ARCH_ARMV4L),yes) | |
d7493de8 | 528 | -ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o armv4l/dsputil_arm_s.o |
539b540f | 529 | -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o |
d7493de8 | 530 | +ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo armv4l/dsputil_arm_s.lo |
539b540f | 531 | +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo |
d7493de8 JB |
532 | ifeq ($(TARGET_IWMMXT),yes) |
533 | -OBJS += armv4l/dsputil_iwmmxt.o armv4l/mpegvideo_iwmmxt.o | |
534 | +OBJS += armv4l/dsputil_iwmmxt.lo armv4l/mpegvideo_iwmmxt.lo | |
535 | endif | |
539b540f JB |
536 | endif |
537 | ||
538 | # sun mediaLib specific stuff | |
539 | # currently only works when libavcodec is used in mplayer | |
540 | ifeq ($(HAVE_MLIB),yes) | |
541 | -OBJS += mlib/dsputil_mlib.o | |
542 | +OBJS += mlib/dsputil_mlib.lo | |
543 | CFLAGS += $(MLIB_INC) | |
544 | endif | |
545 | ||
4a55007c | 546 | @@ -361,83 +362,73 @@ |
d7493de8 | 547 | |
539b540f JB |
548 | # alpha specific stuff |
549 | ifeq ($(TARGET_ARCH_ALPHA),yes) | |
550 | -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \ | |
551 | - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o | |
552 | -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o | |
553 | +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \ | |
554 | + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo | |
555 | +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo | |
d7493de8 | 556 | CFLAGS += -fforce-addr |
539b540f JB |
557 | endif |
558 | ||
559 | ifeq ($(TARGET_ARCH_POWERPC),yes) | |
560 | -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o | |
561 | +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo | |
562 | endif | |
563 | ||
564 | ifeq ($(TARGET_MMI),yes) | |
565 | -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o | |
566 | +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo | |
567 | endif | |
568 | ||
569 | ifeq ($(TARGET_ALTIVEC),yes) | |
2a60eebe | 570 | -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \ |
d7493de8 JB |
571 | - ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o \ |
572 | - ppc/dsputil_h264_altivec.o | |
2a60eebe | 573 | +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \ |
d7493de8 JB |
574 | + ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo \ |
575 | + ppc/dsputil_h264_altivec.lo | |
539b540f JB |
576 | endif |
577 | ||
2a60eebe JB |
578 | ifeq ($(TARGET_ARCH_SH4),yes) |
579 | -OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o | |
580 | +OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo | |
581 | endif | |
582 | ||
ff0ca760 JB |
583 | ifeq ($(TARGET_ARCH_SPARC),yes) |
584 | -OBJS+=sparc/dsputil_vis.o | |
585 | -sparc/%.o: sparc/%.c | |
4a55007c | 586 | - $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< |
ff0ca760 JB |
587 | +OBJS+=sparc/dsputil_vis.lo |
588 | +sparc/%.lo: sparc/%.c | |
ddf64b63 | 589 | + libtool --mode=compile --tag=CC $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< |
ff0ca760 JB |
590 | endif |
591 | ifeq ($(TARGET_ARCH_SPARC64),yes) | |
592 | CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc | |
593 | endif | |
2a60eebe | 594 | |
539b540f JB |
595 | -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) |
596 | +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S) | |
597 | OBJS := $(OBJS) $(ASM_OBJS) | |
598 | ||
4a55007c | 599 | NAME=avcodec |
d7493de8 | 600 | -LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) |
4a55007c | 601 | -ifeq ($(BUILD_SHARED),yes) |
d7493de8 | 602 | +LIBAVUTIL= $(SRC_PATH)/libavutil/libavutil.la |
4a55007c JB |
603 | LIBVERSION=$(LAVCVERSION) |
604 | LIBMAJOR=$(LAVCMAJOR) | |
605 | +ifeq ($(BUILD_SHARED),yes) | |
ff0ca760 | 606 | +RPATH= -rpath $(libdir) |
539b540f JB |
607 | +else |
608 | +RPATH= | |
609 | endif | |
610 | TESTS= imgresample-test dct-test motion-test fft-test | |
611 | ||
4a55007c | 612 | -all: $(LIB) $(SLIBNAME) |
ff0ca760 JB |
613 | +all: $(LIB) |
614 | ||
615 | amrlibs: | |
616 | $(MAKE) -C amr spclib fipoplib | |
d7493de8 | 617 | |
539b540f JB |
618 | tests: apiexample cpuid_test $(TESTS) |
619 | ||
827bfe2a | 620 | -$(LIB): $(OBJS) $(AMRLIBS) |
539b540f | 621 | - rm -f $@ |
2a60eebe | 622 | - $(AR) rc $@ $(OBJS) $(AMREXTRALIBS) |
539b540f | 623 | - $(RANLIB) $@ |
539b540f | 624 | - |
4a55007c | 625 | -$(SLIBNAME): $(OBJS) |
d7493de8 JB |
626 | -ifeq ($(CONFIG_PP),yes) |
627 | - $(MAKE) -C libpostproc | |
628 | -endif | |
05e1eb2f JB |
629 | -ifeq ($(CONFIG_WIN32),yes) |
630 | - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) | |
631 | - -lib /machine:i386 /def:$(@:.dll=.def) | |
632 | -else | |
4a55007c | 633 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) |
05e1eb2f | 634 | -endif |
827bfe2a | 635 | +$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS) |
ddf64b63 | 636 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -version-number `echo $(LIBVERSION) | tr . :` |
2a60eebe | 637 | |
539b540f JB |
638 | -dsputil.o: dsputil.c dsputil.h |
639 | +dsputil.lo: dsputil.c dsputil.h | |
640 | ||
2a60eebe JB |
641 | -libpostproc/libpostproc.a: |
642 | +libpostproc/libpostproc.la: | |
643 | $(MAKE) -C libpostproc | |
539b540f JB |
644 | |
645 | -%.o: %.c | |
4a55007c | 646 | - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
539b540f | 647 | +%.lo: %.c |
ddf64b63 | 648 | + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
539b540f | 649 | |
05e1eb2f | 650 | -%.o: %.S |
d7493de8 | 651 | - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
848dec7f | 652 | +%.lo: %.S |
ddf64b63 | 653 | + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
539b540f | 654 | |
2a60eebe | 655 | depend: $(SRCS) |
05e1eb2f | 656 | $(CC) -MM $(CFLAGS) $^ 1>.depend |
4a55007c | 657 | @@ -473,7 +464,7 @@ |
539b540f JB |
658 | |
659 | # api example program | |
660 | apiexample: apiexample.c $(LIB) | |
d7493de8 | 661 | - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm |
ddf64b63 | 662 | + libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm |
539b540f JB |
663 | |
664 | # cpuid test | |
665 | cpuid_test: i386/cputest.c | |
4a55007c | 666 | @@ -485,46 +476,32 @@ |
ff0ca760 | 667 | $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm |
539b540f | 668 | |
2a60eebe | 669 | dct-test: dct-test.o fdctref.o $(LIB) |
4a55007c | 670 | - $(CC) -o $@ $^ -lm $(LIBAVUTIL) |
ddf64b63 | 671 | + libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm $(LIBAVUTIL) |
539b540f JB |
672 | |
673 | motion-test: motion_test.o $(LIB) | |
674 | - $(CC) -o $@ $^ -lm | |
ddf64b63 | 675 | + libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm |
539b540f | 676 | |
2a60eebe | 677 | fft-test: fft-test.o $(LIB) |
d7493de8 | 678 | - $(CC) -o $@ $^ $(LIBAVUTIL) -lm |
ddf64b63 | 679 | + libtool --mode=link --tag=CC $(CC) -o $@ $^ $(LIBAVUTIL) -lm |
539b540f | 680 | |
4a55007c | 681 | -ifeq ($(BUILD_SHARED),yes) |
05e1eb2f | 682 | install: all install-headers |
4a55007c JB |
683 | -ifeq ($(CONFIG_WIN32),yes) |
684 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | |
685 | -else | |
d7493de8 | 686 | - install -d $(libdir) |
4a55007c JB |
687 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ |
688 | - $(libdir)/$(SLIBNAME_WITH_VERSION) | |
689 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
690 | - $(libdir)/$(SLIBNAME_WITH_MAJOR) | |
691 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
692 | - $(libdir)/$(SLIBNAME) | |
d7493de8 JB |
693 | - $(LDCONFIG) || true |
694 | -endif | |
695 | ifeq ($(CONFIG_PP),yes) | |
4a55007c | 696 | $(MAKE) -C libpostproc $@ |
539b540f | 697 | endif |
4a55007c JB |
698 | -else |
699 | -install: | |
700 | -endif | |
701 | + install -d $(DESTDIR)$(libdir) | |
702 | + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir) | |
539b540f | 703 | |
05e1eb2f | 704 | installlib: all install-headers |
d7493de8 JB |
705 | - install -m 644 $(LIB) "$(libdir)" |
706 | + libtool --mode=install install -m 644 $(LIB) "$(DESTDIR)$(libdir)" | |
05e1eb2f JB |
707 | |
708 | install-headers: | |
709 | - mkdir -p "$(prefix)/include/ffmpeg" | |
d7493de8 | 710 | + install -d "$(DESTDIR)$(prefix)/include/ffmpeg" |
ff0ca760 | 711 | install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \ |
05e1eb2f | 712 | - "$(prefix)/include/ffmpeg" |
d7493de8 | 713 | + "$(DESTDIR)$(prefix)/include/ffmpeg" |
4a55007c JB |
714 | install -m 644 $(SRC_PATH)/libavcodec/dsputil.h \ |
715 | - "$(prefix)/include/ffmpeg" | |
716 | - install -d "$(libdir)/pkgconfig" | |
717 | - install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig" | |
718 | + "$(DESTDIR)$(prefix)/include/ffmpeg" | |
719 | + install -d "$(DESTDIR)$(libdir)/pkgconfig" | |
720 | + install -m 644 ../libavcodec.pc "$(DESTDIR)$(libdir)/pkgconfig" | |
539b540f JB |
721 | |
722 | # | |
723 | # include dependency files if they exist | |
4a55007c JB |
724 | --- ffmpeg/libavformat/Makefile.orig 2006-01-27 00:42:29.000000000 +0100 |
725 | +++ ffmpeg/libavformat/Makefile 2006-01-29 13:58:17.064047000 +0100 | |
726 | @@ -8,81 +8,81 @@ | |
539b540f | 727 | |
d7493de8 | 728 | CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE |
539b540f | 729 | |
05e1eb2f JB |
730 | -OBJS= utils.o cutils.o os_support.o allformats.o |
731 | +OBJS= utils.lo cutils.lo os_support.lo allformats.lo | |
2a60eebe | 732 | PPOBJS= |
539b540f | 733 | |
4a55007c | 734 | # demuxers |
d7493de8 JB |
735 | -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \ |
736 | - avienc.o avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \ | |
4a55007c | 737 | - yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \ |
ff0ca760 | 738 | - nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ |
4a55007c JB |
739 | - sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \ |
740 | - ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o | |
d7493de8 JB |
741 | +OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo img2.lo raw.lo rm.lo \ |
742 | + avienc.lo avidec.lo wav.lo mmf.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \ | |
4a55007c | 743 | + yuv4mpeg.lo 4xm.lo flvdec.lo psxstr.lo idroq.lo ipmovie.lo \ |
ff0ca760 | 744 | + nut.lo wc3movie.lo mp3.lo westwood.lo segafilm.lo idcin.lo flic.lo \ |
4a55007c JB |
745 | + sierravmd.lo matroska.lo sol.lo electronicarts.lo nsvdec.lo asf.lo \ |
746 | + ogg2.lo oggparsevorbis.lo oggparsetheora.lo oggparseflac.lo daud.lo | |
747 | ||
748 | # muxers | |
749 | ifeq ($(CONFIG_MUXERS),yes) | |
750 | -OBJS+= flvenc.o movenc.o asf-enc.o | |
751 | +OBJS+= flvenc.lo movenc.lo asf-enc.lo | |
752 | endif | |
753 | ||
754 | ||
d7493de8 | 755 | AMROBJS= |
2a60eebe | 756 | ifeq ($(AMR_NB),yes) |
d7493de8 JB |
757 | -AMROBJS= amr.o |
758 | +AMROBJS= amr.lo | |
ff0ca760 JB |
759 | endif |
760 | ifeq ($(AMR_NB_FIXED),yes) | |
d7493de8 JB |
761 | -AMROBJS= amr.o |
762 | +AMROBJS= amr.lo | |
ff0ca760 JB |
763 | endif |
764 | ifeq ($(AMR_WB),yes) | |
d7493de8 JB |
765 | -AMROBJS= amr.o |
766 | +AMROBJS= amr.lo | |
2a60eebe | 767 | endif |
d7493de8 | 768 | OBJS+= $(AMROBJS) |
2a60eebe JB |
769 | |
770 | # image formats | |
ff0ca760 | 771 | -OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o |
4a55007c | 772 | -OBJS+= framehook.o |
ff0ca760 | 773 | +OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo sgi.lo |
4a55007c | 774 | +OBJS+= framehook.lo |
539b540f JB |
775 | |
776 | ifeq ($(CONFIG_VIDEO4LINUX),yes) | |
777 | -OBJS+= grab.o | |
778 | +OBJS+= grab.lo | |
779 | endif | |
780 | ||
d7493de8 JB |
781 | ifeq ($(CONFIG_BKTR),yes) |
782 | -OBJS+= grab_bktr.o | |
783 | +OBJS+= grab_bktr.lo | |
784 | endif | |
785 | ||
2a60eebe JB |
786 | ifeq ($(CONFIG_DV1394),yes) |
787 | -OBJS+= dv1394.o | |
788 | +OBJS+= dv1394.lo | |
789 | endif | |
790 | ||
d7493de8 JB |
791 | ifeq ($(CONFIG_DC1394),yes) |
792 | -OBJS+= dc1394.o | |
793 | +OBJS+= dc1394.lo | |
794 | endif | |
795 | ||
539b540f | 796 | ifeq ($(CONFIG_AUDIO_OSS),yes) |
4a55007c JB |
797 | -OBJS+= audio.o |
798 | +OBJS+= audio.lo | |
539b540f JB |
799 | endif |
800 | ||
4a55007c JB |
801 | -EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF) |
802 | +EXTRALIBS += ../libavutil/libavutil.la | |
803 | ||
539b540f | 804 | ifeq ($(CONFIG_AUDIO_BEOS),yes) |
2a60eebe JB |
805 | -PPOBJS+= beosaudio.o |
806 | +PPOBJS+= beosaudio.lo | |
539b540f JB |
807 | endif |
808 | ||
4a55007c JB |
809 | # protocols I/O |
810 | -OBJS+= avio.o aviobuf.o | |
811 | +OBJS+= avio.lo aviobuf.lo | |
812 | ||
813 | ifeq ($(CONFIG_PROTOCOLS),yes) | |
814 | -OBJS+= file.o | |
815 | +OBJS+= file.lo | |
539b540f JB |
816 | ifeq ($(CONFIG_NETWORK),yes) |
817 | -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o | |
818 | +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo | |
2a60eebe | 819 | # BeOS and Darwin network stuff |
539b540f JB |
820 | ifeq ($(NEED_INET_ATON),yes) |
821 | -OBJS+= barpainet.o | |
822 | +OBJS+= barpainet.lo | |
823 | endif | |
824 | endif | |
4a55007c | 825 | endif |
539b540f | 826 | |
d7493de8 | 827 | ifeq ($(CONFIG_LIBOGG),yes) |
539b540f JB |
828 | -OBJS+= ogg.o |
829 | +OBJS+= ogg.lo | |
830 | endif | |
831 | ||
ff0ca760 | 832 | ifeq ($(TARGET_ARCH_SPARC64),yes) |
4a55007c | 833 | @@ -90,68 +90,47 @@ |
ff0ca760 JB |
834 | endif |
835 | ||
4a55007c JB |
836 | NAME=avformat |
837 | -ifeq ($(BUILD_SHARED),yes) | |
838 | LIBVERSION=$(LAVFVERSION) | |
839 | LIBMAJOR=$(LAVFMAJOR) | |
840 | -AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil | |
841 | +ifeq ($(BUILD_SHARED),yes) | |
ff0ca760 | 842 | +RPATH= -rpath $(libdir) |
2a60eebe JB |
843 | +else |
844 | +RPATH= | |
845 | endif | |
4a55007c | 846 | +AVCLIBS+=../libavcodec/libavcodec.la ../libavutil/libavutil.la |
539b540f | 847 | |
2a60eebe JB |
848 | -SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) |
849 | +SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp) | |
539b540f | 850 | |
4a55007c | 851 | -all: $(LIB) $(SLIBNAME) |
ff0ca760 | 852 | +all: $(LIB) |
2a60eebe JB |
853 | |
854 | $(LIB): $(OBJS) $(PPOBJS) | |
539b540f | 855 | - rm -f $@ |
2a60eebe | 856 | - $(AR) rc $@ $(OBJS) $(PPOBJS) |
539b540f JB |
857 | - $(RANLIB) $@ |
858 | - | |
4a55007c | 859 | -$(SLIBNAME): $(OBJS) |
05e1eb2f | 860 | -ifeq ($(CONFIG_WIN32),yes) |
d7493de8 | 861 | - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) |
05e1eb2f JB |
862 | - -lib /machine:i386 /def:$(@:.dll=.def) |
863 | -else | |
d7493de8 | 864 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) |
ddf64b63 | 865 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :` |
05e1eb2f | 866 | -endif |
2a60eebe JB |
867 | |
868 | depend: $(SRCS) | |
869 | $(CC) -MM $(CFLAGS) $^ 1>.depend | |
4a55007c JB |
870 | |
871 | -ifeq ($(BUILD_SHARED),yes) | |
872 | install: all install-headers | |
873 | -ifeq ($(CONFIG_WIN32),yes) | |
874 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | |
875 | -else | |
d7493de8 | 876 | - install -d $(libdir) |
4a55007c JB |
877 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ |
878 | - $(libdir)/$(SLIBNAME_WITH_VERSION) | |
879 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
880 | - $(libdir)/$(SLIBNAME_WITH_MAJOR) | |
881 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
882 | - $(libdir)/$(SLIBNAME) | |
d7493de8 | 883 | - $(LDCONFIG) || true |
4a55007c JB |
884 | -endif |
885 | -else | |
886 | -install: | |
887 | -endif | |
ff0ca760 | 888 | + install -d $(DESTDIR)$(libdir) |
d7493de8 | 889 | + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir) |
2a60eebe | 890 | |
05e1eb2f | 891 | installlib: all install-headers |
d7493de8 JB |
892 | - install -m 644 $(LIB) "$(libdir)" |
893 | + libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)" | |
05e1eb2f JB |
894 | |
895 | install-headers: | |
896 | - mkdir -p "$(prefix)/include/ffmpeg" | |
d7493de8 | 897 | + install -d "$(DESTDIR)$(prefix)/include/ffmpeg" |
2a60eebe JB |
898 | install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \ |
899 | $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \ | |
900 | $(SRC_PATH)/libavformat/rtspcodes.h \ | |
05e1eb2f | 901 | - "$(prefix)/include/ffmpeg" |
4a55007c JB |
902 | - install -d "$(libdir)/pkgconfig" |
903 | - install -m 644 ../libavformat.pc "$(libdir)/pkgconfig" | |
d7493de8 | 904 | + "$(DESTDIR)$(prefix)/include/ffmpeg" |
4a55007c JB |
905 | + install -d "$(DESTDIR)$(libdir)/pkgconfig" |
906 | + install -m 644 ../libavformat.pc "$(DESTDIR)$(libdir)/pkgconfig" | |
539b540f JB |
907 | |
908 | -%.o: %.c | |
4a55007c | 909 | - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
539b540f | 910 | +%.lo: %.c |
ddf64b63 | 911 | + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
539b540f JB |
912 | |
913 | # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings | |
d7493de8 | 914 | -%.o: %.cpp |
4a55007c | 915 | - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< |
d7493de8 | 916 | +%.lo: %.cpp |
ddf64b63 | 917 | + libtool --mode=compile --tag=CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< |
539b540f | 918 | |
4a55007c JB |
919 | clean: |
920 | rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll | |
921 | --- ffmpeg/libavutil/Makefile.orig 2006-01-27 00:42:29.000000000 +0100 | |
922 | +++ ffmpeg/libavutil/Makefile 2006-01-29 14:10:15.400940250 +0100 | |
923 | @@ -8,41 +8,34 @@ | |
d7493de8 JB |
924 | # NOTE: -I.. is needed to include config.h |
925 | CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE | |
926 | ||
927 | -OBJS= mathematics.o \ | |
928 | - integer.o \ | |
929 | - rational.o \ | |
930 | - intfloat_readwrite.o \ | |
931 | +OBJS= mathematics.lo \ | |
932 | + integer.lo \ | |
933 | + rational.lo \ | |
934 | + intfloat_readwrite.lo \ | |
935 | ||
936 | ||
937 | ifeq ($(TARGET_ARCH_SPARC64),yes) | |
938 | CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc | |
939 | endif | |
940 | ||
941 | -SRCS := $(OBJS:.o=.c) | |
942 | +SRCS := $(OBJS:.lo=.c) | |
943 | ||
4a55007c JB |
944 | NAME=avutil |
945 | -ifeq ($(BUILD_SHARED),yes) | |
946 | LIBVERSION=$(LAVUVERSION) | |
947 | LIBMAJOR=$(LAVUMAJOR) | |
948 | +ifeq ($(BUILD_SHARED),yes) | |
d7493de8 JB |
949 | +RPATH=-rpath $(libdir) |
950 | +else | |
951 | +RPATH= | |
952 | endif | |
953 | ||
4a55007c | 954 | -all: $(LIB) $(SLIBNAME) |
d7493de8 JB |
955 | +all: $(LIB) |
956 | ||
957 | $(LIB): $(OBJS) | |
958 | - rm -f $@ | |
959 | - $(AR) rc $@ $(OBJS) | |
960 | - $(RANLIB) $@ | |
961 | - | |
4a55007c | 962 | -$(SLIBNAME): $(OBJS) |
d7493de8 JB |
963 | -ifeq ($(CONFIG_WIN32),yes) |
964 | - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) | |
965 | - -lib /machine:i386 /def:$(@:.dll=.def) | |
966 | -else | |
4a55007c | 967 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) |
d7493de8 | 968 | -endif |
ddf64b63 | 969 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :` |
d7493de8 JB |
970 | |
971 | -%.o: %.c | |
4a55007c | 972 | - $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
d7493de8 | 973 | +%.lo: %.c |
ddf64b63 | 974 | + libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< |
d7493de8 JB |
975 | |
976 | depend: $(SRCS) | |
977 | $(CC) -MM $(CFLAGS) $^ 1>.depend | |
4a55007c JB |
978 | @@ -56,38 +49,24 @@ |
979 | rm -f .depend | |
980 | ||
981 | ||
982 | -ifeq ($(BUILD_SHARED),yes) | |
983 | install: all install-headers | |
984 | -ifeq ($(CONFIG_WIN32),yes) | |
985 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | |
986 | -else | |
d7493de8 | 987 | - install -d $(libdir) |
4a55007c JB |
988 | - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ |
989 | - $(libdir)/$(SLIBNAME_WITH_VERSION) | |
990 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
991 | - $(libdir)/$(SLIBNAME_WITH_MAJOR) | |
992 | - ln -sf $(SLIBNAME_WITH_VERSION) \ | |
993 | - $(libdir)/$(SLIBNAME) | |
d7493de8 | 994 | - $(LDCONFIG) || true |
4a55007c JB |
995 | -endif |
996 | -else | |
997 | -install: | |
998 | -endif | |
d7493de8 JB |
999 | + install -d $(DESTDIR)$(libdir) |
1000 | + libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir) | |
d7493de8 JB |
1001 | |
1002 | installlib: all install-headers | |
1003 | - install -m 644 $(LIB) "$(libdir)" | |
4a55007c | 1004 | + libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)" |
d7493de8 JB |
1005 | |
1006 | install-headers: | |
1007 | - mkdir -p "$(prefix)/include/ffmpeg" | |
1008 | + install -d "$(DESTDIR)$(prefix)/include/ffmpeg" | |
1009 | install -m 644 $(SRC_PATH)/libavutil/avutil.h \ | |
1010 | $(SRC_PATH)/libavutil/common.h \ | |
1011 | $(SRC_PATH)/libavutil/mathematics.h \ | |
1012 | $(SRC_PATH)/libavutil/integer.h \ | |
1013 | $(SRC_PATH)/libavutil/rational.h \ | |
1014 | $(SRC_PATH)/libavutil/intfloat_readwrite.h \ | |
1015 | - "$(prefix)/include/ffmpeg" | |
4a55007c JB |
1016 | - install -d "$(libdir)/pkgconfig" |
1017 | - install -m 644 ../libavutil.pc "$(libdir)/pkgconfig" | |
d7493de8 | 1018 | + "$(DESTDIR)$(prefix)/include/ffmpeg" |
4a55007c JB |
1019 | + install -d "$(DESTDIR)$(libdir)/pkgconfig" |
1020 | + install -m 644 ../libavutil.pc "$(DESTDIR)$(libdir)/pkgconfig" | |
d7493de8 JB |
1021 | |
1022 | # | |
1023 | # include dependency files if they exist | |
4a55007c JB |
1024 | --- ffmpeg/vhook/Makefile.orig 2006-01-27 00:42:30.000000000 +0100 |
1025 | +++ ffmpeg/vhook/Makefile 2006-01-29 14:11:18.492883250 +0100 | |
1026 | @@ -27,17 +27,17 @@ | |
ff0ca760 | 1027 | $(CC) -MM $(CFLAGS) $^ 1>.depend |
2a60eebe | 1028 | |
ff0ca760 | 1029 | install: |
d7493de8 JB |
1030 | - install -d "$(libdir)/vhook" |
1031 | - install -m 755 $(HOOKS) "$(libdir)/vhook" | |
1032 | + install -d "$(DESTDIR)$(libdir)/vhook" | |
1033 | + install -m 755 $(HOOKS) "$(DESTDIR)$(libdir)/vhook" | |
ff0ca760 | 1034 | |
4a55007c | 1035 | imlib2$(SLIBSUF): imlib2.o |
d7493de8 JB |
1036 | - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2 |
1037 | + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< -lImlib2 | |
ff0ca760 | 1038 | |
4a55007c | 1039 | drawtext$(SLIBSUF): drawtext.o |
d7493de8 JB |
1040 | - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs` |
1041 | + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< `freetype-config --libs` | |
ff0ca760 | 1042 | |
4a55007c | 1043 | %$(SLIBSUF): %.o |
d7493de8 JB |
1044 | - $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< |
1045 | + $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< | |
ff0ca760 JB |
1046 | |
1047 | clean: | |
4a55007c JB |
1048 | rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll |
1049 | --- ffmpeg/Makefile.orig 2006-01-27 00:42:27.000000000 +0100 | |
1050 | +++ ffmpeg/Makefile 2006-01-29 14:14:13.291807500 +0100 | |
ff0ca760 JB |
1051 | @@ -7,7 +7,6 @@ |
1052 | VPATH=$(SRC_PATH) | |
1053 | ||
d7493de8 | 1054 | CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE |
4a55007c | 1055 | -LDFLAGS+= -g |
ff0ca760 JB |
1056 | |
1057 | ifeq ($(TARGET_GPROF),yes) | |
1058 | CFLAGS+=-p | |
4a55007c | 1059 | @@ -36,11 +35,7 @@ |
2a60eebe | 1060 | EXTRALIBS+=-lmedia -lbe |
539b540f JB |
1061 | endif |
1062 | ||
2a60eebe JB |
1063 | -ifeq ($(BUILD_SHARED),yes) |
1064 | -DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) | |
1065 | -else | |
1066 | -DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) | |
2a60eebe | 1067 | -endif |
4a55007c | 1068 | +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la |
2a60eebe | 1069 | |
4a55007c JB |
1070 | ifeq ($(BUILD_VHOOK),yes) |
1071 | VHOOK=videohook | |
1072 | @@ -59,7 +54,7 @@ | |
2a60eebe | 1073 | |
d7493de8 | 1074 | OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O) |
2a60eebe | 1075 | SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) |
d7493de8 JB |
1076 | -FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF) |
1077 | +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la libavutil/libavutil.la | |
2a60eebe | 1078 | |
4a55007c JB |
1079 | -all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) |
1080 | +all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) | |
2a60eebe | 1081 | |
4a55007c | 1082 | @@ -68,25 +63,17 @@ |
539b540f JB |
1083 | $(MAKE) -C libavcodec all |
1084 | $(MAKE) -C libavformat all | |
1085 | ||
05e1eb2f | 1086 | -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs |
2a60eebe | 1087 | - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) |
ff0ca760 | 1088 | - |
05e1eb2f JB |
1089 | -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) |
1090 | - cp -p $< $@ | |
1091 | - $(STRIP) $@ | |
ff0ca760 | 1092 | +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o |
ddf64b63 | 1093 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) |
ff0ca760 | 1094 | |
05e1eb2f | 1095 | -ffserver$(EXESUF): ffserver.o .libs |
4a55007c | 1096 | - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) |
05e1eb2f | 1097 | +ffserver$(EXESUF): ffserver.o |
ddf64b63 | 1098 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) |
ff0ca760 JB |
1099 | |
1100 | -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs | |
1101 | - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) | |
05e1eb2f | 1102 | +ffplay$(EXESUF): ffplay.o cmdutils.o |
d18bbe3c | 1103 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o -lX11 $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) |
05e1eb2f | 1104 | |
ff0ca760 JB |
1105 | -ffplay$(EXESUF): ffplay_g$(EXESUF) |
1106 | - cp -p $< $@ | |
1107 | - $(STRIP) $@ | |
1108 | - | |
1109 | -output_example$(EXESUF): output_example.o .libs | |
2a60eebe | 1110 | - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) |
ff0ca760 | 1111 | +output_example$(EXESUF): output_example.o |
ddf64b63 | 1112 | + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) |
2a60eebe | 1113 | |
ff0ca760 | 1114 | qt-faststart$(EXESUF): qt-faststart.c |
d7493de8 | 1115 | $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF) |
4a55007c | 1116 | @@ -100,7 +87,7 @@ |
2a60eebe | 1117 | %.o: %.c |
4a55007c | 1118 | $(CC) $(CFLAGS) -c -o $@ $< |
2a60eebe JB |
1119 | |
1120 | -videohook: .libs | |
1121 | +videohook: | |
1122 | $(MAKE) -C vhook all | |
1123 | ||
ff0ca760 | 1124 | documentation: |
4a55007c | 1125 | @@ -112,8 +99,8 @@ |
d7493de8 | 1126 | $(MAKE) -C libavutil install |
539b540f | 1127 | $(MAKE) -C libavcodec install |
2a60eebe | 1128 | $(MAKE) -C libavformat install |
05e1eb2f | 1129 | - install -d "$(bindir)" |
d7493de8 JB |
1130 | - install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)" |
1131 | + install -d "$(DESTDIR)$(bindir)" | |
1132 | + libtool --mode=install install -c $(INSTALLSTRIP) $(PROG) "$(DESTDIR)$(bindir)" | |
05e1eb2f JB |
1133 | |
1134 | # create the window installer | |
1135 | wininstaller: all install | |
4a55007c | 1136 | @@ -123,8 +110,8 @@ |
2a60eebe | 1137 | install-man: |
05e1eb2f | 1138 | ifneq ($(CONFIG_WIN32),yes) |
d7493de8 | 1139 | if [ -f doc/ffmpeg.1 ] ; then \ |
ff0ca760 JB |
1140 | - install -d "$(mandir)/man1" ; \ |
1141 | - install -m 644 $(MANPAGE) "$(mandir)/man1" ; \ | |
d7493de8 JB |
1142 | + install -d "$(DESTDIR)$(mandir)/man1" ; \ |
1143 | + install -m 644 $(MANPAGE) "$(DESTDIR)$(mandir)/man1" ; \ | |
2a60eebe | 1144 | fi |
05e1eb2f | 1145 | endif |
539b540f | 1146 | |
4a55007c | 1147 | @@ -148,17 +135,13 @@ |
2a60eebe | 1148 | .depend: $(SRCS) |
ff0ca760 | 1149 | $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend |
2a60eebe JB |
1150 | |
1151 | -.libs: lib | |
1152 | - @test -f .libs || touch .libs | |
1153 | - @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done | |
1154 | - | |
4a55007c | 1155 | clean: |
d7493de8 | 1156 | $(MAKE) -C libavutil clean |
2a60eebe JB |
1157 | $(MAKE) -C libavcodec clean |
1158 | $(MAKE) -C libavformat clean | |
1159 | $(MAKE) -C tests clean | |
4a55007c JB |
1160 | $(MAKE) -C vhook clean |
1161 | - rm -f *.o *.d *~ .libs gmon.out TAGS \ | |
1162 | + rm -f *.o *.d *~ gmon.out TAGS \ | |
1163 | $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART) | |
1164 | ||
1165 | # Note well: config.log is NOT removed. | |
1166 | --- ffmpeg/configure.orig 2006-01-24 20:57:41.000000000 +0100 | |
1167 | +++ ffmpeg/configure 2006-01-29 14:17:56.061729750 +0100 | |
1168 | @@ -232,10 +232,10 @@ | |
1169 | LDCONFIG="ldconfig" | |
1170 | LIBPREF="lib" | |
1171 | LIBSUF=".a" | |
1172 | -LIB='$(LIBPREF)$(NAME)$(LIBSUF)' | |
1173 | +LIB='$(LIBPREF)$(NAME).la' | |
1174 | SLIBPREF="lib" | |
1175 | SLIBSUF=".so" | |
1176 | -SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)' | |
1177 | +SLIBNAME='$(SLIBPREF)$(NAME).la' | |
1178 | SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)' | |
1179 | SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)' | |
1180 | EXESUF="" | |
1181 | @@ -1331,10 +1331,10 @@ | |
1182 | echo "/* Automatically generated by configure - do not modify! */" > $TMPH | |
1183 | echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH | |
1184 | ||
1185 | -echo "prefix=\$(DESTDIR)$prefix" >> config.mak | |
1186 | -echo "libdir=\$(DESTDIR)$libdir" >> config.mak | |
1187 | -echo "bindir=\$(DESTDIR)$bindir" >> config.mak | |
1188 | -echo "mandir=\$(DESTDIR)$mandir" >> config.mak | |
1189 | +echo "prefix=$prefix" >> config.mak | |
1190 | +echo "libdir=$libdir" >> config.mak | |
1191 | +echo "bindir=$bindir" >> config.mak | |
1192 | +echo "mandir=$mandir" >> config.mak | |
1193 | echo "MAKE=$make" >> config.mak | |
1194 | echo "CC=$cc" >> config.mak | |
1195 | echo "AR=$ar" >> config.mak |