1 --- ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile.orig 2003-05-11 13:26:35.000000000 +0200
2 +++ ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile 2004-10-20 00:06:07.937943400 +0200
5 include ../../config.mak
7 -ifeq ($(SHARED_PP),yes)
8 -SPPLIB = libpostproc.so
11 -PPLIB = libpostproc.a
12 +PPLIB = libpostproc.la
15 -SPPOBJS=postprocess_pic.o
16 +PPOBJS=postprocess.lo
18 CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
19 # -I/usr/X11R6/include/
25 - $(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
27 + libtool --mode=compile $(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
29 -all: $(SWSLIB) $(PPLIB) $(SPPLIB)
30 +all: $(SWSLIB) $(PPLIB)
35 $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
37 ifeq ($(SHARED_PP),yes)
38 -postprocess_pic.o: postprocess.c
39 - $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
41 -$(SPPLIB): $(SPPOBJS)
42 - $(CC) -shared -Wl,-soname,$(SPPLIB).0 \
43 - -o $(SPPLIB) $(SPPOBJS)
44 +RPATH= -rpath $(libdir)
51 - $(AR) rc $@ $(PPOBJS)
53 + libtool --mode=link $(CC) -o $(PPLIB) $(PPOBJS) $(RPATH) -version-info 0:1:0
56 ifeq ($(SHARED_PP),yes)
57 - install -d $(prefix)/lib
58 - install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
59 - ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
61 - mkdir -p $(prefix)/include/postproc
62 - install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
63 + install -d $(DESTDIR)$(libdir)
64 + libtool --mode=install install -m 755 $(PPLIB) $(DESTDIR)$(libdir)
65 + install -d $(DESTDIR)$(prefix)/include/postproc
66 + install -m 644 postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
70 --- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig 2004-06-18 15:11:15.000000000 +0200
71 +++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2004-10-20 00:22:26.825129928 +0200
73 # NOTE: -I.. is needed to include config.h
74 CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
76 -OBJS= common.o utils.o mem.o allcodecs.o \
77 - mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
78 - mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
79 - motion_est.o imgconvert.o imgresample.o \
80 - mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
81 - ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
82 - fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
83 - vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
84 - roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
85 - msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
86 - smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
87 - flac.o vp3dsp.o integer.o
88 +OBJS= common.lo utils.lo mem.lo allcodecs.lo \
89 + mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo \
90 + mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo resample2.lo dsputil.lo \
91 + motion_est.lo imgconvert.lo imgresample.lo \
92 + mpeg12.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
93 + ratecontrol.lo adpcm.lo eval.lo dv.lo error_resilience.lo \
94 + fft.lo mdct.lo mace.lo huffyuv.lo cyuv.lo opts.lo raw.lo h264.lo golomb.lo \
95 + vp3.lo asv1.lo 4xm.lo cabac.lo ffv1.lo ra144.lo ra288.lo vcr1.lo cljr.lo \
96 + roqvideo.lo dpcm.lo interplayvideo.lo xan.lo rpza.lo cinepak.lo msrle.lo \
97 + msvideo1.lo vqavideo.lo idcinvideo.lo adx.lo rational.lo faandct.lo 8bps.lo \
98 + smc.lo parser.lo flicvideo.lo truemotion1.lo vmdav.lo lcl.lo qtrle.lo g726.lo \
99 + flac.lo vp3dsp.lo integer.lo
102 ifeq ($(AMR_NB_FIXED),yes)
104 -AMREXTRALIBS+= amr/*.o
106 +AMREXTRALIBS+= amr/*.lo
110 -OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
111 +OBJS+= amr.lo amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
112 CLEANAMR=cleanamrfloat
116 ifeq ($(HAVE_PTHREADS),yes)
121 ifeq ($(HAVE_W32THREADS),yes)
127 -OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
128 - amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
129 - amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
130 - amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
131 - amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
132 - amrwb_float/enc_util.o amrwb_float/if_rom.o
133 +OBJS+= amr.lo amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
134 + amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \
135 + amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \
136 + amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \
137 + amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \
138 + amrwb_float/enc_util.lo amrwb_float/if_rom.lo
140 CLEANAMRWB=cleanamrwbfloat
143 # codecs which are patented in some non free countries like the us
144 ifeq ($(CONFIG_RISKY),yes)
145 -OBJS+= h263.o h261.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
146 +OBJS+= h263.lo h261.lo msmpeg4.lo h263dec.lo svq1.lo rv10.lo wmadec.lo indeo3.lo
149 ifeq ($(HAVE_XVMC_ACCEL),yes)
154 # currently using liba52 for ac3 decoding
155 ifeq ($(CONFIG_AC3),yes)
159 # using builtin liba52 or runtime linked liba52.so.0
160 ifneq ($(CONFIG_A52BIN),yes)
161 -OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
162 - liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
163 +OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
164 + liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo
168 ifeq ($(CONFIG_FAAD),yes)
171 ifeq ($(CONFIG_FAADBIN),yes)
177 ifeq ($(CONFIG_FAAC),yes)
183 ifeq ($(CONFIG_PP),yes)
184 ifeq ($(SHARED_PP),yes)
185 -EXTRALIBS += -lpostproc
186 +EXTRALIBS += libpostproc/libpostproc.la
188 # LIBS += libpostproc/libpostproc.a ... should be fixed
189 -OBJS += libpostproc/postprocess.o
190 +OBJS += libpostproc/postprocess.lo
194 ifeq ($(CONFIG_MP3LAME),yes)
195 -OBJS += mp3lameaudio.o
196 +OBJS += mp3lameaudio.lo
197 EXTRALIBS += -lmp3lame
200 ifeq ($(CONFIG_VORBIS),yes)
202 +OBJS += oggvorbis.lo
203 EXTRALIBS += -lvorbis -lvorbisenc
206 @@ -113,74 +113,76 @@
208 # i386 mmx specific stuff
209 ifeq ($(TARGET_MMX),yes)
210 -OBJS += i386/fdct_mmx.o i386/cputest.o \
211 - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
212 - i386/idct_mmx.o i386/motion_est_mmx.o \
213 - i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
215 +OBJS += i386/fdct_mmx.lo i386/cputest.lo \
216 + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
217 + i386/idct_mmx.lo i386/motion_est_mmx.lo \
218 + i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \
219 + i386/vp3dsp_sse2.lo
220 ifdef TARGET_BUILTIN_VECTOR
221 -i386/fft_sse.o: CFLAGS+= -msse
222 +i386/fft_sse.lo: CFLAGS+= -msse
223 depend: CFLAGS+= -msse
227 # armv4l specific stuff
228 ifeq ($(TARGET_ARCH_ARMV4L),yes)
229 -ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o
230 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
231 +ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo
232 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
235 # sun mediaLib specific stuff
236 # currently only works when libavcodec is used in mplayer
237 ifeq ($(HAVE_MLIB),yes)
238 -OBJS += mlib/dsputil_mlib.o
239 +OBJS += mlib/dsputil_mlib.lo
240 CFLAGS += $(MLIB_INC)
243 # alpha specific stuff
244 ifeq ($(TARGET_ARCH_ALPHA),yes)
245 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
246 - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
247 -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
248 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
249 + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
250 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
251 CFLAGS += -fforce-addr -freduce-all-givs
254 ifeq ($(TARGET_ARCH_POWERPC),yes)
255 -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
256 +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
259 ifeq ($(TARGET_MMI),yes)
260 -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
261 +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
264 ifeq ($(TARGET_ALTIVEC),yes)
265 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
266 - ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o
267 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
268 + ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo
271 ifeq ($(TARGET_ARCH_SH4),yes)
272 -OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
273 +OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo
276 ifeq ($(TARGET_ARCH_SPARC),yes)
277 -OBJS+=sparc/dsputil_vis.o
278 -sparc/%.o: sparc/%.c
279 - $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
280 +OBJS+=sparc/dsputil_vis.lo
281 +sparc/%.lo: sparc/%.c
282 + libtool --mode=compile $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
284 ifeq ($(TARGET_ARCH_SPARC64),yes)
285 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
288 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
289 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
290 OBJS := $(OBJS) $(ASM_OBJS)
292 -LIB= $(LIBPREF)avcodec$(LIBSUF)
294 ifeq ($(BUILD_SHARED),yes)
295 -SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
296 +RPATH= -rpath $(libdir)
300 TESTS= imgresample-test dct-test motion-test fft-test
306 $(MAKE) -C amr spclib fipoplib
307 @@ -188,28 +190,18 @@
308 tests: apiexample cpuid_test $(TESTS)
310 $(LIB): $(OBJS) $(AMRLIBS)
312 - $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
316 -ifeq ($(CONFIG_WIN32),yes)
317 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
318 - -lib /machine:i386 /def:$(@:.dll=.def)
320 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
322 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
324 -dsputil.o: dsputil.c dsputil.h
325 +dsputil.lo: dsputil.c dsputil.h
327 -libpostproc/libpostproc.a:
328 +libpostproc/libpostproc.la:
329 $(MAKE) -C libpostproc
332 - $(CC) $(CFLAGS) -c -o $@ $<
334 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
337 - $(CC) $(CFLAGS) -c -o $@ $<
339 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
342 $(CC) -MM $(CFLAGS) $^ 1>.depend
345 # api example program
346 apiexample: apiexample.c $(LIB)
347 - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
348 + libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
351 cpuid_test: i386/cputest.c
352 @@ -255,37 +247,35 @@
353 $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
355 dct-test: dct-test.o fdctref.o $(LIB)
357 + libtool --mode=link $(CC) -o $@ $^ -lm
359 motion-test: motion_test.o $(LIB)
361 + libtool --mode=link $(CC) -o $@ $^ -lm
363 fft-test: fft-test.o $(LIB)
365 + libtool --mode=link $(CC) -o $@ $^ -lm
367 ifeq ($(BUILD_SHARED),yes)
368 install: all install-headers
369 ifeq ($(CONFIG_WIN32),yes)
370 - install -s -m 755 $(SLIB) "$(prefix)"
371 + install -m 755 $(SLIB) "$(prefix)"
373 - install -d $(prefix)/lib
374 - install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
375 - ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
377 + install -d $(DESTDIR)$(libdir)
378 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
384 installlib: all install-headers
385 - install -m 644 $(LIB) $(prefix)/lib
386 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
389 - mkdir -p "$(prefix)/include/ffmpeg"
390 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
391 install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
392 $(SRC_PATH)/libavcodec/common.h \
393 $(SRC_PATH)/libavcodec/rational.h \
394 - "$(prefix)/include/ffmpeg"
395 + $(DESTDIR)$(prefix)/include/ffmpeg
398 # include dependency files if they exist
399 --- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2004-04-24 17:16:23.000000000 +0200
400 +++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2004-10-20 00:25:38.696960976 +0200
403 CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
405 -OBJS= utils.o cutils.o os_support.o allformats.o
406 +OBJS= utils.lo cutils.lo os_support.lo allformats.lo
410 -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
411 - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
412 - yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
413 - nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
414 - sierravmd.o matroska.o
415 +OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo raw.lo rm.lo \
416 + avienc.lo avidec.lo wav.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \
417 + yuv4mpeg.lo 4xm.lo flvenc.lo flvdec.lo movenc.lo psxstr.lo idroq.lo ipmovie.lo \
418 + nut.lo wc3movie.lo mp3.lo westwood.lo segafilm.lo idcin.lo flic.lo \
419 + sierravmd.lo matroska.lo
421 ifeq ($(CONFIG_RISKY),yes)
432 ifeq ($(AMR_NB_FIXED),yes)
442 -OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
443 +OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo sgi.lo
445 -OBJS+= avio.o aviobuf.o file.o
447 +OBJS+= avio.lo aviobuf.lo file.lo
450 ifeq ($(CONFIG_VIDEO4LINUX),yes)
455 ifeq ($(CONFIG_DV1394),yes)
460 ifeq ($(CONFIG_AUDIO_OSS),yes)
465 ifeq ($(CONFIG_AUDIO_BEOS),yes)
466 -PPOBJS+= beosaudio.o
467 +PPOBJS+= beosaudio.lo
468 EXTRALIBS+=-lbe -lmedia
469 -# this should be the default !
470 -EXTRALIBS+=-lavcodec -L../libavcodec
473 ifeq ($(CONFIG_NETWORK),yes)
474 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
475 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
476 # BeOS and Darwin network stuff
477 ifeq ($(NEED_INET_ATON),yes)
483 ifeq ($(CONFIG_VORBIS),yes)
488 ifeq ($(TARGET_ARCH_SPARC64),yes)
489 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
492 -LIB= $(LIBPREF)avformat$(LIBSUF)
494 ifeq ($(BUILD_SHARED),yes)
495 -SLIB= $(SLIBPREF)avformat$(SLIBSUF)
496 +RPATH= -rpath $(libdir)
501 -SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
502 +SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp)
507 $(LIB): $(OBJS) $(PPOBJS)
509 - $(AR) rc $@ $(OBJS) $(PPOBJS)
513 -ifeq ($(CONFIG_WIN32),yes)
514 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
515 - -lib /machine:i386 /def:$(@:.dll=.def)
517 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
519 + libtool --mode=link $(CC) $(LDOPT) -o $@ $(OBJS) $(PPOBJS) ../libavcodec/libavcodec.la $(RPATH) -release $(VERSION)
522 $(CC) -MM $(CFLAGS) $^ 1>.depend
524 ifeq ($(BUILD_SHARED),yes)
525 install: all install-headers
526 ifeq ($(CONFIG_WIN32),yes)
527 - install -s -m 755 $(SLIB) "$(prefix)"
528 + install -m 755 $(SLIB) "$(prefix)"
530 - install -d $(prefix)/lib
531 - install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
532 - ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
534 + install -d $(DESTDIR)$(libdir)
535 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
541 installlib: all install-headers
542 - install -m 644 $(LIB) $(prefix)/lib
543 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
546 - mkdir -p "$(prefix)/include/ffmpeg"
547 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
548 install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
549 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
550 $(SRC_PATH)/libavformat/rtspcodes.h \
551 - "$(prefix)/include/ffmpeg"
552 + $(DESTDIR)$(prefix)/include/ffmpeg
555 - $(CC) $(CFLAGS) -c -o $@ $<
557 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
559 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
561 - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
562 + libtool --mode=compile --tag CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
565 rm -f *.o *.d .depend *~ *.a $(LIB)
566 --- ffmpeg-0.4.9-pre1/vhook/Makefile.orig 2004-07-08 13:02:04.000000000 +0200
567 +++ ffmpeg-0.4.9-pre1/vhook/Makefile 2004-10-20 00:30:56.633627256 +0200
569 $(CC) -MM $(CFLAGS) $^ 1>.depend
572 - install -d "$(prefix)/lib/vhook"
573 - install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
574 + install -d $(DESTDIR)$(libdir)/vhook
575 + install -m 755 $(HOOKS) $(DESTDIR)$(libdir)/vhook
578 - $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
579 + $(CC) -o $@ $(SHFLAGS) $< -lImlib2
581 drawtext.so: drawtext.o
582 - $(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
583 + $(CC) -o $@ $(SHFLAGS) $< `freetype-config --libs`
586 - $(CC) -g -o $@ $(SHFLAGS) $<
587 + $(CC) -o $@ $(SHFLAGS) $<
590 rm -f *.o *.d .depend *.so *~
591 --- ffmpeg-0.4.9-pre1/configure.orig 2004-10-19 00:30:24.568298000 +0200
592 +++ ffmpeg-0.4.9-pre1/configure 2004-10-20 00:05:29.157838872 +0200
594 echo "Standard options:"
595 echo " --help print this message"
596 echo " --prefix=PREFIX install in PREFIX [$prefix]"
597 +echo " --libdir=LIBDIR library directory [PREFIX/lib]"
598 echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
599 echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]"
600 echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
605 +libdir="$prefix/lib"
611 --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
613 + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
615 --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
617 --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
619 mandir="${prefix}/man"
622 +if test x"$libdir" = x""; then
623 +mandir="${prefix}/lib"
626 echo "Install prefix $prefix"
627 echo "Source path $source_path"
628 echo "C compiler $cc"
629 @@ -1006,6 +1014,7 @@
631 echo "prefix=$prefix" >> config.mak
632 echo "bindir=$bindir" >> config.mak
633 +echo "libdir=$libdir" >> config.mak
634 echo "mandir=$mandir" >> config.mak
635 echo "MAKE=$make" >> config.mak
636 echo "CC=$cc" >> config.mak
637 --- ffmpeg-0.4.9-pre1/Makefile.orig 2004-07-08 13:02:04.000000000 +0200
638 +++ ffmpeg-0.4.9-pre1/Makefile 2004-10-20 00:29:10.036832432 +0200
642 CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
645 ifeq ($(TARGET_GPROF),yes)
648 EXTRALIBS+=-lmedia -lbe
651 -ifeq ($(BUILD_SHARED),yes)
652 -DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
654 -DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
655 +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
656 ifeq ($(CONFIG_MP3LAME),yes)
661 ifeq ($(CONFIG_VORBIS),yes)
662 EXTRALIBS+=-logg -lvorbis -lvorbisenc
665 OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
666 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
667 -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
668 +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la
670 all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
673 $(MAKE) -C libavcodec all
674 $(MAKE) -C libavformat all
676 -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
677 - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
679 -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
682 +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o
683 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
685 -ffserver$(EXESUF): ffserver.o .libs
686 - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
687 +ffserver$(EXESUF): ffserver.o
688 + libtool --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
690 -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
691 - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
692 +ffplay$(EXESUF): ffplay.o cmdutils.o
693 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
695 -ffplay$(EXESUF): ffplay_g$(EXESUF)
699 -output_example$(EXESUF): output_example.o .libs
700 - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
701 +output_example$(EXESUF): output_example.o
702 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
704 qt-faststart$(EXESUF): qt-faststart.c
705 $(CC) qt-faststart.c -o qt-faststart$(EXESUF)
708 $(CC) $(CFLAGS) -c -o $@ $<
715 @@ -121,11 +108,11 @@
719 -install: all install-man $(INSTALLVHOOK)
720 +install: install-man $(INSTALLVHOOK)
721 $(MAKE) -C libavcodec install
722 $(MAKE) -C libavformat install
723 - install -d "$(bindir)"
724 - install -c -s -m 755 $(PROG) "$(bindir)"
725 + install -d $(DESTDIR)$(bindir)
726 + libtool --mode=install install $(PROG) $(DESTDIR)$(bindir)
728 # create the window installer
729 wininstaller: all install
732 ifneq ($(CONFIG_WIN32),yes)
733 if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
734 - install -d "$(mandir)/man1" ; \
735 - install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
736 + install -d $(DESTDIR)$(mandir)/man1 ; \
737 + install -m 644 $(MANPAGE) $(DESTDIR)$(mandir)/man1 ; \
741 @@ -159,15 +146,11 @@
743 $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
746 - @test -f .libs || touch .libs
747 - @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
750 $(MAKE) -C libavcodec clean
751 $(MAKE) -C libavformat clean
752 $(MAKE) -C tests clean
753 - rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
754 + rm -f *.o *.d *~ .depend gmon.out TAGS $(PROG) $(PROGTEST)
757 $(MAKE) -C vhook clean