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
187 +EXTRADEPS = libpostproc/libpostproc.la
189 # LIBS += libpostproc/libpostproc.a ... should be fixed
190 -OBJS += libpostproc/postprocess.o
191 +OBJS += libpostproc/postprocess.lo
195 ifeq ($(CONFIG_MP3LAME),yes)
196 -OBJS += mp3lameaudio.o
197 +OBJS += mp3lameaudio.lo
198 EXTRALIBS += -lmp3lame
201 ifeq ($(CONFIG_VORBIS),yes)
203 +OBJS += oggvorbis.lo
204 EXTRALIBS += -lvorbis -lvorbisenc
207 @@ -113,74 +114,76 @@
209 # i386 mmx specific stuff
210 ifeq ($(TARGET_MMX),yes)
211 -OBJS += i386/fdct_mmx.o i386/cputest.o \
212 - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
213 - i386/idct_mmx.o i386/motion_est_mmx.o \
214 - i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
216 +OBJS += i386/fdct_mmx.lo i386/cputest.lo \
217 + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
218 + i386/idct_mmx.lo i386/motion_est_mmx.lo \
219 + i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \
220 + i386/vp3dsp_sse2.lo
221 ifdef TARGET_BUILTIN_VECTOR
222 -i386/fft_sse.o: CFLAGS+= -msse
223 +i386/fft_sse.lo: CFLAGS+= -msse
224 depend: CFLAGS+= -msse
228 # armv4l specific stuff
229 ifeq ($(TARGET_ARCH_ARMV4L),yes)
230 -ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o
231 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
232 +ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo
233 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
236 # sun mediaLib specific stuff
237 # currently only works when libavcodec is used in mplayer
238 ifeq ($(HAVE_MLIB),yes)
239 -OBJS += mlib/dsputil_mlib.o
240 +OBJS += mlib/dsputil_mlib.lo
241 CFLAGS += $(MLIB_INC)
244 # alpha specific stuff
245 ifeq ($(TARGET_ARCH_ALPHA),yes)
246 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
247 - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
248 -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
249 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
250 + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
251 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
252 CFLAGS += -fforce-addr -freduce-all-givs
255 ifeq ($(TARGET_ARCH_POWERPC),yes)
256 -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
257 +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
260 ifeq ($(TARGET_MMI),yes)
261 -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
262 +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
265 ifeq ($(TARGET_ALTIVEC),yes)
266 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
267 - ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o
268 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
269 + ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo
272 ifeq ($(TARGET_ARCH_SH4),yes)
273 -OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
274 +OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo
277 ifeq ($(TARGET_ARCH_SPARC),yes)
278 -OBJS+=sparc/dsputil_vis.o
279 -sparc/%.o: sparc/%.c
280 - $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
281 +OBJS+=sparc/dsputil_vis.lo
282 +sparc/%.lo: sparc/%.c
283 + libtool --mode=compile $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
285 ifeq ($(TARGET_ARCH_SPARC64),yes)
286 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
289 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
290 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
291 OBJS := $(OBJS) $(ASM_OBJS)
293 -LIB= $(LIBPREF)avcodec$(LIBSUF)
295 ifeq ($(BUILD_SHARED),yes)
296 -SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
297 +RPATH= -rpath $(libdir)
301 TESTS= imgresample-test dct-test motion-test fft-test
307 $(MAKE) -C amr spclib fipoplib
308 @@ -188,28 +191,18 @@
309 tests: apiexample cpuid_test $(TESTS)
311 -$(LIB): $(OBJS) $(AMRLIBS)
313 - $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
317 -ifeq ($(CONFIG_WIN32),yes)
318 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
319 - -lib /machine:i386 /def:$(@:.dll=.def)
321 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
323 +$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
324 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
326 -dsputil.o: dsputil.c dsputil.h
327 +dsputil.lo: dsputil.c dsputil.h
329 -libpostproc/libpostproc.a:
330 +libpostproc/libpostproc.la:
331 $(MAKE) -C libpostproc
334 - $(CC) $(CFLAGS) -c -o $@ $<
336 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
339 - $(CC) $(CFLAGS) -c -o $@ $<
341 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
344 $(CC) -MM $(CFLAGS) $^ 1>.depend
347 # api example program
348 apiexample: apiexample.c $(LIB)
349 - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
350 + libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
353 cpuid_test: i386/cputest.c
354 @@ -255,37 +248,36 @@
355 $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
357 dct-test: dct-test.o fdctref.o $(LIB)
359 + libtool --mode=link $(CC) -o $@ $^ -lm
361 motion-test: motion_test.o $(LIB)
363 + libtool --mode=link $(CC) -o $@ $^ -lm
365 fft-test: fft-test.o $(LIB)
367 + libtool --mode=link $(CC) -o $@ $^ -lm
369 ifeq ($(BUILD_SHARED),yes)
370 install: all install-headers
371 ifeq ($(CONFIG_WIN32),yes)
372 - install -s -m 755 $(SLIB) "$(prefix)"
373 + install -m 755 $(SLIB) "$(prefix)"
375 - install -d $(prefix)/lib
376 - install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
377 - ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
379 + $(MAKE) -C libpostproc install
380 + install -d $(DESTDIR)$(libdir)
381 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
387 installlib: all install-headers
388 - install -m 644 $(LIB) $(prefix)/lib
389 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
392 - mkdir -p "$(prefix)/include/ffmpeg"
393 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
394 install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
395 $(SRC_PATH)/libavcodec/common.h \
396 $(SRC_PATH)/libavcodec/rational.h \
397 - "$(prefix)/include/ffmpeg"
398 + $(DESTDIR)$(prefix)/include/ffmpeg
401 # include dependency files if they exist
402 --- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig 2004-04-24 17:16:23.000000000 +0200
403 +++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2004-10-20 00:25:38.696960976 +0200
406 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
408 -OBJS= utils.o cutils.o os_support.o allformats.o
409 +OBJS= utils.lo cutils.lo os_support.lo allformats.lo
413 -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
414 - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
415 - yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
416 - nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
417 - sierravmd.o matroska.o
418 +OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo raw.lo rm.lo \
419 + avienc.lo avidec.lo wav.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \
420 + yuv4mpeg.lo 4xm.lo flvenc.lo flvdec.lo movenc.lo psxstr.lo idroq.lo ipmovie.lo \
421 + nut.lo wc3movie.lo mp3.lo westwood.lo segafilm.lo idcin.lo flic.lo \
422 + sierravmd.lo matroska.lo
424 ifeq ($(CONFIG_RISKY),yes)
435 ifeq ($(AMR_NB_FIXED),yes)
445 -OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
446 +OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo sgi.lo
448 -OBJS+= avio.o aviobuf.o file.o
450 +OBJS+= avio.lo aviobuf.lo file.lo
453 ifeq ($(CONFIG_VIDEO4LINUX),yes)
458 ifeq ($(CONFIG_DV1394),yes)
463 ifeq ($(CONFIG_AUDIO_OSS),yes)
468 ifeq ($(CONFIG_AUDIO_BEOS),yes)
469 -PPOBJS+= beosaudio.o
470 +PPOBJS+= beosaudio.lo
471 EXTRALIBS+=-lbe -lmedia
472 -# this should be the default !
473 -EXTRALIBS+=-lavcodec -L../libavcodec
476 ifeq ($(CONFIG_NETWORK),yes)
477 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
478 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
479 # BeOS and Darwin network stuff
480 ifeq ($(NEED_INET_ATON),yes)
486 ifeq ($(CONFIG_VORBIS),yes)
491 ifeq ($(TARGET_ARCH_SPARC64),yes)
492 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
495 -LIB= $(LIBPREF)avformat$(LIBSUF)
497 ifeq ($(BUILD_SHARED),yes)
498 -SLIB= $(SLIBPREF)avformat$(SLIBSUF)
499 +RPATH= -rpath $(libdir)
504 -SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
505 +SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp)
510 $(LIB): $(OBJS) $(PPOBJS)
512 - $(AR) rc $@ $(OBJS) $(PPOBJS)
516 -ifeq ($(CONFIG_WIN32),yes)
517 - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
518 - -lib /machine:i386 /def:$(@:.dll=.def)
520 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
522 + libtool --mode=link $(CC) $(LDOPT) -o $@ $(OBJS) $(PPOBJS) ../libavcodec/libavcodec.la $(RPATH) -release $(VERSION)
525 $(CC) -MM $(CFLAGS) $^ 1>.depend
527 ifeq ($(BUILD_SHARED),yes)
528 install: all install-headers
529 ifeq ($(CONFIG_WIN32),yes)
530 - install -s -m 755 $(SLIB) "$(prefix)"
531 + install -m 755 $(SLIB) "$(prefix)"
533 - install -d $(prefix)/lib
534 - install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
535 - ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
537 + install -d $(DESTDIR)$(libdir)
538 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
544 installlib: all install-headers
545 - install -m 644 $(LIB) $(prefix)/lib
546 + libtool --mode=install install $(LIB) $(DESTDIR)$(libdir)
549 - mkdir -p "$(prefix)/include/ffmpeg"
550 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
551 install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
552 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
553 $(SRC_PATH)/libavformat/rtspcodes.h \
554 - "$(prefix)/include/ffmpeg"
555 + $(DESTDIR)$(prefix)/include/ffmpeg
558 - $(CC) $(CFLAGS) -c -o $@ $<
560 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
562 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
564 - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
565 + libtool --mode=compile --tag CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
568 rm -f *.o *.d .depend *~ *.a $(LIB)
569 --- ffmpeg-0.4.9-pre1/vhook/Makefile.orig 2004-07-08 13:02:04.000000000 +0200
570 +++ ffmpeg-0.4.9-pre1/vhook/Makefile 2004-10-20 00:30:56.633627256 +0200
572 $(CC) -MM $(CFLAGS) $^ 1>.depend
575 - install -d "$(prefix)/lib/vhook"
576 - install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
577 + install -d $(DESTDIR)$(libdir)/vhook
578 + install -m 755 $(HOOKS) $(DESTDIR)$(libdir)/vhook
581 - $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
582 + $(CC) -o $@ $(SHFLAGS) $< -lImlib2
584 drawtext.so: drawtext.o
585 - $(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
586 + $(CC) -o $@ $(SHFLAGS) $< `freetype-config --libs`
589 - $(CC) -g -o $@ $(SHFLAGS) $<
590 + $(CC) -o $@ $(SHFLAGS) $<
593 rm -f *.o *.d .depend *.so *~
594 --- ffmpeg-0.4.9-pre1/configure.orig 2004-10-19 00:30:24.568298000 +0200
595 +++ ffmpeg-0.4.9-pre1/configure 2004-10-20 00:05:29.157838872 +0200
597 echo "Standard options:"
598 echo " --help print this message"
599 echo " --prefix=PREFIX install in PREFIX [$prefix]"
600 +echo " --libdir=LIBDIR library directory [PREFIX/lib]"
601 echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
602 echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]"
603 echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
608 +libdir="$prefix/lib"
614 --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
616 + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
618 --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
620 --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
622 mandir="${prefix}/man"
625 +if test x"$libdir" = x""; then
626 +mandir="${prefix}/lib"
629 echo "Install prefix $prefix"
630 echo "Source path $source_path"
631 echo "C compiler $cc"
632 @@ -1006,6 +1014,7 @@
634 echo "prefix=$prefix" >> config.mak
635 echo "bindir=$bindir" >> config.mak
636 +echo "libdir=$libdir" >> config.mak
637 echo "mandir=$mandir" >> config.mak
638 echo "MAKE=$make" >> config.mak
639 echo "CC=$cc" >> config.mak
640 --- ffmpeg-0.4.9-pre1/Makefile.orig 2004-07-08 13:02:04.000000000 +0200
641 +++ ffmpeg-0.4.9-pre1/Makefile 2004-10-20 00:29:10.036832432 +0200
645 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
648 ifeq ($(TARGET_GPROF),yes)
651 EXTRALIBS+=-lmedia -lbe
654 -ifeq ($(BUILD_SHARED),yes)
655 -DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
657 -DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
658 +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
659 ifeq ($(CONFIG_MP3LAME),yes)
664 ifeq ($(CONFIG_VORBIS),yes)
665 EXTRALIBS+=-logg -lvorbis -lvorbisenc
668 OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
669 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
670 -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
671 +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la
673 all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
676 $(MAKE) -C libavcodec all
677 $(MAKE) -C libavformat all
679 -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
680 - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
682 -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
685 +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o
686 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
688 -ffserver$(EXESUF): ffserver.o .libs
689 - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
690 +ffserver$(EXESUF): ffserver.o
691 + libtool --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
693 -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
694 - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
695 +ffplay$(EXESUF): ffplay.o cmdutils.o
696 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
698 -ffplay$(EXESUF): ffplay_g$(EXESUF)
702 -output_example$(EXESUF): output_example.o .libs
703 - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
704 +output_example$(EXESUF): output_example.o
705 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
707 qt-faststart$(EXESUF): qt-faststart.c
708 $(CC) qt-faststart.c -o qt-faststart$(EXESUF)
711 $(CC) $(CFLAGS) -c -o $@ $<
718 @@ -121,11 +108,11 @@
722 -install: all install-man $(INSTALLVHOOK)
723 +install: install-man $(INSTALLVHOOK)
724 $(MAKE) -C libavcodec install
725 $(MAKE) -C libavformat install
726 - install -d "$(bindir)"
727 - install -c -s -m 755 $(PROG) "$(bindir)"
728 + install -d $(DESTDIR)$(bindir)
729 + libtool --mode=install install $(PROG) $(DESTDIR)$(bindir)
731 # create the window installer
732 wininstaller: all install
735 ifneq ($(CONFIG_WIN32),yes)
736 if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
737 - install -d "$(mandir)/man1" ; \
738 - install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
739 + install -d $(DESTDIR)$(mandir)/man1 ; \
740 + install -m 644 $(MANPAGE) $(DESTDIR)$(mandir)/man1 ; \
744 @@ -159,15 +146,11 @@
746 $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
749 - @test -f .libs || touch .libs
750 - @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
753 $(MAKE) -C libavcodec clean
754 $(MAKE) -C libavformat clean
755 $(MAKE) -C tests clean
756 - rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
757 + rm -f *.o *.d *~ .depend gmon.out TAGS $(PROG) $(PROGTEST)
760 $(MAKE) -C vhook clean