---- ffmpeg/libavcodec/libpostproc/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
-+++ ffmpeg/libavcodec/libpostproc/Makefile 2006-01-29 13:37:17.993360000 +0100
-@@ -4,25 +4,22 @@
- VPATH=$(SRC_PATH)/libavcodec/libpostproc
-
- NAME=postproc
--ifeq ($(BUILD_SHARED),yes)
- LIBVERSION=$(SPPVERSION)
- LIBMAJOR=$(SPPMAJOR)
--endif
-
--OBJS=postprocess.o
--SOBJS=postprocess_pic.o
-+OBJS=postprocess.lo
-
- CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
- # -I/usr/X11R6/include/
+--- ffmpeg-export-2006-12-04/Makefile 2006-11-20 23:46:43.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/Makefile 2006-12-05 13:08:44.141688603 +0200
+@@ -13,7 +13,6 @@
- .SUFFIXES: .c .o
+ ifeq ($(CONFIG_FFMPEG),yes)
+ MANPAGES=doc/ffmpeg.1
+-PROGS_G+=ffmpeg_g$(EXESUF)
+ PROGS+=ffmpeg$(EXESUF)
+ endif
- # .PHONY: all clean
+@@ -24,13 +23,11 @@
--.c.o:
-- $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
-+%.lo : %.c
-+ libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
+ ifeq ($(CONFIG_FFPLAY),yes)
+ MANPAGES+=doc/ffplay.1
+-PROGS_G+=ffplay_g$(EXESUF)
+ PROGS+=ffplay$(EXESUF)
+ endif
--all: $(SWSLIB) $(LIB) $(SLIBNAME)
-+all: $(SWSLIB) $(LIB)
-
- clean:
- rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
-@@ -36,37 +33,21 @@
- $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
+ BASENAMES=ffmpeg ffplay ffserver
+ ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
+-ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
+ ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
ifeq ($(BUILD_SHARED),yes)
--postprocess_pic.o: postprocess.c
-- $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
--
--$(SLIBNAME): $(SOBJS)
-- $(CC) $(SHFLAGS) -o $(SLIBNAME) $(SOBJS)
-+RPATH= -rpath $(libdir)
-+else
-+RPATH=
+@@ -49,17 +46,15 @@
+ INSTALLMAN=install-man
endif
- $(LIB): $(OBJS)
-- rm -f $@
-- $(AR) rc $@ $(OBJS)
-- $(RANLIB) $@
-+ libtool --mode=link --tag=CC $(CC) -o $(LIB) $(OBJS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
-
- install: all
--ifeq ($(BUILD_SHARED),yes)
--ifeq ($(CONFIG_WIN32),yes)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
--else
-- install -d $(libdir)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-- $(LDCONFIG) || true
--endif
--endif
-- mkdir -p $(prefix)/include/postproc
-- install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
-- install -d $(libdir)/pkgconfig
-- install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
-+ install -d $(DESTDIR)$(libdir)
-+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
-+ install -d $(DESTDIR)$(prefix)/include/postproc
-+ install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
-+ install -d $(DESTDIR)$(libdir)/pkgconfig
-+ install -m 644 ../../libpostproc.pc $(DESTDIR)$(libdir)/pkgconfig
-
-
- #
---- ffmpeg/libavcodec/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
-+++ ffmpeg/libavcodec/Makefile 2006-01-29 13:45:46.901164750 +0100
-@@ -9,311 +9,312 @@
- # NOTE: -I.. is needed to include config.h
- CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
-
--OBJS= bitstream.o utils.o mem.o allcodecs.o \
-- mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-- mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
-- motion_est.o imgconvert.o imgresample.o \
-- mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
-- ratecontrol.o adpcm.o eval.o error_resilience.o \
-- fft.o mdct.o raw.o golomb.o cabac.o\
-- dpcm.o adx.o faandct.o parser.o g726.o \
-- vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \
-- opt.o
-+OBJS= bitstream.lo utils.lo mem.lo allcodecs.lo \
-+ mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo\
-+ mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo resample2.lo dsputil.lo \
-+ motion_est.lo imgconvert.lo imgresample.lo \
-+ mpeg12.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
-+ ratecontrol.lo adpcm.lo eval.lo error_resilience.lo \
-+ fft.lo mdct.lo raw.lo golomb.lo cabac.lo\
-+ dpcm.lo adx.lo faandct.lo parser.lo g726.lo \
-+ vp3dsp.lo h264idct.lo rangecoder.lo pnm.lo h263.lo msmpeg4.lo h263dec.lo \
-+ opt.lo
-
- ifeq ($(CONFIG_AASC_DECODER),yes)
-- OBJS+= aasc.o
-+ OBJS+= aasc.lo
- endif
- ifeq ($(CONFIG_ALAC_DECODER),yes)
-- OBJS+= alac.o
-+ OBJS+= alac.lo
- endif
- ifneq ($(CONFIG_ASV1_DECODER)$(CONFIG_ASV1_ENCODER)$(CONFIG_ASV2_DECODER)$(CONFIG_ASV2_ENCODER),)
-- OBJS+= asv1.o
-+ OBJS+= asv1.lo
- endif
- ifeq ($(CONFIG_CINEPAK_DECODER),yes)
-- OBJS+= cinepak.o
-+ OBJS+= cinepak.lo
- endif
- ifeq ($(CONFIG_COOK_DECODER),yes)
-- OBJS+= cook.o
-+ OBJS+= cook.lo
- endif
- ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),)
-- OBJS+= cljr.o
-+ OBJS+= cljr.lo
- endif
- ifeq ($(CONFIG_CYUV_DECODER),yes)
-- OBJS+= cyuv.o
-+ OBJS+= cyuv.lo
- endif
- ifeq ($(CONFIG_DVBSUB_DECODER),yes)
-- OBJS+= dvbsubdec.o
-+ OBJS+= dvbsubdec.lo
- endif
- ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
-- OBJS+= dvbsub.o
-+ OBJS+= dvbsub.lo
- endif
- ifeq ($(CONFIG_DVDSUB_DECODER),yes)
-- OBJS+= dvdsub.o
-+ OBJS+= dvdsub.lo
- endif
- ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
-- OBJS+= dvdsubenc.o
-+ OBJS+= dvdsubenc.lo
- endif
- ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
-- OBJS+= dv.o
-+ OBJS+= dv.lo
- endif
- ifeq ($(CONFIG_EIGHTBPS_DECODER),yes)
-- OBJS+= 8bps.o
-+ OBJS+= 8bps.lo
- endif
- ifneq ($(CONFIG_FFV1_DECODER)$(CONFIG_FFV1_ENCODER),)
-- OBJS+= ffv1.o
-+ OBJS+= ffv1.lo
- endif
- ifeq ($(CONFIG_FLAC_DECODER),yes)
-- OBJS+= flac.o
-+ OBJS+= flac.lo
- endif
- ifeq ($(CONFIG_FLIC_DECODER),yes)
-- OBJS+= flicvideo.o
-+ OBJS+= flicvideo.lo
- endif
- ifeq ($(CONFIG_FOURXM_DECODER),yes)
-- OBJS+= 4xm.o
-+ OBJS+= 4xm.lo
- endif
- ifeq ($(CONFIG_FRAPS_DECODER),yes)
-- OBJS+= fraps.o
-+ OBJS+= fraps.lo
- endif
- ifneq ($(CONFIG_H261_DECODER)$(CONFIG_H261_ENCODER),)
-- OBJS+= h261.o
-+ OBJS+= h261.lo
- endif
- ifneq ($(CONFIG_H264_DECODER)$(CONFIG_SVQ3_DECODER),)
-- OBJS+= h264.o
-+ OBJS+= h264.lo
- endif
- ifneq ($(CONFIG_HUFFYUV_DECODER)$(CONFIG_HUFFYUV_ENCODER)$(CONFIG_FFVHUFF_DECODER)$(CONFIG_FFVHUFF_ENCODER),)
-- OBJS+= huffyuv.o
-+ OBJS+= huffyuv.lo
- endif
- ifeq ($(CONFIG_IDCIN_DECODER),yes)
-- OBJS+= idcinvideo.o
-+ OBJS+= idcinvideo.lo
- endif
- ifeq ($(CONFIG_INDEO2_DECODER),yes)
-- OBJS+= indeo2.o
-+ OBJS+= indeo2.lo
- endif
- ifeq ($(CONFIG_INDEO3_DECODER),yes)
-- OBJS+= indeo3.o
-+ OBJS+= indeo3.lo
- endif
- ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes)
-- OBJS+= interplayvideo.o
-+ OBJS+= interplayvideo.lo
- endif
- ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
-- OBJS+= lcl.o
-+ OBJS+= lcl.lo
- endif
- ifeq ($(CONFIG_LOCO_DECODER),yes)
-- OBJS+= loco.o
-+ OBJS+= loco.lo
- endif
- ifneq ($(CONFIG_MACE3_DECODER)$(CONFIG_MACE6_DECODER),)
-- OBJS+= mace.o
-+ OBJS+= mace.lo
- endif
- ifeq ($(CONFIG_MSRLE_DECODER),yes)
-- OBJS+= msrle.o
-+ OBJS+= msrle.lo
- endif
- ifeq ($(CONFIG_MSVIDEO1_DECODER),yes)
-- OBJS+= msvideo1.o
-+ OBJS+= msvideo1.lo
- endif
- ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
-- OBJS+= png.o
-+ OBJS+= png.lo
- endif
- ifeq ($(CONFIG_QDM2_DECODER),yes)
-- OBJS+= qdm2.o
-+ OBJS+= qdm2.lo
- endif
- ifeq ($(CONFIG_QDRAW_DECODER),yes)
-- OBJS+= qdrw.o
-+ OBJS+= qdrw.lo
- endif
- ifeq ($(CONFIG_QPEG_DECODER),yes)
-- OBJS+= qpeg.o
-+ OBJS+= qpeg.lo
- endif
- ifeq ($(CONFIG_QTRLE_DECODER),yes)
-- OBJS+= qtrle.o
-+ OBJS+= qtrle.lo
- endif
- ifeq ($(CONFIG_RA_144_DECODER),yes)
-- OBJS+= ra144.o
-+ OBJS+= ra144.lo
- endif
- ifeq ($(CONFIG_RA_288_DECODER),yes)
-- OBJS+= ra288.o
-+ OBJS+= ra288.lo
- endif
- ifeq ($(CONFIG_ROQ_DECODER),yes)
-- OBJS+= roqvideo.o
-+ OBJS+= roqvideo.lo
- endif
- ifeq ($(CONFIG_RPZA_DECODER),yes)
-- OBJS+= rpza.o
-+ OBJS+= rpza.lo
- endif
- ifneq ($(CONFIG_RV10_DECODER)$(CONFIG_RV20_DECODER)$(CONFIG_RV10_ENCODER)$(CONFIG_RV20_ENCODER),)
-- OBJS+= rv10.o
-+ OBJS+= rv10.lo
- endif
- ifeq ($(CONFIG_SHORTEN_DECODER),yes)
-- OBJS+= shorten.o
-+ OBJS+= shorten.lo
- endif
- ifeq ($(CONFIG_SMC_DECODER),yes)
-- OBJS+= smc.o
-+ OBJS+= smc.lo
- endif
- ifneq ($(CONFIG_SNOW_DECODER)$(CONFIG_SNOW_ENCODER),)
-- OBJS+= snow.o
-+ OBJS+= snow.lo
- endif
- ifneq ($(CONFIG_SONIC_DECODER)$(CONFIG_SONIC_ENCODER)$(CONFIG_SONIC_LS_ENCODER),)
-- OBJS+= sonic.o
-+ OBJS+= sonic.lo
- endif
- ifneq ($(CONFIG_SVQ1_DECODER)$(CONFIG_SVQ1_ENCODER),)
-- OBJS+= svq1.o
-+ OBJS+= svq1.lo
- endif
- ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes)
-- OBJS+= truemotion1.o
-+ OBJS+= truemotion1.lo
- endif
- ifeq ($(CONFIG_TRUEMOTION2_DECODER),yes)
-- OBJS+= truemotion2.o
-+ OBJS+= truemotion2.lo
- endif
- ifeq ($(CONFIG_TRUESPEECH_DECODER),yes)
-- OBJS+= truespeech.o
-+ OBJS+= truespeech.lo
- endif
- ifeq ($(CONFIG_TSCC_DECODER),yes)
-- OBJS+= tscc.o
-+ OBJS+= tscc.lo
- endif
- ifeq ($(CONFIG_CSCD_DECODER),yes)
-- OBJS+= cscd.o
-- OBJS+= lzo.o
-+ OBJS+= cscd.lo
-+ OBJS+= lzo.lo
- endif
- ifeq ($(CONFIG_ULTI_DECODER),yes)
-- OBJS+= ulti.o
-+ OBJS+= ulti.lo
- endif
- ifneq ($(CONFIG_VC9_DECODER)$(CONFIG_WMV3_DECODER),)
-- OBJS+= vc9.o
-+ OBJS+= vc9.lo
- endif
- ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
-- OBJS+= vcr1.o
-+ OBJS+= vcr1.lo
- endif
- ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
-- OBJS+= vmdav.o
-+ OBJS+= vmdav.lo
- endif
- ifeq ($(CONFIG_VORBIS_DECODER),yes)
-- OBJS+= vorbis.o
-+ OBJS+= vorbis.lo
- endif
- ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
-- OBJS+= vp3.o
-+ OBJS+= vp3.lo
- endif
- ifeq ($(CONFIG_VQA_DECODER),yes)
-- OBJS+= vqavideo.o
-+ OBJS+= vqavideo.lo
- endif
- ifneq ($(CONFIG_WMAV1_DECODER)$(CONFIG_WMAV2_DECODER),)
-- OBJS+= wmadec.o
-+ OBJS+= wmadec.lo
- endif
- ifeq ($(CONFIG_WNV1_DECODER),yes)
-- OBJS+= wnv1.o
-+ OBJS+= wnv1.lo
- endif
- ifeq ($(CONFIG_WS_SND1_DECODER),yes)
-- OBJS+= ws-snd1.o
-+ OBJS+= ws-snd1.lo
- endif
- ifneq ($(CONFIG_XAN_WC3_DECODER)$(CONFIG_XAN_WC4_DECODER),)
-- OBJS+= xan.o
-+ OBJS+= xan.lo
- endif
- ifeq ($(CONFIG_XL_DECODER),yes)
-- OBJS+= xl.o
-+ OBJS+= xl.lo
- endif
- ifeq ($(CONFIG_BMP_DECODER),yes)
-- OBJS+= bmp.o
-+ OBJS+= bmp.lo
- endif
+-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
+-SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+-LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+-EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
++OBJS = ffmpeg.lo ffserver.lo cmdutils.lo ffplay.lo
++SRCS = $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.s)
++EXTRALIBS := $(BUILD_ROOT)/libavformat/libavformat.la $(BUILD_ROOT)/libavcodec/libavcodec.la $(BUILD_ROOT)/libavutil/libavutil.la $(EXTRALIBS)
- AMROBJS=
- ifeq ($(AMR_NB),yes)
- ifeq ($(AMR_NB_FIXED),yes)
--AMROBJS= amr.o
--AMREXTRALIBS+= amr/*.o
-+AMROBJS= amr.lo
-+AMREXTRALIBS+= amr/*.lo
- AMRLIBS=amrlibs
- CLEANAMR=cleanamr
- else
--AMROBJS= amr.o
--OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-+AMROBJS= amr.lo
-+OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
- CLEANAMR=cleanamrfloat
- endif
+ ifeq ($(CONFIG_SWSCALER),yes)
+-LDFLAGS+=-L./libswscale
+-EXTRALIBS+=-lswscale$(BUILDSUF)
++EXTRALIBS+= $(BUILD_ROOT)/libswscale/libswscale.la
endif
- ifeq ($(HAVE_PTHREADS),yes)
--OBJS+= pthread.o
-+OBJS+= pthread.lo
- endif
+-all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
++all: lib $(PROGS) $(VHOOK) $(DOC)
- ifeq ($(HAVE_W32THREADS),yes)
--OBJS+= w32thread.o
-+OBJS+= w32thread.lo
+ lib:
+ $(MAKE) -C libavutil all
+@@ -72,40 +67,42 @@
+ $(MAKE) -C libswscale all
endif
- ifeq ($(HAVE_BEOSTHREADS),yes)
--OBJS+= beosthread.o
-+OBJS+= beosthread.lo
- endif
+-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
++ffmpeg$(EXESUF): ffmpeg.lo cmdutils.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- ifeq ($(AMR_WB),yes)
--AMROBJS= amr.o
--OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
-- amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
-- amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
-- amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
-- amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
-- amrwb_float/enc_util.o amrwb_float/if_rom.o
-+AMROBJS= amr.lo
-+OBJS+= amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
-+ amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \
-+ amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \
-+ amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \
-+ amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \
-+ amrwb_float/enc_util.lo amrwb_float/if_rom.lo
- endif
- OBJS+= $(AMROBJS)
- CLEANAMRWB=cleanamrwbfloat
- ASM_OBJS=
+-ffserver$(EXESUF): ffserver.o .libs
+- $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
++ffserver$(EXESUF): ffserver.lo libavformat/libavformat.la libavcodec/libavcodec.la
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $^ $(EXTRALIBS)
- ifeq ($(HAVE_XVMC_ACCEL),yes)
--OBJS+= xvmcvideo.o
-+OBJS+= xvmcvideo.lo
- endif
+-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
+- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
++libavformat/libavformat.la:
++ $(MAKE) -C libavformat all
++
++libavcodec/libavcodec.la:
++ $(MAKE) -C libavcodec all
+
+-%$(EXESUF): %_g$(EXESUF)
+- cp -p $< $@
+- $(STRIP) $@
++ffplay$(EXESUF): ffplay.lo cmdutils.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(SDL_LIBS)
- # currently using liba52 for ac3 decoding
- ifeq ($(CONFIG_AC3),yes)
--OBJS+= a52dec.o
-+OBJS+= a52dec.lo
+ version.h:
+ $(SRC_PATH)/version.sh $(SRC_PATH)
- # using builtin liba52 or runtime linked liba52.so.0
- ifneq ($(CONFIG_A52BIN),yes)
--OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
-- liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
-+OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
-+ liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo
- endif
- endif
+-output_example$(EXESUF): output_example.o .libs
+- $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
++output_example$(EXESUF): output_example.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
--EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
-+EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
+ qt-faststart$(EXESUF): qt-faststart.c
+- $(CC) $(CFLAGS) $< -o $@
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $<
- # currently using libdts for dts decoding
- ifeq ($(CONFIG_DTS),yes)
--OBJS+= dtsdec.o
-+OBJS+= dtsdec.lo
- CFLAGS += $(DTS_INC)
- endif
+ cws2fws$(EXESUF): cws2fws.c
+- $(CC) $< -o $@ -lz
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $< -lz
- ifeq ($(CONFIG_FAAD),yes)
--OBJS+= faad.o
-+OBJS+= faad.lo
- endif
+-ffplay.o: ffplay.c
+- $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
++ffplay.lo: ffplay.c
++ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
- ifeq ($(CONFIG_FAAC),yes)
--OBJS+= faac.o
-+OBJS+= faac.lo
- endif
+-ffmpeg.o ffplay.o ffserver.o: version.h
++ffmpeg.lo ffplay.lo ffserver.lo: version.h
- ifeq ($(CONFIG_XVID),yes)
--OBJS+= xvidff.o
--OBJS+= xvid_rc.o
-+OBJS+= xvidff.lo
-+OBJS+= xvid_rc.lo
- endif
+-%.o: %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
++%.lo: %.c
++ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c -o $@ $<
- ifeq ($(CONFIG_X264),yes)
--OBJS+= x264.o
-+OBJS+= x264.lo
- endif
+-videohook: .libs
++videohook:
+ $(MAKE) -C vhook all
- ifeq ($(CONFIG_PP),yes)
- ifeq ($(BUILD_SHARED),yes)
--EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
-+EXTRALIBS += libpostproc/libpostproc.la
-+EXTRADEPS += libpostproc/libpostproc.la
- else
- # LIBS += libpostproc/libpostproc.a ... should be fixed
--OBJS += libpostproc/postprocess.o
-+OBJS += libpostproc/postprocess.lo
- endif
- endif
+ documentation:
+@@ -198,10 +195,6 @@
+ .depend: $(SRCS) version.h
+ $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
- ifeq ($(CONFIG_MP3LAME),yes)
--OBJS += mp3lameaudio.o
-+OBJS += mp3lameaudio.lo
- endif
+-.libs: lib
+- @test -f .libs || touch .libs
+- @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
+-
+ clean:
+ $(MAKE) -C libavutil clean
+ $(MAKE) -C libavcodec clean
+@@ -211,7 +204,7 @@
+ $(MAKE) -C tests clean
+ $(MAKE) -C vhook clean
+ $(MAKE) -C doc clean
+- rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
++ rm -f *.lo *.d *~ gmon.lout TAGS $(ALLPROGS) \
+ output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
+
+ distclean: clean
+--- ffmpeg-export-2006-12-04/common.mak 2006-11-25 17:44:55.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/common.mak 2006-12-05 13:08:44.141688603 +0200
+@@ -8,37 +8,30 @@
+ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
+ -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
++SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S) $(CPPOBJS:.lo=.cpp)
+ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
+ STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
+ SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
++STATIC_OBJS_ = $(shell echo $(OBJS) $(STATIC_OBJS) | tr ' ' '\n' | sort -u)
++SHARED_OBJS_ = $(shell echo $(OBJS) $(SHARED_OBJS) | tr ' ' '\n' | sort -u)
+
+ all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
+
+-$(LIB): $(STATIC_OBJS)
+- rm -f $@
+- $(AR) rc $@ $^ $(EXTRAOBJS)
+- $(RANLIB) $@
+-
+-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
+- ln -sf $^ $@
+-
+-$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
+- $(SLIB_EXTRA_CMD)
++$(SLIBNAME): $(SHARED_OBJS_)
++ libtool --mode=link --tag=CC $(CC) -o $(LIB) $(SHARED_OBJS_) -rpath $(libdir) -version-number `echo $(LIBVERSION) | tr . :`
- ifeq ($(CONFIG_LIBOGG),yes)
- ifeq ($(CONFIG_LIBVORBIS),yes)
--OBJS += oggvorbis.o
-+OBJS += oggvorbis.lo
- endif
- ifeq ($(CONFIG_LIBTHEORA), yes)
--OBJS += oggtheora.o
-+OBJS += oggtheora.lo
- endif
- endif
+-%.o: %.c
+- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
++%.lo: %.c
++ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
- ifeq ($(CONFIG_LIBGSM),yes)
--OBJS += libgsm.o
-+OBJS += libgsm.lo
- endif
+-%.o: %.S
+- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
++%.lo: %.S
++ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
- ifeq ($(TARGET_GPROF),yes)
-@@ -323,33 +324,33 @@
+ # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
+-%.o: %.cpp
+- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
++%.lo: %.cpp
++ libtool --mode=compile --tag=CXX $(CC) $(subst -Wall,,$(CFLAGS)) $(LIBOBJFLAGS) -c -o $@ $<
- # i386 mmx specific stuff
- ifeq ($(TARGET_MMX),yes)
--OBJS += i386/fdct_mmx.o i386/cputest.o \
-- i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-- i386/idct_mmx.o i386/motion_est_mmx.o \
-- i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
-- i386/vp3dsp_sse2.o
-+OBJS += i386/fdct_mmx.lo i386/cputest.lo \
-+ i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
-+ i386/idct_mmx.lo i386/motion_est_mmx.lo \
-+ i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \
-+ i386/vp3dsp_sse2.lo
- ifeq ($(CONFIG_GPL),yes)
--OBJS += i386/idct_mmx_xvid.o
-+OBJS += i386/idct_mmx_xvid.lo
- endif
- ifdef TARGET_BUILTIN_VECTOR
--i386/fft_sse.o: CFLAGS+= -msse
-+i386/fft_sse.lo: CFLAGS+= -msse
- depend: CFLAGS+= -msse
- endif
- endif
+-%: %.o $(LIB)
+- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
++%: %.lo $(LIB)
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- # armv4l specific stuff
- ifeq ($(TARGET_ARCH_ARMV4L),yes)
--ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o armv4l/dsputil_arm_s.o
--OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
-+ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo armv4l/dsputil_arm_s.lo
-+OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
- ifeq ($(TARGET_IWMMXT),yes)
--OBJS += armv4l/dsputil_iwmmxt.o armv4l/mpegvideo_iwmmxt.o
-+OBJS += armv4l/dsputil_iwmmxt.lo armv4l/mpegvideo_iwmmxt.lo
- endif
- endif
+ depend dep: $(SRCS)
+ $(CC) -MM $(CFLAGS) $^ 1>.depend
+@@ -62,13 +55,8 @@
+ install-libs: $(INSTLIBTARGETS)
- # sun mediaLib specific stuff
- # currently only works when libavcodec is used in mplayer
- ifeq ($(HAVE_MLIB),yes)
--OBJS += mlib/dsputil_mlib.o
-+OBJS += mlib/dsputil_mlib.lo
- CFLAGS += $(MLIB_INC)
- endif
+ install-lib-shared: $(SLIBNAME)
+- install -d "$(shlibdir)"
+- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
+- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+- cd "$(shlibdir)" && \
+- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+- cd "$(shlibdir)" && \
+- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
++ install -d $(DESTDIR)$(libdir)
++ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
-@@ -361,83 +362,73 @@
+ install-lib-static: $(LIB)
+ install -d "$(libdir)"
+@@ -76,10 +64,10 @@
+ $(LIB_INSTALL_EXTRA_CMD)
- # alpha specific stuff
- ifeq ($(TARGET_ARCH_ALPHA),yes)
--OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
-- alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
--ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
-+OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
-+ alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
-+ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
- CFLAGS += -fforce-addr
- endif
+ install-headers:
+- install -d "$(incdir)"
+- install -d "$(libdir)/pkgconfig"
+- install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
+- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
++ install -d "$(DESTDIR)$(incdir)"
++ install -d "$(DESTDIR)$(libdir)/pkgconfig"
++ install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(DESTDIR)$(incdir)"
++ install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(DESTDIR)$(libdir)/pkgconfig"
- ifeq ($(TARGET_ARCH_POWERPC),yes)
--OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
-+OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
- endif
+ uninstall: uninstall-libs uninstall-headers
- ifeq ($(TARGET_MMI),yes)
--OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
-+OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
- endif
+--- ffmpeg-export-2006-12-04/configure 2006-11-29 01:55:24.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/configure 2006-12-05 13:08:44.141688603 +0200
+@@ -608,10 +608,10 @@
+ LDCONFIG="ldconfig"
+ LIBPREF="lib"
+ LIBSUF=".a"
+-LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
++LIB='$(LIBPREF)$(NAME).la'
+ SLIBPREF="lib"
+ SLIBSUF=".so"
+-SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
++SLIBNAME='$(SLIBPREF)$(NAME).la'
+ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
+ SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
+ EXESUF=""
+--- ffmpeg-export-2006-12-04/libavcodec/Makefile 2006-11-22 11:20:16.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/libavcodec/Makefile 2006-12-05 13:08:44.141688603 +0200
+@@ -6,404 +6,403 @@
+
+ CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
+
+-OBJS= bitstream.o \
+- utils.o \
+- allcodecs.o \
+- mpegvideo.o \
+- jrevdct.o \
+- jfdctfst.o \
+- jfdctint.o\
+- mjpeg.o \
+- resample.o \
+- resample2.o \
+- dsputil.o \
+- motion_est.o \
+- imgconvert.o \
+- mpeg12.o \
+- mpegaudiodec.o \
+- simple_idct.o \
+- ratecontrol.o \
+- eval.o \
+- error_resilience.o \
+- fft.o \
+- mdct.o \
+- raw.o \
+- golomb.o \
+- cabac.o\
+- faandct.o \
+- parser.o \
+- vp3dsp.o \
+- h264idct.o \
+- rangecoder.o \
+- pnm.o \
+- h263.o \
+- msmpeg4.o \
+- h263dec.o \
+- opt.o \
+- bitstream_filter.o \
+- audioconvert.o \
++OBJS= bitstream.lo \
++ utils.lo \
++ allcodecs.lo \
++ mpegvideo.lo \
++ jrevdct.lo \
++ jfdctfst.lo \
++ jfdctint.lo\
++ mjpeg.lo \
++ resample.lo \
++ resample2.lo \
++ dsputil.lo \
++ motion_est.lo \
++ imgconvert.lo \
++ mpeg12.lo \
++ mpegaudiodec.lo \
++ simple_idct.lo \
++ ratecontrol.lo \
++ eval.lo \
++ error_resilience.lo \
++ fft.lo \
++ mdct.lo \
++ raw.lo \
++ golomb.lo \
++ cabac.lo\
++ faandct.lo \
++ parser.lo \
++ vp3dsp.lo \
++ h264idct.lo \
++ rangecoder.lo \
++ pnm.lo \
++ h263.lo \
++ msmpeg4.lo \
++ h263dec.lo \
++ opt.lo \
++ bitstream_filter.lo \
++ audioconvert.lo \
+
+
+ HEADERS = avcodec.h opt.h
+
+-OBJS-$(CONFIG_AASC_DECODER) += aasc.o
+-OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o
+-OBJS-$(CONFIG_ALAC_DECODER) += alac.o
+-OBJS-$(CONFIG_ASV1_DECODER) += asv1.o
+-OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o
+-OBJS-$(CONFIG_ASV2_DECODER) += asv1.o
+-OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o
+-OBJS-$(CONFIG_AVS_DECODER) += avs.o
+-OBJS-$(CONFIG_BMP_DECODER) += bmp.o
+-OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdsp.o
+-OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
+-OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
+-OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o
+-OBJS-$(CONFIG_COOK_DECODER) += cook.o
+-OBJS-$(CONFIG_CSCD_DECODER) += cscd.o lzo.o
+-OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
+-OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinav.o
+-OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.o
+-OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o
+-OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
+-OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o
+-OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
+-OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o
+-OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o
+-OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
+-OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o
+-OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o
+-OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o
+-OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o
+-OBJS-$(CONFIG_FLAC_DECODER) += flac.o
+-OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o
+-OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
+-OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
+-OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
+-OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
+-OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
+-OBJS-$(CONFIG_GIF_ENCODER) += gif.o
+-OBJS-$(CONFIG_H261_DECODER) += h261.o
+-OBJS-$(CONFIG_H261_ENCODER) += h261.o
+-OBJS-$(CONFIG_H264_DECODER) += h264.o
+-OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
+-OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
+-OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
+-OBJS-$(CONFIG_IMC_DECODER) += imc.o
+-OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
+-OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
+-OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
+-OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o
+-OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
+-OBJS-$(CONFIG_LOCO_DECODER) += loco.o
+-OBJS-$(CONFIG_MACE3_DECODER) += mace.o
+-OBJS-$(CONFIG_MACE6_DECODER) += mace.o
+-OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
+-OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
+-OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
+-OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
+-OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
+-OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o lzo.o
+-OBJS-$(CONFIG_PNG_DECODER) += png.o
+-OBJS-$(CONFIG_PNG_ENCODER) += png.o
+-OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o
+-OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o
+-OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
+-OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
+-OBJS-$(CONFIG_RA_144_DECODER) += ra144.o
+-OBJS-$(CONFIG_RA_288_DECODER) += ra288.o
+-OBJS-$(CONFIG_ROQ_DECODER) += roqvideo.o
+-OBJS-$(CONFIG_ROQ_DPCM_DECODER) += dpcm.o
+-OBJS-$(CONFIG_RPZA_DECODER) += rpza.o
+-OBJS-$(CONFIG_RV10_DECODER) += rv10.o
+-OBJS-$(CONFIG_RV10_ENCODER) += rv10.o
+-OBJS-$(CONFIG_RV20_DECODER) += rv10.o
+-OBJS-$(CONFIG_RV20_ENCODER) += rv10.o
+-OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
+-OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
+-OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
+-OBJS-$(CONFIG_SMC_DECODER) += smc.o
+-OBJS-$(CONFIG_SNOW_DECODER) += snow.o
+-OBJS-$(CONFIG_SNOW_ENCODER) += snow.o
+-OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
+-OBJS-$(CONFIG_SONIC_DECODER) += sonic.o
+-OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o
+-OBJS-$(CONFIG_SONIC_LS_DECODER) += sonic.o
+-OBJS-$(CONFIG_SVQ1_DECODER) += svq1.o
+-OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
+-OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
+-OBJS-$(CONFIG_TARGA_DECODER) += targa.o
+-OBJS-$(CONFIG_THEORA_DECODER) += vp3.o
+-OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
+-OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
+-OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
+-OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
+-OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
+-OBJS-$(CONFIG_TSCC_DECODER) += tscc.o
+-OBJS-$(CONFIG_TTA_DECODER) += tta.o
+-OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
+-OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1dsp.o
+-OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
+-OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
+-OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
+-OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
+-OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
+-OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o vorbis_data.o
+-OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o
+-OBJS-$(CONFIG_VP3_DECODER) += vp3.o
+-OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o
+-OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o
+-OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
+-OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
+-OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o
+-OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o
+-OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1dsp.o
+-OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
+-OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
+-OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o
+-OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o
+-OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.o
+-OBJS-$(CONFIG_XL_DECODER) += xl.o
+-OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o
+-OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o
+-OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
+-
+-OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S32BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S32BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U24LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U24LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U24BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U24BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o
+-OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o
+-OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o
+-
+-OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_4XM_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.o
+-OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adx.o
+-OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_CT_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_EA_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o
+-OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o
+-OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SWF_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_SWF_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
+-OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
+-
+-OBJS-$(CONFIG_FAAD) += faad.o
+-OBJS-$(CONFIG_FAAC) += faac.o
+-OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o
+-OBJS-$(CONFIG_X264) += x264.o
+-OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o
+-OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o
+-OBJS-$(CONFIG_LIBGSM) += libgsm.o
++OBJS-$(CONFIG_AASC_DECODER) += aasc.lo
++OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.lo
++OBJS-$(CONFIG_ALAC_DECODER) += alac.lo
++OBJS-$(CONFIG_ASV1_DECODER) += asv1.lo
++OBJS-$(CONFIG_ASV1_ENCODER) += asv1.lo
++OBJS-$(CONFIG_ASV2_DECODER) += asv1.lo
++OBJS-$(CONFIG_ASV2_ENCODER) += asv1.lo
++OBJS-$(CONFIG_AVS_DECODER) += avs.lo
++OBJS-$(CONFIG_BMP_DECODER) += bmp.lo
++OBJS-$(CONFIG_CAVS_DECODER) += cavs.lo cavsdsp.lo
++OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.lo
++OBJS-$(CONFIG_CLJR_DECODER) += cljr.lo
++OBJS-$(CONFIG_CLJR_ENCODER) += cljr.lo
++OBJS-$(CONFIG_COOK_DECODER) += cook.lo
++OBJS-$(CONFIG_CSCD_DECODER) += cscd.lo lzo.lo
++OBJS-$(CONFIG_CYUV_DECODER) += cyuv.lo
++OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinav.lo
++OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.lo
++OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.lo
++OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.lo
++OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.lo
++OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.lo
++OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.lo
++OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.lo
++OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.lo
++OBJS-$(CONFIG_FFV1_DECODER) += ffv1.lo
++OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.lo
++OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.lo
++OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.lo
++OBJS-$(CONFIG_FLAC_DECODER) += flac.lo
++OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.lo
++OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.lo
++OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.lo
++OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.lo
++OBJS-$(CONFIG_FRAPS_DECODER) += fraps.lo
++OBJS-$(CONFIG_GIF_DECODER) += gifdec.lo lzw.lo
++OBJS-$(CONFIG_GIF_ENCODER) += gif.lo
++OBJS-$(CONFIG_H261_DECODER) += h261.lo
++OBJS-$(CONFIG_H261_ENCODER) += h261.lo
++OBJS-$(CONFIG_H264_DECODER) += h264.lo
++OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.lo
++OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.lo
++OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.lo
++OBJS-$(CONFIG_IMC_DECODER) += imc.lo
++OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.lo
++OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.lo
++OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.lo
++OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.lo
++OBJS-$(CONFIG_KMVC_DECODER) += kmvc.lo
++OBJS-$(CONFIG_LOCO_DECODER) += loco.lo
++OBJS-$(CONFIG_MACE3_DECODER) += mace.lo
++OBJS-$(CONFIG_MACE6_DECODER) += mace.lo
++OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.lo
++OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.lo
++OBJS-$(CONFIG_MSRLE_DECODER) += msrle.lo
++OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.lo
++OBJS-$(CONFIG_MSZH_DECODER) += lcl.lo
++OBJS-$(CONFIG_NUV_DECODER) += nuv.lo rtjpeg.lo lzo.lo
++OBJS-$(CONFIG_PNG_DECODER) += png.lo
++OBJS-$(CONFIG_PNG_ENCODER) += png.lo
++OBJS-$(CONFIG_QDM2_DECODER) += qdm2.lo
++OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.lo
++OBJS-$(CONFIG_QPEG_DECODER) += qpeg.lo
++OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.lo
++OBJS-$(CONFIG_RA_144_DECODER) += ra144.lo
++OBJS-$(CONFIG_RA_288_DECODER) += ra288.lo
++OBJS-$(CONFIG_ROQ_DECODER) += roqvideo.lo
++OBJS-$(CONFIG_ROQ_DPCM_DECODER) += dpcm.lo
++OBJS-$(CONFIG_RPZA_DECODER) += rpza.lo
++OBJS-$(CONFIG_RV10_DECODER) += rv10.lo
++OBJS-$(CONFIG_RV10_ENCODER) += rv10.lo
++OBJS-$(CONFIG_RV20_DECODER) += rv10.lo
++OBJS-$(CONFIG_RV20_ENCODER) += rv10.lo
++OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.lo
++OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.lo
++OBJS-$(CONFIG_SMACKER_DECODER) += smacker.lo
++OBJS-$(CONFIG_SMC_DECODER) += smc.lo
++OBJS-$(CONFIG_SNOW_DECODER) += snow.lo
++OBJS-$(CONFIG_SNOW_ENCODER) += snow.lo
++OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.lo
++OBJS-$(CONFIG_SONIC_DECODER) += sonic.lo
++OBJS-$(CONFIG_SONIC_ENCODER) += sonic.lo
++OBJS-$(CONFIG_SONIC_LS_DECODER) += sonic.lo
++OBJS-$(CONFIG_SVQ1_DECODER) += svq1.lo
++OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.lo
++OBJS-$(CONFIG_SVQ3_DECODER) += h264.lo
++OBJS-$(CONFIG_TARGA_DECODER) += targa.lo
++OBJS-$(CONFIG_THEORA_DECODER) += vp3.lo
++OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.lo
++OBJS-$(CONFIG_TIFF_DECODER) += tiff.lo lzw.lo
++OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.lo
++OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.lo
++OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.lo
++OBJS-$(CONFIG_TSCC_DECODER) += tscc.lo
++OBJS-$(CONFIG_TTA_DECODER) += tta.lo
++OBJS-$(CONFIG_ULTI_DECODER) += ulti.lo
++OBJS-$(CONFIG_VC1_DECODER) += vc1.lo vc1dsp.lo
++OBJS-$(CONFIG_VCR1_DECODER) += vcr1.lo
++OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.lo
++OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.lo
++OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.lo
++OBJS-$(CONFIG_VMNC_DECODER) += vmnc.lo
++OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.lo vorbis_data.lo
++OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.lo vorbis.lo vorbis_data.lo
++OBJS-$(CONFIG_VP3_DECODER) += vp3.lo
++OBJS-$(CONFIG_VP5_DECODER) += vp5.lo vp56.lo vp56data.lo
++OBJS-$(CONFIG_VP6_DECODER) += vp6.lo vp56.lo vp56data.lo
++OBJS-$(CONFIG_VQA_DECODER) += vqavideo.lo
++OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.lo
++OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.lo
++OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.lo
++OBJS-$(CONFIG_WMV3_DECODER) += vc1.lo vc1dsp.lo
++OBJS-$(CONFIG_WNV1_DECODER) += wnv1.lo
++OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.lo
++OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.lo
++OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.lo
++OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.lo
++OBJS-$(CONFIG_XL_DECODER) += xl.lo
++OBJS-$(CONFIG_ZLIB_DECODER) += lcl.lo
++OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.lo
++OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.lo
++
++OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S32BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S32BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U24LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U24LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U24BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U24BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.lo
++OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.lo
++OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.lo
++
++OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_4XM_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.lo
++OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adx.lo
++OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_CT_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_EA_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.lo
++OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.lo
++OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SWF_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_SWF_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.lo
++OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.lo
++
++OBJS-$(CONFIG_FAAD) += faad.lo
++OBJS-$(CONFIG_FAAC) += faac.lo
++OBJS-$(CONFIG_XVID) += xvidff.lo xvid_rc.lo
++OBJS-$(CONFIG_X264) += x264.lo
++OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.lo
++OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.lo
++OBJS-$(CONFIG_LIBGSM) += libgsm.lo
- ifeq ($(TARGET_ALTIVEC),yes)
--OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
-- ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o \
-- ppc/dsputil_h264_altivec.o
-+OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
-+ ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo \
-+ ppc/dsputil_h264_altivec.lo
- endif
+ # currently using liba52 for ac3 decoding
+-OBJS-$(CONFIG_A52) += a52dec.o
++OBJS-$(CONFIG_A52) += a52dec.lo
- ifeq ($(TARGET_ARCH_SH4),yes)
--OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
-+OBJS+= sh4/idct_sh4.lo sh4/dsputil_sh4.lo sh4/dsputil_align.lo
+ # using builtin liba52 or runtime linked liba52.so.0
+-OBJS-$(CONFIG_A52)$(CONFIG_A52BIN) += liba52/bit_allocate.o \
+- liba52/bitstream.o \
+- liba52/downmix.o \
+- liba52/imdct.o \
+- liba52/parse.o \
+- liba52/crc.o \
+- liba52/resample.o
++OBJS-$(CONFIG_A52)$(CONFIG_A52BIN) += liba52/bit_allocate.lo \
++ liba52/bitstream.lo \
++ liba52/downmix.lo \
++ liba52/imdct.lo \
++ liba52/parse.lo \
++ liba52/crc.lo \
++ liba52/resample.lo
+
+ # currently using libdts for dts decoding
+-OBJS-$(CONFIG_DTS) += dtsdec.o
++OBJS-$(CONFIG_DTS) += dtsdec.lo
+
+-OBJS-$(CONFIG_AMR) += amr.o
+-OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \
+- amr_float/sp_enc.o \
+- amr_float/interf_dec.o \
+- amr_float/interf_enc.o
++OBJS-$(CONFIG_AMR) += amr.lo
++OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.lo \
++ amr_float/sp_enc.lo \
++ amr_float/interf_dec.lo \
++ amr_float/interf_enc.lo
+
+ ifeq ($(CONFIG_AMR_NB_FIXED),yes)
+-EXTRAOBJS += amr/*.o
++EXTRAOBJS += amr/*.lo
+ EXTRADEPS=amrlibs
+ endif
+
+-OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.o \
+- amrwb_float/dec_dtx.o \
+- amrwb_float/dec_gain.o \
+- amrwb_float/dec_if.o \
+- amrwb_float/dec_lpc.o \
+- amrwb_float/dec_main.o \
+- amrwb_float/dec_rom.o \
+- amrwb_float/dec_util.o \
+- amrwb_float/enc_acelp.o \
+- amrwb_float/enc_dtx.o \
+- amrwb_float/enc_gain.o \
+- amrwb_float/enc_if.o \
+- amrwb_float/enc_lpc.o \
+- amrwb_float/enc_main.o \
+- amrwb_float/enc_rom.o \
+- amrwb_float/enc_util.o \
+- amrwb_float/if_rom.o
+-
+-OBJS-$(CONFIG_AAC_PARSER) += parser.o
+-OBJS-$(CONFIG_AC3_PARSER) += parser.o
+-OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.o parser.o
+-OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.o
+-OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.o
+-OBJS-$(CONFIG_H261_PARSER) += h261.o
+-OBJS-$(CONFIG_H263_PARSER) += h263dec.o
+-OBJS-$(CONFIG_H264_PARSER) += h264.o
+-OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg.o
+-OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += parser.o
+-OBJS-$(CONFIG_MPEGAUDIO_PARSER) += parser.o
+-OBJS-$(CONFIG_MPEGVIDEO_PARSER) += parser.o
+-OBJS-$(CONFIG_PNM_PARSER) += pnm.o
+-
+-OBJS-$(HAVE_PTHREADS) += pthread.o
+-OBJS-$(HAVE_W32THREADS) += w32thread.o
+-OBJS-$(HAVE_OS2THREADS) += os2thread.o
+-OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
++OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.lo \
++ amrwb_float/dec_dtx.lo \
++ amrwb_float/dec_gain.lo \
++ amrwb_float/dec_if.lo \
++ amrwb_float/dec_lpc.lo \
++ amrwb_float/dec_main.lo \
++ amrwb_float/dec_rom.lo \
++ amrwb_float/dec_util.lo \
++ amrwb_float/enc_acelp.lo \
++ amrwb_float/enc_dtx.lo \
++ amrwb_float/enc_gain.lo \
++ amrwb_float/enc_if.lo \
++ amrwb_float/enc_lpc.lo \
++ amrwb_float/enc_main.lo \
++ amrwb_float/enc_rom.lo \
++ amrwb_float/enc_util.lo \
++ amrwb_float/if_rom.lo
++
++OBJS-$(CONFIG_AAC_PARSER) += parser.lo
++OBJS-$(CONFIG_AC3_PARSER) += parser.lo
++OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.lo parser.lo
++OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.lo
++OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.lo
++OBJS-$(CONFIG_H261_PARSER) += h261.lo
++OBJS-$(CONFIG_H263_PARSER) += h263dec.lo
++OBJS-$(CONFIG_H264_PARSER) += h264.lo
++OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg.lo
++OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += parser.lo
++OBJS-$(CONFIG_MPEGAUDIO_PARSER) += parser.lo
++OBJS-$(CONFIG_MPEGVIDEO_PARSER) += parser.lo
++OBJS-$(CONFIG_PNM_PARSER) += pnm.lo
++
++OBJS-$(HAVE_PTHREADS) += pthread.lo
++OBJS-$(HAVE_W32THREADS) += w32thread.lo
++OBJS-$(HAVE_OS2THREADS) += os2thread.lo
++OBJS-$(HAVE_BEOSTHREADS) += beosthread.lo
+
+-OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
++OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.lo
+
+ ifneq ($(CONFIG_SWSCALER),yes)
+-OBJS += imgresample.o
++OBJS += imgresample.lo
endif
- ifeq ($(TARGET_ARCH_SPARC),yes)
--OBJS+=sparc/dsputil_vis.o
--sparc/%.o: sparc/%.c
-- $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
-+OBJS+=sparc/dsputil_vis.lo
-+sparc/%.lo: sparc/%.c
-+ libtool --mode=compile --tag=CC $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
+ # i386 mmx specific stuff
+ ifeq ($(TARGET_MMX),yes)
+-OBJS += i386/fdct_mmx.o \
+- i386/cputest.o \
+- i386/dsputil_mmx.o \
+- i386/mpegvideo_mmx.o \
+- i386/motion_est_mmx.o \
+- i386/simple_idct_mmx.o \
+- i386/idct_mmx_xvid.o \
+- i386/fft_sse.o \
+- i386/vp3dsp_mmx.o \
+- i386/vp3dsp_sse2.o \
+- i386/fft_3dn.o \
+- i386/fft_3dn2.o \
+- i386/snowdsp_mmx.o \
++OBJS += i386/fdct_mmx.lo \
++ i386/cputest.lo \
++ i386/dsputil_mmx.lo \
++ i386/mpegvideo_mmx.lo \
++ i386/motion_est_mmx.lo \
++ i386/simple_idct_mmx.lo \
++ i386/idct_mmx_xvid.lo \
++ i386/fft_sse.lo \
++ i386/vp3dsp_mmx.lo \
++ i386/vp3dsp_sse2.lo \
++ i386/fft_3dn.lo \
++ i386/fft_3dn2.lo \
++ i386/snowdsp_mmx.lo \
+
+ ifeq ($(CONFIG_GPL),yes)
+-OBJS += i386/idct_mmx.o
++OBJS += i386/idct_mmx.lo
+ endif
+ ifeq ($(CONFIG_CAVS_DECODER),yes)
+-OBJS += i386/cavsdsp_mmx.o
++OBJS += i386/cavsdsp_mmx.lo
endif
- ifeq ($(TARGET_ARCH_SPARC64),yes)
- CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
endif
--SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
-+SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
- OBJS := $(OBJS) $(ASM_OBJS)
+ # armv4l specific stuff
+-ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
+- armv4l/simple_idct_arm.o \
+- armv4l/dsputil_arm_s.o \
++ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.lo \
++ armv4l/simple_idct_arm.lo \
++ armv4l/dsputil_arm_s.lo \
- NAME=avcodec
--LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
--ifeq ($(BUILD_SHARED),yes)
-+LIBAVUTIL= $(SRC_PATH)/libavutil/libavutil.la
- LIBVERSION=$(LAVCVERSION)
- LIBMAJOR=$(LAVCMAJOR)
-+ifeq ($(BUILD_SHARED),yes)
-+RPATH= -rpath $(libdir)
-+else
-+RPATH=
- endif
- TESTS= imgresample-test dct-test motion-test fft-test
+-OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.o \
+- armv4l/mpegvideo_arm.o \
++OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.lo \
++ armv4l/mpegvideo_arm.lo \
--all: $(LIB) $(SLIBNAME)
-+all: $(LIB)
+-OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.o \
+- armv4l/mpegvideo_iwmmxt.o \
++OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.lo \
++ armv4l/mpegvideo_iwmmxt.lo \
- amrlibs:
- $(MAKE) -C amr spclib fipoplib
+-ASM_OBJS-$(TARGET_ARMV5TE) += armv4l/simple_idct_armv5te.o \
++ASM_OBJS-$(TARGET_ARMV5TE) += armv4l/simple_idct_armv5te.lo \
- tests: apiexample cpuid_test $(TESTS)
+ # sun sparc
+-OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \
++OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.lo \
--$(LIB): $(OBJS) $(AMRLIBS)
-- rm -f $@
-- $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
-- $(RANLIB) $@
--
--$(SLIBNAME): $(OBJS)
--ifeq ($(CONFIG_PP),yes)
-- $(MAKE) -C libpostproc
--endif
--ifeq ($(CONFIG_WIN32),yes)
-- $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-- -lib /machine:i386 /def:$(@:.dll=.def)
--else
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
--endif
-+$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -version-number `echo $(LIBVERSION) | tr . :`
-
--dsputil.o: dsputil.c dsputil.h
-+dsputil.lo: dsputil.c dsputil.h
-
--libpostproc/libpostproc.a:
-+libpostproc/libpostproc.la:
- $(MAKE) -C libpostproc
+-sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
++sparc/dsputil_vis.lo: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
--%.o: %.c
-- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-+%.lo: %.c
-+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+ # sun mediaLib specific stuff
+-OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
++OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.lo \
--%.o: %.S
-- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-+%.lo: %.S
-+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+ # alpha specific stuff
+-OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \
+- alpha/mpegvideo_alpha.o \
+- alpha/simple_idct_alpha.o \
+- alpha/motion_est_alpha.o \
+-
+-ASM_OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
+- alpha/motion_est_mvi_asm.o \
+-
+-OBJS-$(TARGET_ARCH_POWERPC) += ppc/dsputil_ppc.o \
+- ppc/mpegvideo_ppc.o \
+-
+-OBJS-$(TARGET_MMI) += ps2/dsputil_mmi.o \
+- ps2/idct_mmi.o \
+- ps2/mpegvideo_mmi.o \
+-
+-OBJS-$(TARGET_ARCH_SH4) += sh4/idct_sh4.o \
+- sh4/dsputil_sh4.o \
+- sh4/dsputil_align.o \
+-
+-OBJS-$(TARGET_ALTIVEC) += ppc/dsputil_altivec.o \
+- ppc/mpegvideo_altivec.o \
+- ppc/idct_altivec.o \
+- ppc/fft_altivec.o \
+- ppc/gmc_altivec.o \
+- ppc/fdct_altivec.o \
+- ppc/float_altivec.o \
++OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.lo \
++ alpha/mpegvideo_alpha.lo \
++ alpha/simple_idct_alpha.lo \
++ alpha/motion_est_alpha.lo \
++
++ASM_OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha_asm.lo \
++ alpha/motion_est_mvi_asm.lo \
++
++OBJS-$(TARGET_ARCH_POWERPC) += ppc/dsputil_ppc.lo \
++ ppc/mpegvideo_ppc.lo \
++
++OBJS-$(TARGET_MMI) += ps2/dsputil_mmi.lo \
++ ps2/idct_mmi.lo \
++ ps2/mpegvideo_mmi.lo \
++
++OBJS-$(TARGET_ARCH_SH4) += sh4/idct_sh4.lo \
++ sh4/dsputil_sh4.lo \
++ sh4/dsputil_align.lo \
++
++OBJS-$(TARGET_ALTIVEC) += ppc/dsputil_altivec.lo \
++ ppc/mpegvideo_altivec.lo \
++ ppc/idct_altivec.lo \
++ ppc/fft_altivec.lo \
++ ppc/gmc_altivec.lo \
++ ppc/fdct_altivec.lo \
++ ppc/float_altivec.lo \
- depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -473,7 +464,7 @@
+ ifeq ($(TARGET_ALTIVEC),yes)
+-OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o
+-OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o
+-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
+-OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o
++OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.lo
++OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.lo
++OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.lo
++OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.lo
+ endif
+
+-OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
++OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.lo \
+
+-CFLAGS += $(CFLAGS-yes)
+-OBJS += $(OBJS-yes)
+-ASM_OBJS += $(ASM_OBJS-yes)
++OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
++ASM_OBJS += $(shell echo $(ASM_OBJS-yes) | tr ' ' '\n' | sort -u)
+
+-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
++EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
- # api example program
- apiexample: apiexample.c $(LIB)
-- $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
-+ libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
+ NAME=avcodec
+ ifeq ($(BUILD_SHARED),yes)
+@@ -425,21 +424,21 @@
+
+ clean::
+ rm -f \
+- i386/*.o i386/*~ \
+- armv4l/*.o armv4l/*~ \
+- mlib/*.o mlib/*~ \
+- alpha/*.o alpha/*~ \
+- ppc/*.o ppc/*~ \
+- ps2/*.o ps2/*~ \
+- sh4/*.o sh4/*~ \
+- sparc/*.o sparc/*~ \
+- liba52/*.o liba52/*~ \
+- amr_float/*.o \
++ i386/*.lo i386/*~ \
++ armv4l/*.lo armv4l/*~ \
++ mlib/*.lo mlib/*~ \
++ alpha/*.lo alpha/*~ \
++ ppc/*.lo ppc/*~ \
++ ps2/*.lo ps2/*~ \
++ sh4/*.lo sh4/*~ \
++ sparc/*.lo sparc/*~ \
++ liba52/*.lo liba52/*~ \
++ amr_float/*.lo \
+ apiexample $(TESTS)
+ -$(MAKE) -C amr clean
+ -$(MAKE) -C amrwb_float -f makefile.gcc clean
+
+-apiexample: apiexample.o $(LIB)
++apiexample: apiexample.lo $(LIB)
- # cpuid test
cpuid_test: i386/cputest.c
-@@ -485,46 +476,32 @@
- $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
-
- dct-test: dct-test.o fdctref.o $(LIB)
-- $(CC) -o $@ $^ -lm $(LIBAVUTIL)
-+ libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm $(LIBAVUTIL)
-
- motion-test: motion_test.o $(LIB)
-- $(CC) -o $@ $^ -lm
-+ libtool --mode=link --tag=CC $(CC) -o $@ $^ -lm
-
- fft-test: fft-test.o $(LIB)
-- $(CC) -o $@ $^ $(LIBAVUTIL) -lm
-+ libtool --mode=link --tag=CC $(CC) -o $@ $^ $(LIBAVUTIL) -lm
-
--ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
--ifeq ($(CONFIG_WIN32),yes)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
--else
-- install -d $(libdir)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-- $(LDCONFIG) || true
--endif
- ifeq ($(CONFIG_PP),yes)
- $(MAKE) -C libpostproc $@
- endif
--else
--install:
--endif
-+ install -d $(DESTDIR)$(libdir)
-+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
+ $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
+@@ -447,10 +446,10 @@
+ imgresample-test: imgresample.c $(LIB)
+ $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
- installlib: all install-headers
-- install -m 644 $(LIB) "$(libdir)"
-+ libtool --mode=install install -m 644 $(LIB) "$(DESTDIR)$(libdir)"
+-dct-test: dct-test.o fdctref.o $(LIB)
++dct-test: dct-test.lo fdctref.lo $(LIB)
- install-headers:
-- mkdir -p "$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
- install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
-- "$(prefix)/include/ffmpeg"
-+ "$(DESTDIR)$(prefix)/include/ffmpeg"
- install -m 644 $(SRC_PATH)/libavcodec/dsputil.h \
-- "$(prefix)/include/ffmpeg"
-- install -d "$(libdir)/pkgconfig"
-- install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
-+ "$(DESTDIR)$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(libdir)/pkgconfig"
-+ install -m 644 ../libavcodec.pc "$(DESTDIR)$(libdir)/pkgconfig"
+-motion-test: motion_test.o $(LIB)
++motion-test: motion_test.lo $(LIB)
- #
- # include dependency files if they exist
---- ffmpeg/libavformat/Makefile.orig 2006-01-27 00:42:29.000000000 +0100
-+++ ffmpeg/libavformat/Makefile 2006-01-29 13:58:17.064047000 +0100
-@@ -8,81 +8,81 @@
+-fft-test: fft-test.o $(LIB)
++fft-test: fft-test.lo $(LIB)
- 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
+ .PHONY: amrlibs tests
+--- ffmpeg-export-2006-12-04/libavformat/Makefile 2006-11-21 15:18:21.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/libavformat/Makefile 2006-12-05 13:08:44.131688378 +0200
+@@ -6,187 +6,186 @@
+
+ CFLAGS+=-I$(SRC_PATH)/libavcodec
-OBJS= utils.o cutils.o os_support.o allformats.o
+OBJS= utils.lo cutils.lo os_support.lo allformats.lo
- PPOBJS=
-
- # demuxers
--OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
-- avienc.o avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
-- yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \
-- nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
-- sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
-- ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o
-+OBJS+=mpeg.lo mpegts.lo mpegtsenc.lo ffm.lo crc.lo img.lo img2.lo raw.lo rm.lo \
-+ avienc.lo avidec.lo wav.lo mmf.lo swf.lo au.lo gif.lo mov.lo mpjpeg.lo dv.lo \
-+ yuv4mpeg.lo 4xm.lo flvdec.lo psxstr.lo idroq.lo ipmovie.lo \
-+ nut.lo wc3movie.lo mp3.lo westwood.lo segafilm.lo idcin.lo flic.lo \
-+ sierravmd.lo matroska.lo sol.lo electronicarts.lo nsvdec.lo asf.lo \
-+ ogg2.lo oggparsevorbis.lo oggparsetheora.lo oggparseflac.lo daud.lo
-
- # muxers
- ifeq ($(CONFIG_MUXERS),yes)
--OBJS+= flvenc.o movenc.o asf-enc.o
-+OBJS+= flvenc.lo movenc.lo asf-enc.lo
- endif
+ HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+
+ # muxers/demuxers
+-OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
+-OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
+-OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.o riff.o
+-OBJS-$(CONFIG_AIFF_MUXER) += aiff.o riff.o
+-OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
+-OBJS-$(CONFIG_AMR_MUXER) += amr.o
+-OBJS-$(CONFIG_ASF_DEMUXER) += asf.o riff.o
+-OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
+-OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
+-OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o
+-OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
+-OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
+-OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
+-OBJS-$(CONFIG_AVISYNTH) += avisynth.o
+-OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o riff.o
+-OBJS-$(CONFIG_CRC_MUXER) += crc.o
+-OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.o
+-OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
+-OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.o
+-OBJS-$(CONFIG_DV_DEMUXER) += dv.o
+-OBJS-$(CONFIG_DV_MUXER) += dvenc.o
+-OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o
+-OBJS-$(CONFIG_FFM_DEMUXER) += ffm.o
+-OBJS-$(CONFIG_FFM_MUXER) += ffm.o
+-OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o
+-OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o
+-OBJS-$(CONFIG_FLV_MUXER) += flvenc.o
+-OBJS-$(CONFIG_GIF_MUXER) += gif.o
+-OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
+-OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
+-OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o
+-OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o
+-OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o
+-OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o
+-OBJS-$(CONFIG_IMAGE2_MUXER) += img2.o
+-OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o
+-OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
+-OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroska.o riff.o
+-OBJS-$(CONFIG_MM_DEMUXER) += mm.o
+-OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o riff.o
+-OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
+-OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o
+-OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o
+-OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
+-OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o
+-OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o
+-OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
+-OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o
+-OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
+-OBJS-$(CONFIG_MP2_MUXER) += mp3.o
+-OBJS-$(CONFIG_MP3_MUXER) += mp3.o
+-OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
+-OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
+-OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
+-OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
+-OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
+-OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o
+-OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
+-OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
+- oggparsevorbis.o \
+- oggparsetheora.o \
+- oggparseflac.o \
+- oggparseogm.o \
+- riff.o
+-OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
+-OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o
+-OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o
+-OBJS-$(CONFIG_FLAC_MUXER) += raw.o
+-OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
+-OBJS-$(CONFIG_AC3_MUXER) += raw.o
+-OBJS-$(CONFIG_DTS_DEMUXER) += raw.o
+-OBJS-$(CONFIG_AAC_DEMUXER) += raw.o
+-OBJS-$(CONFIG_H261_DEMUXER) += raw.o
+-OBJS-$(CONFIG_H261_MUXER) += raw.o
+-OBJS-$(CONFIG_H263_DEMUXER) += raw.o
+-OBJS-$(CONFIG_H263_MUXER) += raw.o
+-OBJS-$(CONFIG_M4V_DEMUXER) += raw.o
+-OBJS-$(CONFIG_M4V_MUXER) += raw.o
+-OBJS-$(CONFIG_H264_DEMUXER) += raw.o
+-OBJS-$(CONFIG_H264_MUXER) += raw.o
+-OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o
+-OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o
+-OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o
+-OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
+-OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
+-OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
+-OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o
+-OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
+-OBJS-$(CONFIG_NULL_MUXER) += raw.o
+-OBJS-$(CONFIG_RM_DEMUXER) += rm.o
+-OBJS-$(CONFIG_RM_MUXER) += rm.o
+-OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
+-OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
+-OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o
+-OBJS-$(CONFIG_SOL_DEMUXER) += sol.o
+-OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
+-OBJS-$(CONFIG_SWF_MUXER) += swf.o
+-OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
+-OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
+-OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o riff.o
+-OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o riff.o
+-OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o
+-OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o
+-OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
+-OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
+-OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
+-OBJS-$(CONFIG_WV_DEMUXER) += wv.o
+-OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
+-OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
++OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.lo
++OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.lo
++OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.lo riff.lo
++OBJS-$(CONFIG_AIFF_MUXER) += aiff.lo riff.lo
++OBJS-$(CONFIG_AMR_DEMUXER) += amr.lo
++OBJS-$(CONFIG_AMR_MUXER) += amr.lo
++OBJS-$(CONFIG_ASF_DEMUXER) += asf.lo riff.lo
++OBJS-$(CONFIG_ASF_MUXER) += asf-enc.lo riff.lo
++OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.lo riff.lo
++OBJS-$(CONFIG_AU_DEMUXER) += au.lo riff.lo
++OBJS-$(CONFIG_AU_MUXER) += au.lo riff.lo
++OBJS-$(CONFIG_AVI_DEMUXER) += avidec.lo riff.lo
++OBJS-$(CONFIG_AVI_MUXER) += avienc.lo riff.lo
++OBJS-$(CONFIG_AVISYNTH) += avisynth.lo
++OBJS-$(CONFIG_AVS_DEMUXER) += avs.lo vocdec.lo voc.lo riff.lo
++OBJS-$(CONFIG_CRC_MUXER) += crc.lo
++OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.lo
++OBJS-$(CONFIG_DAUD_DEMUXER) += daud.lo
++OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.lo
++OBJS-$(CONFIG_DV_DEMUXER) += dv.lo
++OBJS-$(CONFIG_DV_MUXER) += dvenc.lo
++OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.lo
++OBJS-$(CONFIG_FFM_DEMUXER) += ffm.lo
++OBJS-$(CONFIG_FFM_MUXER) += ffm.lo
++OBJS-$(CONFIG_FLIC_DEMUXER) += flic.lo
++OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.lo
++OBJS-$(CONFIG_FLV_MUXER) += flvenc.lo
++OBJS-$(CONFIG_GIF_MUXER) += gif.lo
++OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.lo
++OBJS-$(CONFIG_GXF_DEMUXER) += gxf.lo
++OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.lo
++OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.lo
++OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.lo
++OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.lo
++OBJS-$(CONFIG_IMAGE2_MUXER) += img2.lo
++OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.lo
++OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.lo
++OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroska.lo riff.lo
++OBJS-$(CONFIG_MM_DEMUXER) += mm.lo
++OBJS-$(CONFIG_MMF_DEMUXER) += mmf.lo riff.lo
++OBJS-$(CONFIG_MMF_MUXER) += mmf.lo riff.lo
++OBJS-$(CONFIG_MOV_DEMUXER) += mov.lo riff.lo isom.lo
++OBJS-$(CONFIG_MOV_MUXER) += movenc.lo riff.lo isom.lo
++OBJS-$(CONFIG_MTV_DEMUXER) += mtv.lo
++OBJS-$(CONFIG_TGP_MUXER) += movenc.lo riff.lo isom.lo
++OBJS-$(CONFIG_MP4_MUXER) += movenc.lo riff.lo isom.lo
++OBJS-$(CONFIG_PSP_MUXER) += movenc.lo riff.lo isom.lo
++OBJS-$(CONFIG_TG2_MUXER) += movenc.lo riff.lo isom.lo
++OBJS-$(CONFIG_MP3_DEMUXER) += mp3.lo
++OBJS-$(CONFIG_MP2_MUXER) += mp3.lo
++OBJS-$(CONFIG_MP3_MUXER) += mp3.lo
++OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.lo
++OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.lo
++OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.lo
++OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.lo
++OBJS-$(CONFIG_MXF_DEMUXER) += mxf.lo
++OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.lo riff.lo
++OBJS-$(CONFIG_NUV_DEMUXER) += nuv.lo riff.lo
++OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.lo \
++ oggparsevorbis.lo \
++ oggparsetheora.lo \
++ oggparseflac.lo \
++ oggparseogm.lo \
++ riff.lo
++OBJS-$(CONFIG_STR_DEMUXER) += psxstr.lo
++OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.lo
++OBJS-$(CONFIG_FLAC_DEMUXER) += raw.lo
++OBJS-$(CONFIG_FLAC_MUXER) += raw.lo
++OBJS-$(CONFIG_AC3_DEMUXER) += raw.lo
++OBJS-$(CONFIG_AC3_MUXER) += raw.lo
++OBJS-$(CONFIG_DTS_DEMUXER) += raw.lo
++OBJS-$(CONFIG_AAC_DEMUXER) += raw.lo
++OBJS-$(CONFIG_H261_DEMUXER) += raw.lo
++OBJS-$(CONFIG_H261_MUXER) += raw.lo
++OBJS-$(CONFIG_H263_DEMUXER) += raw.lo
++OBJS-$(CONFIG_H263_MUXER) += raw.lo
++OBJS-$(CONFIG_M4V_DEMUXER) += raw.lo
++OBJS-$(CONFIG_M4V_MUXER) += raw.lo
++OBJS-$(CONFIG_H264_DEMUXER) += raw.lo
++OBJS-$(CONFIG_H264_MUXER) += raw.lo
++OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.lo
++OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.lo
++OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.lo
++OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.lo
++OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.lo
++OBJS-$(CONFIG_MJPEG_MUXER) += raw.lo
++OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.lo
++OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.lo
++OBJS-$(CONFIG_NULL_MUXER) += raw.lo
++OBJS-$(CONFIG_RM_DEMUXER) += rm.lo
++OBJS-$(CONFIG_RM_MUXER) += rm.lo
++OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.lo
++OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.lo
++OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.lo
++OBJS-$(CONFIG_SOL_DEMUXER) += sol.lo
++OBJS-$(CONFIG_SWF_DEMUXER) += swf.lo
++OBJS-$(CONFIG_SWF_MUXER) += swf.lo
++OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.lo
++OBJS-$(CONFIG_TTA_DEMUXER) += tta.lo
++OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.lo voc.lo riff.lo
++OBJS-$(CONFIG_VOC_MUXER) += vocenc.lo voc.lo riff.lo
++OBJS-$(CONFIG_WAV_DEMUXER) += wav.lo riff.lo
++OBJS-$(CONFIG_WAV_MUXER) += wav.lo riff.lo
++OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.lo
++OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.lo
++OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.lo
++OBJS-$(CONFIG_WV_DEMUXER) += wv.lo
++OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.lo
++OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.lo
- AMROBJS=
- ifeq ($(AMR_NB),yes)
--AMROBJS= amr.o
-+AMROBJS= amr.lo
- endif
- ifeq ($(AMR_NB_FIXED),yes)
--AMROBJS= amr.o
-+AMROBJS= amr.lo
- endif
- ifeq ($(AMR_WB),yes)
--AMROBJS= amr.o
-+AMROBJS= amr.lo
- endif
- OBJS+= $(AMROBJS)
-
- # image formats
--OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
-OBJS+= framehook.o
-+OBJS+= pnm.lo yuv.lo png.lo jpeg.lo gifdec.lo sgi.lo
+OBJS+= framehook.lo
ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab.lo
+-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
++OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.lo
+ endif
+
+ ifeq ($(CONFIG_VIDEO4LINUX2),yes)
+-OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
++OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.lo
endif
ifeq ($(CONFIG_BKTR),yes)
--OBJS+= grab_bktr.o
-+OBJS+= grab_bktr.lo
+-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
++OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.lo
endif
ifeq ($(CONFIG_DV1394),yes)
--OBJS+= dv1394.o
-+OBJS+= dv1394.lo
+-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
++OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.lo
endif
ifeq ($(CONFIG_DC1394),yes)
--OBJS+= dc1394.o
-+OBJS+= dc1394.lo
+-OBJS-$(CONFIG_DC1394_DEMUXER) += dc1394.o
++OBJS-$(CONFIG_DC1394_DEMUXER) += dc1394.lo
endif
ifeq ($(CONFIG_AUDIO_OSS),yes)
--OBJS+= audio.o
-+OBJS+= audio.lo
+-OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
+-OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
++OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.lo
++OBJS-$(CONFIG_AUDIO_MUXER) += audio.lo
endif
--EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
-+EXTRALIBS += ../libavutil/libavutil.la
+-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
+- -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
++EXTRALIBS += ../libavcodec/libavcodec.la ../libavutil/libavutil.la
ifeq ($(CONFIG_AUDIO_BEOS),yes)
--PPOBJS+= beosaudio.o
-+PPOBJS+= beosaudio.lo
+-CPPOBJS+= beosaudio.o
++CPPOBJS+= beosaudio.lo
endif
# protocols I/O
-OBJS+= file.o
+OBJS+= file.lo
ifeq ($(CONFIG_NETWORK),yes)
--OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
-+OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
- # BeOS and Darwin network stuff
- ifeq ($(NEED_INET_ATON),yes)
--OBJS+= barpainet.o
-+OBJS+= barpainet.lo
- endif
+-OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
++OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo mpegts.lo base64.lo rtp_h264.lo
endif
endif
- ifeq ($(CONFIG_LIBOGG),yes)
--OBJS+= ogg.o
-+OBJS+= ogg.lo
+ ifeq ($(CONFIG_LIBNUT),yes)
+-OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o
+-OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o
++OBJS-$(CONFIG_NUT_DEMUXER) += libnut.lo riff.lo
++OBJS-$(CONFIG_NUT_MUXER) += libnut.lo riff.lo
+ else
+-OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
+-#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
++OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.lo riff.lo
++#OBJS-$(CONFIG_NUT_MUXER) += nutenc.lo riff.lo
endif
- ifeq ($(TARGET_ARCH_SPARC64),yes)
-@@ -90,68 +90,47 @@
+ ifeq ($(CONFIG_LIBOGG),yes)
+-OBJS-$(CONFIG_OGG_MUXER) += ogg.o
++OBJS-$(CONFIG_OGG_MUXER) += ogg.lo
endif
- NAME=avformat
--ifeq ($(BUILD_SHARED),yes)
- LIBVERSION=$(LAVFVERSION)
- LIBMAJOR=$(LAVFMAJOR)
--AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
-+ifeq ($(BUILD_SHARED),yes)
-+RPATH= -rpath $(libdir)
-+else
-+RPATH=
+ ifeq ($(CONFIG_GPL),yes)
+-OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o
++OBJS-$(CONFIG_GXF_MUXER) += gxfenc.lo
endif
-+AVCLIBS+=../libavcodec/libavcodec.la ../libavutil/libavutil.la
-
--SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
-+SRCS := $(OBJS:.lo=.c) $(PPOBJS:.lo=.cpp)
-
--all: $(LIB) $(SLIBNAME)
-+all: $(LIB)
-
- $(LIB): $(OBJS) $(PPOBJS)
-- rm -f $@
-- $(AR) rc $@ $(OBJS) $(PPOBJS)
-- $(RANLIB) $@
--
--$(SLIBNAME): $(OBJS)
--ifeq ($(CONFIG_WIN32),yes)
-- $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
-- -lib /machine:i386 /def:$(@:.dll=.def)
--else
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
--endif
-
- depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $^ 1>.depend
-
--ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
--ifeq ($(CONFIG_WIN32),yes)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
--else
-- install -d $(libdir)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-- $(LDCONFIG) || true
--endif
--else
--install:
--endif
-+ install -d $(DESTDIR)$(libdir)
-+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
-
- installlib: all install-headers
-- install -m 644 $(LIB) "$(libdir)"
-+ libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)"
-
- install-headers:
-- mkdir -p "$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
- install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
- $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
- $(SRC_PATH)/libavformat/rtspcodes.h \
-- "$(prefix)/include/ffmpeg"
-- install -d "$(libdir)/pkgconfig"
-- install -m 644 ../libavformat.pc "$(libdir)/pkgconfig"
-+ "$(DESTDIR)$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(libdir)/pkgconfig"
-+ install -m 644 ../libavformat.pc "$(DESTDIR)$(libdir)/pkgconfig"
--%.o: %.c
-- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-+%.lo: %.c
-+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+-OBJS += $(OBJS-yes)
++OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
- # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
--%.o: %.cpp
-- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
-+%.lo: %.cpp
-+ libtool --mode=compile --tag=CXX g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+ NAME=avformat
+ ifeq ($(BUILD_SHARED),yes)
+--- ffmpeg-export-2006-12-04/libavutil/Makefile 2006-11-14 03:02:30.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/libavutil/Makefile 2006-12-05 13:08:44.141688603 +0200
+@@ -5,17 +5,17 @@
- clean:
- rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
---- ffmpeg/libavutil/Makefile.orig 2006-01-27 00:42:29.000000000 +0100
-+++ ffmpeg/libavutil/Makefile 2006-01-29 14:10:15.400940250 +0100
-@@ -8,41 +8,34 @@
- # NOTE: -I.. is needed to include config.h
- CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ CFLAGS+=-DBUILD_AVUTIL
-OBJS= mathematics.o \
-- integer.o \
- rational.o \
- intfloat_readwrite.o \
+- crc.o \
+- md5.o \
+- lls.o \
+- adler32.o \
+- log.o \
+- mem.o \
+- fifo.o \
+- tree.o \
+OBJS= mathematics.lo \
-+ integer.lo \
+ rational.lo \
+ intfloat_readwrite.lo \
-
-
- ifeq ($(TARGET_ARCH_SPARC64),yes)
- CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
- endif
-
--SRCS := $(OBJS:.o=.c)
-+SRCS := $(OBJS:.lo=.c)
-
- NAME=avutil
--ifeq ($(BUILD_SHARED),yes)
- LIBVERSION=$(LAVUVERSION)
- LIBMAJOR=$(LAVUMAJOR)
-+ifeq ($(BUILD_SHARED),yes)
-+RPATH=-rpath $(libdir)
-+else
-+RPATH=
- endif
-
--all: $(LIB) $(SLIBNAME)
-+all: $(LIB)
-
- $(LIB): $(OBJS)
-- rm -f $@
-- $(AR) rc $@ $(OBJS)
-- $(RANLIB) $@
--
--$(SLIBNAME): $(OBJS)
--ifeq ($(CONFIG_WIN32),yes)
-- $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-- -lib /machine:i386 /def:$(@:.dll=.def)
--else
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
--endif
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
-
--%.o: %.c
-- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-+%.lo: %.c
-+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-
- depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -56,38 +49,24 @@
- rm -f .depend
-
-
--ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
--ifeq ($(CONFIG_WIN32),yes)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
--else
-- install -d $(libdir)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-- $(LDCONFIG) || true
--endif
--else
--install:
--endif
-+ install -d $(DESTDIR)$(libdir)
-+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
-
- installlib: all install-headers
-- install -m 644 $(LIB) "$(libdir)"
-+ libtool --mode=install install $(LIB) "$(DESTDIR)$(libdir)"
-
- install-headers:
-- mkdir -p "$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(prefix)/include/ffmpeg"
- install -m 644 $(SRC_PATH)/libavutil/avutil.h \
- $(SRC_PATH)/libavutil/common.h \
- $(SRC_PATH)/libavutil/mathematics.h \
- $(SRC_PATH)/libavutil/integer.h \
- $(SRC_PATH)/libavutil/rational.h \
- $(SRC_PATH)/libavutil/intfloat_readwrite.h \
-- "$(prefix)/include/ffmpeg"
-- install -d "$(libdir)/pkgconfig"
-- install -m 644 ../libavutil.pc "$(libdir)/pkgconfig"
-+ "$(DESTDIR)$(prefix)/include/ffmpeg"
-+ install -d "$(DESTDIR)$(libdir)/pkgconfig"
-+ install -m 644 ../libavutil.pc "$(DESTDIR)$(libdir)/pkgconfig"
-
- #
- # include dependency files if they exist
---- ffmpeg/vhook/Makefile.orig 2006-01-27 00:42:30.000000000 +0100
-+++ ffmpeg/vhook/Makefile 2006-01-29 14:11:18.492883250 +0100
-@@ -27,17 +27,17 @@
- $(CC) -MM $(CFLAGS) $^ 1>.depend
-
- install:
-- install -d "$(libdir)/vhook"
-- install -m 755 $(HOOKS) "$(libdir)/vhook"
-+ install -d "$(DESTDIR)$(libdir)/vhook"
-+ install -m 755 $(HOOKS) "$(DESTDIR)$(libdir)/vhook"
-
- imlib2$(SLIBSUF): imlib2.o
-- $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
-+ $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< -lImlib2
-
- drawtext$(SLIBSUF): drawtext.o
-- $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
-+ $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $< `freetype-config --libs`
-
- %$(SLIBSUF): %.o
-- $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
-+ $(CC) $(LDFLAGS) -o $@ $(SHFLAGS) $<
-
- clean:
- rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
---- ffmpeg/Makefile.orig 2006-01-27 00:42:27.000000000 +0100
-+++ ffmpeg/Makefile 2006-01-29 14:14:13.291807500 +0100
-@@ -7,7 +7,6 @@
- VPATH=$(SRC_PATH)
-
- 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
--LDFLAGS+= -g
-
- ifeq ($(TARGET_GPROF),yes)
- CFLAGS+=-p
-@@ -36,11 +35,7 @@
- EXTRALIBS+=-lmedia -lbe
++ crc.lo \
++ md5.lo \
++ lls.lo \
++ adler32.lo \
++ log.lo \
++ mem.lo \
++ fifo.lo \
++ tree.lo \
+
+ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
+ intfloat_readwrite.h md5.h adler32.h log.h fifo.h
+--- ffmpeg-export-2006-12-04/libpostproc/Makefile 2006-11-08 02:02:15.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/libpostproc/Makefile 2006-12-05 13:08:44.131688378 +0200
+@@ -12,8 +12,8 @@
+ LIBMAJOR=$(SPPMAJOR)
endif
--ifeq ($(BUILD_SHARED),yes)
--DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
--else
--DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
--endif
-+DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
+-STATIC_OBJS=postprocess.o
+-SHARED_OBJS=postprocess_pic.o
++STATIC_OBJS=postprocess.lo
++SHARED_OBJS=postprocess_pic.lo
- ifeq ($(BUILD_VHOOK),yes)
- VHOOK=videohook
-@@ -59,7 +54,7 @@
+ HEADERS = postprocess.h
- OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
- SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
--FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
-+FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la libavutil/libavutil.la
+@@ -21,6 +21,5 @@
--all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
-+all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
-
-@@ -68,25 +63,17 @@
- $(MAKE) -C libavcodec all
- $(MAKE) -C libavformat all
-
--ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
--
--ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
-- cp -p $< $@
-- $(STRIP) $@
-+ffmpeg$(EXESUF): ffmpeg.o cmdutils.o
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
-
--ffserver$(EXESUF): ffserver.o .libs
-- $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
-+ffserver$(EXESUF): ffserver.o
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+ depend dep: postprocess.c
--ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
-+ffplay$(EXESUF): ffplay.o cmdutils.o
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o -lX11 $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
-
--ffplay$(EXESUF): ffplay_g$(EXESUF)
-- cp -p $< $@
-- $(STRIP) $@
+-postprocess_pic.o: postprocess.c
+- $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
-
--output_example$(EXESUF): output_example.o .libs
-- $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
-+output_example$(EXESUF): output_example.o
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
-
- qt-faststart$(EXESUF): qt-faststart.c
- $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
-@@ -100,7 +87,7 @@
- %.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
--videohook: .libs
-+videohook:
- $(MAKE) -C vhook all
-
- documentation:
-@@ -112,8 +99,8 @@
- $(MAKE) -C libavutil install
- $(MAKE) -C libavcodec install
- $(MAKE) -C libavformat install
-- install -d "$(bindir)"
-- install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
-+ install -d "$(DESTDIR)$(bindir)"
-+ libtool --mode=install install -c $(INSTALLSTRIP) $(PROG) "$(DESTDIR)$(bindir)"
-
- # create the window installer
- wininstaller: all install
-@@ -123,8 +110,8 @@
- install-man:
- ifneq ($(CONFIG_WIN32),yes)
- if [ -f doc/ffmpeg.1 ] ; then \
-- install -d "$(mandir)/man1" ; \
-- install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
-+ install -d "$(DESTDIR)$(mandir)/man1" ; \
-+ install -m 644 $(MANPAGE) "$(DESTDIR)$(mandir)/man1" ; \
- fi
- endif
++postprocess_pic.lo: postprocess.c
++ libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
+--- ffmpeg-export-2006-12-04/vhook/Makefile 2006-11-08 02:02:15.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/vhook/Makefile 2006-12-05 13:08:44.141688603 +0200
+@@ -28,8 +28,8 @@
+ $(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -148,17 +135,13 @@
- .depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
+ install: $(HOOKS)
+- install -d "$(shlibdir)/vhook"
+- install -m 755 $(HOOKS) "$(shlibdir)/vhook"
++ install -d "$(DESTDIR)$(shlibdir)/vhook"
++ install -m 755 $(HOOKS) "$(DESTDIR)$(shlibdir)/vhook"
--.libs: lib
-- @test -f .libs || touch .libs
-- @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
--
- clean:
- $(MAKE) -C libavutil clean
- $(MAKE) -C libavcodec clean
- $(MAKE) -C libavformat clean
- $(MAKE) -C tests clean
- $(MAKE) -C vhook clean
-- rm -f *.o *.d *~ .libs gmon.out TAGS \
-+ rm -f *.o *.d *~ gmon.out TAGS \
- $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART)
-
- # Note well: config.log is NOT removed.
---- ffmpeg/configure.orig 2006-01-24 20:57:41.000000000 +0100
-+++ ffmpeg/configure 2006-01-29 14:17:56.061729750 +0100
-@@ -232,10 +232,10 @@
- LDCONFIG="ldconfig"
- LIBPREF="lib"
- LIBSUF=".a"
--LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
-+LIB='$(LIBPREF)$(NAME).la'
- SLIBPREF="lib"
- SLIBSUF=".so"
--SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
-+SLIBNAME='$(SLIBPREF)$(NAME).la'
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
- EXESUF=""
-@@ -1331,10 +1331,10 @@
- echo "/* Automatically generated by configure - do not modify! */" > $TMPH
- echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
-
--echo "prefix=\$(DESTDIR)$prefix" >> config.mak
--echo "libdir=\$(DESTDIR)$libdir" >> config.mak
--echo "bindir=\$(DESTDIR)$bindir" >> config.mak
--echo "mandir=\$(DESTDIR)$mandir" >> config.mak
-+echo "prefix=$prefix" >> config.mak
-+echo "libdir=$libdir" >> config.mak
-+echo "bindir=$bindir" >> config.mak
-+echo "mandir=$mandir" >> config.mak
- echo "MAKE=$make" >> config.mak
- echo "CC=$cc" >> config.mak
- echo "AR=$ar" >> config.mak
+ uninstall:
+ rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))
projects / packages / ffmpeg.git / commitdiff