1 diff -Nur ffmpeg-0.4.7.orig/libavcodec/libpostproc/Makefile ffmpeg-0.4.7/libavcodec/libpostproc/Makefile
2 --- ffmpeg-0.4.7.orig/libavcodec/libpostproc/Makefile 2003-08-25 00:29:50.000000000 +0200
3 +++ ffmpeg-0.4.7/libavcodec/libpostproc/Makefile 2003-09-04 20:25:27.891853304 +0200
6 include ../../config.mak
8 -ifeq ($(SHARED_PP),yes)
9 -SPPLIB = libpostproc.so
12 -PPLIB = libpostproc.a
13 +PPLIB = libpostproc.la
16 -SPPOBJS=postprocess_pic.o
17 +PPOBJS=postprocess.lo
19 -CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
20 +CFLAGS = $(OPT) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
21 # -I/usr/X11R6/include/
28 - $(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
30 + libtool --mode=compile $(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
32 -all: $(SWSLIB) $(PPLIB) $(SPPLIB)
33 +all: $(SWSLIB) $(PPLIB)
38 $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
40 ifeq ($(SHARED_PP),yes)
41 -postprocess_pic.o: postprocess.c
42 - $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
44 -$(SPPLIB): $(SPPOBJS)
45 - $(CC) -shared -Wl,-soname,$(SPPLIB).0 \
46 - -o $(SPPLIB) $(SPPOBJS)
47 +RPATH= -rpath $(prefix)/lib
54 - $(AR) rc $@ $(PPOBJS)
56 + libtool --mode=link $(CC) -o $(PPLIB) $(PPOBJS) $(RPATH) -version-info 0:1:0
59 ifeq ($(SHARED_PP),yes)
60 - install -d $(prefix)/lib
61 - install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
62 - ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
64 - mkdir -p $(prefix)/include/postproc
65 - install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
66 + install -d $(DESTDIR)$(prefix)/lib
67 + libtool --mode=install install -m 755 $(PPLIB) $(DESTDIR)$(prefix)/lib
68 + install -d $(DESTDIR)$(prefix)/include/postproc
69 + install -m 644 postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
73 diff -Nur ffmpeg-0.4.7.orig/libavcodec/Makefile ffmpeg-0.4.7/libavcodec/Makefile
74 --- ffmpeg-0.4.7.orig/libavcodec/Makefile 2003-09-04 19:57:13.000000000 +0200
75 +++ ffmpeg-0.4.7/libavcodec/Makefile 2003-09-04 20:22:58.144618344 +0200
77 CFLAGS= $(OPT) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
80 -OBJS= common.o utils.o mem.o allcodecs.o \
81 - mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
82 - mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
83 - motion_est.o imgconvert.o imgresample.o \
84 - mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
85 - ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
86 - fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
87 - vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.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 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
98 ifeq ($(AMR_NB_FIXED),yes)
100 -AMREXTRALIBS+= amr/*.o
102 +AMREXTRALIBS+= amr/*.lo
106 -OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
107 +OBJS+= amr.lo amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
108 CLEANAMR=cleanamrfloat
113 # codecs which are patented in some non free countries like the us
114 ifeq ($(CONFIG_RISKY),yes)
115 -OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
116 +OBJS+= h263.lo msmpeg4.lo h263dec.lo svq1.lo rv10.lo wmadec.lo indeo3.lo
119 ifeq ($(HAVE_XVMC_ACCEL),yes)
124 # currently using liba52 for ac3 decoding
125 ifeq ($(CONFIG_AC3),yes)
129 # using builtin liba52 or runtime linked liba52.so.0
130 ifneq ($(CONFIG_A52BIN),yes)
131 -OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
132 - liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
133 +OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
134 + liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo
138 ifeq ($(CONFIG_FAAD),yes)
141 ifeq ($(CONFIG_FAADBIN),yes)
146 ifeq ($(CONFIG_PP),yes)
147 ifeq ($(SHARED_PP),yes)
148 -EXTRALIBS += -lpostproc
149 +EXTRALIBS += libpostproc/libpostproc.la
151 # LIBS += libpostproc/libpostproc.a ... should be fixed
152 -OBJS += libpostproc/postprocess.o
153 +OBJS += libpostproc/postprocess.lo
157 ifeq ($(CONFIG_MP3LAME),yes)
158 -OBJS += mp3lameaudio.o
159 +OBJS += mp3lameaudio.lo
160 EXTRALIBS += -lmp3lame
163 ifeq ($(CONFIG_VORBIS),yes)
165 +OBJS += oggvorbis.lo
166 EXTRALIBS += -lvorbis -lvorbisenc
171 # i386 mmx specific stuff
172 ifeq ($(TARGET_MMX),yes)
173 -OBJS += i386/fdct_mmx.o i386/cputest.o \
174 - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
175 - i386/idct_mmx.o i386/motion_est_mmx.o \
176 - i386/simple_idct_mmx.o i386/fft_sse.o
177 +OBJS += i386/fdct_mmx.lo i386/cputest.lo \
178 + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
179 + i386/idct_mmx.lo i386/motion_est_mmx.lo \
180 + i386/simple_idct_mmx.lo i386/fft_sse.lo
181 ifdef TARGET_BUILTIN_VECTOR
182 -i386/fft_sse.o: CFLAGS+= -msse
183 +i386/fft_sse.lo: CFLAGS+= -msse
187 # armv4l specific stuff
188 ifeq ($(TARGET_ARCH_ARMV4L),yes)
189 -ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o
190 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
191 +ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo
192 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
195 # sun mediaLib specific stuff
196 # currently only works when libavcodec is used in mplayer
197 ifeq ($(HAVE_MLIB),yes)
198 -OBJS += mlib/dsputil_mlib.o
199 +OBJS += mlib/dsputil_mlib.lo
200 CFLAGS += $(MLIB_INC)
203 # alpha specific stuff
204 ifeq ($(TARGET_ARCH_ALPHA),yes)
205 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
206 - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
207 -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
208 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
209 + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
210 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
211 CFLAGS += -fforce-addr -freduce-all-givs
214 ifeq ($(TARGET_ARCH_POWERPC),yes)
215 -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
216 +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
219 ifeq ($(TARGET_MMI),yes)
220 -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
221 +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
224 ifeq ($(TARGET_ALTIVEC),yes)
225 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
226 - ppc/fft_altivec.o ppc/gmc_altivec.o
227 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
228 + ppc/fft_altivec.lo ppc/gmc_altivec.lo
231 ifeq ($(TARGET_ARCH_SH4),yes)
232 -OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
233 +OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo
237 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
238 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
239 OBJS := $(OBJS) $(ASM_OBJS)
241 -LIB= $(LIBPREF)avcodec$(LIBSUF)
243 ifeq ($(BUILD_SHARED),yes)
244 -SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
245 +RPATH= -rpath $(prefix)/lib
249 TESTS= imgresample-test dct-test motion-test fft-test
251 @@ -153,33 +155,28 @@
252 tests: apiexample cpuid_test $(TESTS)
254 $(LIB): $(OBJS) $(AMRLIBS)
256 - $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
260 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
261 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
263 -dsputil.o: dsputil.c dsputil.h
264 +dsputil.lo: dsputil.c dsputil.h
266 -libpostproc/libpostproc.a:
267 +libpostproc/libpostproc.la:
268 $(MAKE) -C libpostproc
271 - $(CC) $(CFLAGS) -c -o $@ $<
273 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
276 - $(CC) $(CFLAGS) -c -o $@ $<
277 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
279 # motion_est_alpha uses the MVI extension, which is not available with
280 # -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those
282 ifeq ($(TARGET_ARCH_ALPHA),yes)
283 -alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
284 +alpha/motion_est_alpha.lo: alpha/motion_est_alpha.c
285 cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \
286 case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \
287 echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\
288 - $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
289 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
293 @@ -188,14 +185,14 @@
297 - rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
298 - armv4l/*.o armv4l/*~ \
300 - alpha/*.o alpha/*~ \
304 - liba52/*.o liba52/*~ \
305 + rm -f *.*o *.d *~ .depend $(LIB) $(SLIB) *.so* *.la i386/*.*o i386/*~ \
306 + armv4l/*.*o armv4l/*~ \
307 + mlib/*.*o mlib/*~ \
308 + alpha/*.*o alpha/*~ \
312 + liba52/*.*o liba52/*~ \
314 $(MAKE) -C libpostproc clean
316 @@ -206,46 +203,44 @@
320 - rm -f amr_float/*.o
321 + rm -f amr_float/*.*o
323 # api example program
324 apiexample: apiexample.c $(LIB)
325 - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
326 + libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
329 cpuid_test: i386/cputest.c
330 - $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
331 + libtool --mode=link $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
335 imgresample-test: imgresample.c
336 - $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
337 + libtool --mode=link $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
339 dct-test: dct-test.o fdctref.o $(LIB)
341 + libtool --mode=link $(CC) -o $@ $^ -lm
343 motion-test: motion_test.o $(LIB)
345 + libtool --mode=link $(CC) -o $@ $^ -lm
347 fft-test: fft-test.o $(LIB)
349 + libtool --mode=link $(CC) -o $@ $^ -lm
352 ifeq ($(BUILD_SHARED),yes)
353 - install -d $(prefix)/lib
354 - install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
355 - ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
357 - mkdir -p $(prefix)/include/ffmpeg
358 - install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
359 - install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
360 + install -d $(DESTDIR)$(prefix)/lib
361 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
362 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
363 + install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
364 + install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
368 - install -m 644 $(LIB) $(prefix)/lib
369 - mkdir -p $(prefix)/include/ffmpeg
370 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
371 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
372 install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
373 - $(prefix)/include/ffmpeg
374 + $(DESTDIR)$(prefix)/include/ffmpeg
377 # include dependency files if they exist
378 diff -Nur ffmpeg-0.4.7.orig/libavformat/Makefile ffmpeg-0.4.7/libavformat/Makefile
379 --- ffmpeg-0.4.7.orig/libavformat/Makefile 2003-09-04 19:57:13.000000000 +0200
380 +++ ffmpeg-0.4.7/libavformat/Makefile 2003-09-04 20:29:57.622847960 +0200
383 CFLAGS= $(OPT) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
385 -OBJS= utils.o cutils.o allformats.o
386 +OBJS= utils.lo cutils.lo allformats.lo
390 -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
391 - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
392 - yuv4mpeg.o 4xm.o flvenc.o flvdec.o
393 +OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo raw.lo rm.lo \
394 + avienc.lo avidec.lo wav.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \
395 + yuv4mpeg.lo 4xm.lo flvenc.lo flvdec.lo
397 ifeq ($(CONFIG_RISKY),yes)
408 -OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o
409 +OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo
411 -OBJS+= avio.o aviobuf.o file.o
413 +OBJS+= avio.lo aviobuf.lo file.lo
416 ifeq ($(BUILD_STRPTIME),yes)
421 ifeq ($(CONFIG_VIDEO4LINUX),yes)
426 ifeq ($(CONFIG_DV1394),yes)
431 ifeq ($(CONFIG_AUDIO_OSS),yes)
436 ifeq ($(CONFIG_AUDIO_BEOS),yes)
437 -PPOBJS+= beosaudio.o
438 +PPOBJS+= beosaudio.lo
439 EXTRALIBS+=-lbe -lmedia
440 -# this should be the default !
441 -EXTRALIBS+=-lavcodec -L../libavcodec
444 ifeq ($(CONFIG_NETWORK),yes)
445 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
446 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
447 # BeOS and Darwin network stuff
448 ifeq ($(NEED_INET_ATON),yes)
454 ifeq ($(CONFIG_VORBIS),yes)
459 -LIB= $(LIBPREF)avformat$(LIBSUF)
461 ifeq ($(BUILD_SHARED),yes)
462 -SLIB= $(SLIBPREF)avformat$(SLIBSUF)
463 +RPATH= -rpath $(prefix)/lib
468 -SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
469 +SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp)
473 $(LIB): $(OBJS) $(PPOBJS)
475 - $(AR) rc $@ $(OBJS) $(PPOBJS)
479 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS)
480 + libtool --mode=link $(CC) $(LDOPT) -o $@ $(OBJS) $(PPOBJS) ../libavcodec/libavcodec.la $(RPATH) -release $(VERSION)
483 $(CC) -MM $(CFLAGS) $^ 1>.depend
486 ifeq ($(BUILD_SHARED),yes)
487 - install -d $(prefix)/lib
488 - install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
489 - ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
491 - mkdir -p $(prefix)/include/ffmpeg
492 - install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h
493 - install -m 644 $(VPATH)/avio.h $(prefix)/include/ffmpeg/avio.h
494 - install -m 644 $(VPATH)/rtp.h $(prefix)/include/ffmpeg/rtp.h
495 - install -m 644 $(VPATH)/rtsp.h $(prefix)/include/ffmpeg/rtsp.h
496 - install -m 644 $(VPATH)/rtspcodes.h $(prefix)/include/ffmpeg/rtspcodes.h
497 + install -d $(DESTDIR)$(prefix)/lib
498 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
499 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
500 + install -m 644 $(VPATH)/avformat.h $(DESTDIR)$(prefix)/include/ffmpeg/avformat.h
501 + install -m 644 $(VPATH)/avio.h $(DESTDIR)$(prefix)/include/ffmpeg/avio.h
502 + install -m 644 $(VPATH)/rtp.h $(DESTDIR)$(prefix)/include/ffmpeg/rtp.h
503 + install -m 644 $(VPATH)/rtsp.h $(DESTDIR)$(prefix)/include/ffmpeg/rtsp.h
504 + install -m 644 $(VPATH)/rtspcodes.h $(DESTDIR)$(prefix)/include/ffmpeg/rtspcodes.h
508 - install -m 644 $(LIB) $(prefix)/lib
509 - mkdir -p $(prefix)/include/ffmpeg
510 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
511 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
512 install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
513 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
514 $(SRC_PATH)/libavformat/rtspcodes.h \
515 - $(prefix)/include/ffmpeg
516 + $(DESTDIR)$(prefix)/include/ffmpeg
519 - $(CC) $(CFLAGS) -c -o $@ $<
521 + libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
523 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
525 - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
526 + libtool --mode=compile --tag CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
529 - rm -f *.o *.d .depend *~ *.a $(LIB)
530 + rm -f *.*o *.d .depend *~ *.*a $(LIB)
533 # include dependency files if they exist
534 diff -Nur ffmpeg-0.4.7.orig/Makefile ffmpeg-0.4.7/Makefile
535 --- ffmpeg-0.4.7.orig/Makefile 2003-09-04 19:57:13.000000000 +0200
536 +++ ffmpeg-0.4.7/Makefile 2003-09-04 20:36:41.299479784 +0200
538 EXTRALIBS+=-lmedia -lbe
541 -ifeq ($(BUILD_SHARED),yes)
542 -DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
544 -DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
545 +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
546 ifeq ($(CONFIG_MP3LAME),yes)
551 ifeq ($(CONFIG_VORBIS),yes)
552 EXTRALIBS+=-logg -lvorbis -lvorbisenc
555 OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
556 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
557 -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
558 +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la
560 all: lib $(PROG) $(PROGTEST) $(VHOOK)
563 $(MAKE) -C libavcodec all
564 $(MAKE) -C libavformat all
566 -ffmpeg_g$(EXE): ffmpeg.o cmdutils.o .libs
567 - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
569 -ffmpeg$(EXE): ffmpeg_g$(EXE)
572 +ffmpeg$(EXE): ffmpeg.o cmdutils.o
573 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
575 -ffserver$(EXE): ffserver.o .libs
576 - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
577 +ffserver$(EXE): ffserver.o
578 + libtool --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
580 -ffplay_g$(EXE): ffplay.o cmdutils.o .libs
581 - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
582 +ffplay$(EXE): ffplay.o cmdutils.o
583 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
585 -ffplay$(EXE): ffplay_g$(EXE)
589 -output_example$(EXE): output_example.o .libs
590 - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
591 +output_example$(EXE): output_example.o
592 + libtool --mode=link $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
595 $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
598 $(CC) $(CFLAGS) -c -o $@ $<
604 -install: all install-man $(INSTALLVHOOK)
605 +install: install-man $(INSTALLVHOOK)
606 $(MAKE) -C libavcodec install
607 $(MAKE) -C libavformat install
608 - install -d $(prefix)/bin
609 - install -c -s -m 755 $(PROG) $(prefix)/bin
610 + install -d $(DESTDIR)$(prefix)/bin
611 + libtool --mode=install install -c -m 755 $(PROG) $(DESTDIR)$(prefix)/bin
613 # install man from source dir if available
615 if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
616 - install -d $(mandir)/man1 ; \
617 + install -d $(DESTDIR)$(mandir)/man1 ; \
618 install -m 644 $(SRC_PATH)/doc/ffmpeg.1 $(SRC_PATH)/doc/ffplay.1 \
619 - $(SRC_PATH)/doc/ffserver.1 $(mandir)/man1 ; \
620 + $(SRC_PATH)/doc/ffserver.1 $(DESTDIR)$(mandir)/man1 ; \
623 -install-vhook: $(prefix)/lib/vhook
624 - $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
625 +install-vhook: $(DESTDIR)$(prefix)/lib/vhook
626 + $(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
628 -$(prefix)/lib/vhook:
629 +$(DESTDIR)$(prefix)/lib/vhook:
633 @@ -147,15 +135,11 @@
635 $(CC) -MM $(CFLAGS) $^ 1>.depend
638 - @test -f .libs || touch .libs
639 - @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
642 $(MAKE) -C libavcodec clean
643 $(MAKE) -C libavformat clean
644 $(MAKE) -C tests clean
645 - rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) ffplay_g$(EXE) $(PROG)
646 + rm -f *.o *.d *~ .depend gmon.out TAGS $(PROG)
649 $(MAKE) -C vhook clean