ffmpeg-libtool.patch

   1 --- ffmpeg-export-2006-12-04/Makefile   2006-11-20 23:46:43.000000000 +0200
   2 +++ ffmpeg-export-2006-12-04.libtool2/Makefile  2006-12-05 13:08:44.141688603 +0200
   3 @@ -13,7 +13,6 @@
   4
   5  ifeq ($(CONFIG_FFMPEG),yes)
   6  MANPAGES=doc/ffmpeg.1
   7 -PROGS_G+=ffmpeg_g$(EXESUF)
   8  PROGS+=ffmpeg$(EXESUF)
   9  endif
  10
  11 @@ -24,13 +23,11 @@
  12
  13  ifeq ($(CONFIG_FFPLAY),yes)
  14  MANPAGES+=doc/ffplay.1
  15 -PROGS_G+=ffplay_g$(EXESUF)
  16  PROGS+=ffplay$(EXESUF)
  17  endif
  18
  19  BASENAMES=ffmpeg ffplay ffserver
  20  ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
  21 -ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
  22  ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
  23
  24  ifeq ($(BUILD_SHARED),yes)
  25 @@ -49,17 +46,15 @@
  26  INSTALLMAN=install-man
  27  endif
  28
  29 -OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
  30 -SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
  31 -LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
  32 -EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
  33 +OBJS = ffmpeg.lo ffserver.lo cmdutils.lo ffplay.lo
  34 +SRCS = $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.s)
  35 +EXTRALIBS := $(BUILD_ROOT)/libavformat/libavformat.la $(BUILD_ROOT)/libavcodec/libavcodec.la $(BUILD_ROOT)/libavutil/libavutil.la $(EXTRALIBS)
  36
  37  ifeq ($(CONFIG_SWSCALER),yes)
  38 -LDFLAGS+=-L./libswscale
  39 -EXTRALIBS+=-lswscale$(BUILDSUF)
  40 +EXTRALIBS+= $(BUILD_ROOT)/libswscale/libswscale.la
  41  endif
  42
  43 -all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
  44 +all: lib $(PROGS) $(VHOOK) $(DOC)
  45
  46  lib:
  47         $(MAKE) -C libavutil   all
  48 @@ -72,40 +67,42 @@
  49         $(MAKE) -C libswscale  all
  50  endif
  51
  52 -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
  53 -       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
  54 +ffmpeg$(EXESUF): ffmpeg.lo cmdutils.lo
  55 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
  56
  57 -ffserver$(EXESUF): ffserver.o .libs
  58 -       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
  59 +ffserver$(EXESUF): ffserver.lo libavformat/libavformat.la libavcodec/libavcodec.la
  60 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $^ $(EXTRALIBS)
  61
  62 -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
  63 -       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
  64 +libavformat/libavformat.la:
  65 +       $(MAKE) -C libavformat all
  66 +
  67 +libavcodec/libavcodec.la:
  68 +       $(MAKE) -C libavcodec  all
  69
  70 -%$(EXESUF): %_g$(EXESUF)
  71 -       cp -p $< $@
  72 -       $(STRIP) $@
  73 +ffplay$(EXESUF): ffplay.lo cmdutils.lo
  74 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(SDL_LIBS)
  75
  76  version.h:
  77         $(SRC_PATH)/version.sh $(SRC_PATH)
  78
  79 -output_example$(EXESUF): output_example.o .libs
  80 -       $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
  81 +output_example$(EXESUF): output_example.lo
  82 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
  83
  84  qt-faststart$(EXESUF): qt-faststart.c
  85 -       $(CC) $(CFLAGS) $< -o $@
  86 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $<
  87
  88  cws2fws$(EXESUF): cws2fws.c
  89 -       $(CC) $< -o $@ -lz
  90 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $< -lz
  91
  92 -ffplay.o: ffplay.c
  93 -       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
  94 +ffplay.lo: ffplay.c
  95 +       libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
  96
  97 -ffmpeg.o ffplay.o ffserver.o: version.h
  98 +ffmpeg.lo ffplay.lo ffserver.lo: version.h
  99
 100 -%.o: %.c
 101 -       $(CC) $(CFLAGS) -c -o $@ $<
 102 +%.lo: %.c
 103 +       libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c -o $@ $<
 104
 105 -videohook: .libs
 106 +videohook:
 107         $(MAKE) -C vhook all
 108
 109  documentation:
 110 @@ -198,10 +195,6 @@
 111  .depend: $(SRCS) version.h
 112         $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 113
 114 -.libs: lib
 115 -       @test -f .libs || touch .libs
 116 -       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
 117 -
 118  clean:
 119         $(MAKE) -C libavutil   clean
 120         $(MAKE) -C libavcodec  clean
 121 @@ -211,7 +204,7 @@
 122         $(MAKE) -C tests       clean
 123         $(MAKE) -C vhook       clean
 124         $(MAKE) -C doc         clean
 125 -       rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
 126 +       rm -f *.lo *.d *~ gmon.lout TAGS $(ALLPROGS) \
 127            output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
 128
 129  distclean: clean
 130 --- ffmpeg-export-2006-12-04/common.mak 2006-11-25 17:44:55.000000000 +0200
 131 +++ ffmpeg-export-2006-12-04.libtool2/common.mak        2006-12-05 13:08:44.141688603 +0200
 132 @@ -8,37 +8,30 @@
 133  CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 134            -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
 135            -I$(SRC_PATH)/libavutil $(OPTFLAGS)
 136 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 137 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S) $(CPPOBJS:.lo=.cpp)
 138  OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 139  STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 140  SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 141 +STATIC_OBJS_ = $(shell echo $(OBJS) $(STATIC_OBJS) | tr ' ' '\n' | sort -u)
 142 +SHARED_OBJS_ = $(shell echo $(OBJS) $(SHARED_OBJS) | tr ' ' '\n' | sort -u)
 143
 144  all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
 145
 146 -$(LIB): $(STATIC_OBJS)
 147 -       rm -f $@
 148 -       $(AR) rc $@ $^ $(EXTRAOBJS)
 149 -       $(RANLIB) $@
 150 -
 151 -$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
 152 -       ln -sf $^ $@
 153 -
 154 -$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 155 -       $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
 156 -       $(SLIB_EXTRA_CMD)
 157 +$(SLIBNAME): $(SHARED_OBJS_)
 158 +       libtool --mode=link --tag=CC $(CC) -o $(LIB) $(SHARED_OBJS_) -rpath $(libdir) -version-number `echo $(LIBVERSION) | tr . :`
 159
 160 -%.o: %.c
 161 -       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 162 +%.lo: %.c
 163 +       libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 164
 165 -%.o: %.S
 166 -       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 167 +%.lo: %.S
 168 +       libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 169
 170  # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
 171 -%.o: %.cpp
 172 -       g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 173 +%.lo: %.cpp
 174 +       libtool --mode=compile --tag=CXX $(CC) $(subst -Wall,,$(CFLAGS)) $(LIBOBJFLAGS) -c -o $@ $<
 175
 176 -%: %.o $(LIB)
 177 -       $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 178 +%: %.lo $(LIB)
 179 +       libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 180
 181  depend dep: $(SRCS)
 182         $(CC) -MM $(CFLAGS) $^ 1>.depend
 183 @@ -62,13 +55,8 @@
 184  install-libs: $(INSTLIBTARGETS)
 185
 186  install-lib-shared: $(SLIBNAME)
 187 -       install -d "$(shlibdir)"
 188 -       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
 189 -               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
 190 -       cd "$(shlibdir)" && \
 191 -               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
 192 -       cd "$(shlibdir)" && \
 193 -               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
 194 +       install -d $(DESTDIR)$(libdir)
 195 +       libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
 196
 197  install-lib-static: $(LIB)
 198         install -d "$(libdir)"
 199 @@ -76,10 +64,10 @@
 200         $(LIB_INSTALL_EXTRA_CMD)
 201
 202  install-headers:
 203 -       install -d "$(incdir)"
 204 -       install -d "$(libdir)/pkgconfig"
 205 -       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
 206 -       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 207 +       install -d "$(DESTDIR)$(incdir)"
 208 +       install -d "$(DESTDIR)$(libdir)/pkgconfig"
 209 +       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(DESTDIR)$(incdir)"
 210 +       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(DESTDIR)$(libdir)/pkgconfig"
 211
 212  uninstall: uninstall-libs uninstall-headers
 213
 214 --- ffmpeg-export-2006-12-04/configure  2006-11-29 01:55:24.000000000 +0200
 215 +++ ffmpeg-export-2006-12-04.libtool2/configure 2006-12-05 13:08:44.141688603 +0200
 216 @@ -608,10 +608,10 @@
 217  LDCONFIG="ldconfig"
 218  LIBPREF="lib"
 219  LIBSUF=".a"
 220 -LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
 221 +LIB='$(LIBPREF)$(NAME).la'
 222  SLIBPREF="lib"
 223  SLIBSUF=".so"
 224 -SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
 225 +SLIBNAME='$(SLIBPREF)$(NAME).la'
 226  SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 227  SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 228  EXESUF=""
 229 --- ffmpeg-export-2006-12-04/libavcodec/Makefile        2006-11-22 11:20:16.000000000 +0200
 230 +++ ffmpeg-export-2006-12-04.libtool2/libavcodec/Makefile       2006-12-05 13:08:44.141688603 +0200
 231 @@ -6,404 +6,403 @@
 232
 233  CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
 234
 235 -OBJS= bitstream.o \
 236 -      utils.o \
 237 -      allcodecs.o \
 238 -      mpegvideo.o \
 239 -      jrevdct.o \
 240 -      jfdctfst.o \
 241 -      jfdctint.o\
 242 -      mjpeg.o \
 243 -      resample.o \
 244 -      resample2.o \
 245 -      dsputil.o \
 246 -      motion_est.o \
 247 -      imgconvert.o \
 248 -      mpeg12.o \
 249 -      mpegaudiodec.o \
 250 -      simple_idct.o \
 251 -      ratecontrol.o \
 252 -      eval.o \
 253 -      error_resilience.o \
 254 -      fft.o \
 255 -      mdct.o \
 256 -      raw.o \
 257 -      golomb.o \
 258 -      cabac.o\
 259 -      faandct.o \
 260 -      parser.o \
 261 -      vp3dsp.o \
 262 -      h264idct.o \
 263 -      rangecoder.o \
 264 -      pnm.o \
 265 -      h263.o \
 266 -      msmpeg4.o \
 267 -      h263dec.o \
 268 -      opt.o \
 269 -      bitstream_filter.o \
 270 -      audioconvert.o \
 271 +OBJS= bitstream.lo \
 272 +      utils.lo \
 273 +      allcodecs.lo \
 274 +      mpegvideo.lo \
 275 +      jrevdct.lo \
 276 +      jfdctfst.lo \
 277 +      jfdctint.lo\
 278 +      mjpeg.lo \
 279 +      resample.lo \
 280 +      resample2.lo \
 281 +      dsputil.lo \
 282 +      motion_est.lo \
 283 +      imgconvert.lo \
 284 +      mpeg12.lo \
 285 +      mpegaudiodec.lo \
 286 +      simple_idct.lo \
 287 +      ratecontrol.lo \
 288 +      eval.lo \
 289 +      error_resilience.lo \
 290 +      fft.lo \
 291 +      mdct.lo \
 292 +      raw.lo \
 293 +      golomb.lo \
 294 +      cabac.lo\
 295 +      faandct.lo \
 296 +      parser.lo \
 297 +      vp3dsp.lo \
 298 +      h264idct.lo \
 299 +      rangecoder.lo \
 300 +      pnm.lo \
 301 +      h263.lo \
 302 +      msmpeg4.lo \
 303 +      h263dec.lo \
 304 +      opt.lo \
 305 +      bitstream_filter.lo \
 306 +      audioconvert.lo \
 307
 308
 309  HEADERS = avcodec.h opt.h
 310
 311 -OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
 312 -OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o
 313 -OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
 314 -OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o
 315 -OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o
 316 -OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o
 317 -OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.o
 318 -OBJS-$(CONFIG_AVS_DECODER)             += avs.o
 319 -OBJS-$(CONFIG_BMP_DECODER)             += bmp.o
 320 -OBJS-$(CONFIG_CAVS_DECODER)            += cavs.o cavsdsp.o
 321 -OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
 322 -OBJS-$(CONFIG_CLJR_DECODER)            += cljr.o
 323 -OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.o
 324 -OBJS-$(CONFIG_COOK_DECODER)            += cook.o
 325 -OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o lzo.o
 326 -OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 327 -OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
 328 -OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
 329 -OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o
 330 -OBJS-$(CONFIG_DVBSUB_ENCODER)          += dvbsub.o
 331 -OBJS-$(CONFIG_DVDSUB_DECODER)          += dvdsubdec.o
 332 -OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.o
 333 -OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.o
 334 -OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o
 335 -OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.o
 336 -OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.o
 337 -OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.o
 338 -OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o
 339 -OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o
 340 -OBJS-$(CONFIG_FLAC_DECODER)            += flac.o
 341 -OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o
 342 -OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
 343 -OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
 344 -OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 345 -OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
 346 -OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 347 -OBJS-$(CONFIG_GIF_ENCODER)             += gif.o
 348 -OBJS-$(CONFIG_H261_DECODER)            += h261.o
 349 -OBJS-$(CONFIG_H261_ENCODER)            += h261.o
 350 -OBJS-$(CONFIG_H264_DECODER)            += h264.o
 351 -OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
 352 -OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
 353 -OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
 354 -OBJS-$(CONFIG_IMC_DECODER)             += imc.o
 355 -OBJS-$(CONFIG_INDEO2_DECODER)          += indeo2.o
 356 -OBJS-$(CONFIG_INDEO3_DECODER)          += indeo3.o
 357 -OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
 358 -OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
 359 -OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.o
 360 -OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
 361 -OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
 362 -OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
 363 -OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 364 -OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudio.o
 365 -OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o
 366 -OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
 367 -OBJS-$(CONFIG_MSZH_DECODER)            += lcl.o
 368 -OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o lzo.o
 369 -OBJS-$(CONFIG_PNG_DECODER)             += png.o
 370 -OBJS-$(CONFIG_PNG_ENCODER)             += png.o
 371 -OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o
 372 -OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.o
 373 -OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.o
 374 -OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
 375 -OBJS-$(CONFIG_RA_144_DECODER)          += ra144.o
 376 -OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o
 377 -OBJS-$(CONFIG_ROQ_DECODER)             += roqvideo.o
 378 -OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.o
 379 -OBJS-$(CONFIG_RPZA_DECODER)            += rpza.o
 380 -OBJS-$(CONFIG_RV10_DECODER)            += rv10.o
 381 -OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o
 382 -OBJS-$(CONFIG_RV20_DECODER)            += rv10.o
 383 -OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o
 384 -OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.o
 385 -OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.o
 386 -OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.o
 387 -OBJS-$(CONFIG_SMC_DECODER)             += smc.o
 388 -OBJS-$(CONFIG_SNOW_DECODER)            += snow.o
 389 -OBJS-$(CONFIG_SNOW_ENCODER)            += snow.o
 390 -OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.o
 391 -OBJS-$(CONFIG_SONIC_DECODER)           += sonic.o
 392 -OBJS-$(CONFIG_SONIC_ENCODER)           += sonic.o
 393 -OBJS-$(CONFIG_SONIC_LS_DECODER)        += sonic.o
 394 -OBJS-$(CONFIG_SVQ1_DECODER)            += svq1.o
 395 -OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1.o
 396 -OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o
 397 -OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
 398 -OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o
 399 -OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 400 -OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o
 401 -OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
 402 -OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 403 -OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
 404 -OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o
 405 -OBJS-$(CONFIG_TTA_DECODER)             += tta.o
 406 -OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
 407 -OBJS-$(CONFIG_VC1_DECODER)             += vc1.o vc1dsp.o
 408 -OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
 409 -OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.o
 410 -OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
 411 -OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
 412 -OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.o
 413 -OBJS-$(CONFIG_VORBIS_DECODER)          += vorbis.o vorbis_data.o
 414 -OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.o vorbis.o vorbis_data.o
 415 -OBJS-$(CONFIG_VP3_DECODER)             += vp3.o
 416 -OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o
 417 -OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o
 418 -OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
 419 -OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 420 -OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o
 421 -OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o
 422 -OBJS-$(CONFIG_WMV3_DECODER)            += vc1.o vc1dsp.o
 423 -OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
 424 -OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o
 425 -OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o
 426 -OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.o
 427 -OBJS-$(CONFIG_XAN_WC4_DECODER)         += xan.o
 428 -OBJS-$(CONFIG_XL_DECODER)              += xl.o
 429 -OBJS-$(CONFIG_ZLIB_DECODER)            += lcl.o
 430 -OBJS-$(CONFIG_ZLIB_ENCODER)            += lcl.o
 431 -OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.o
 432 -
 433 -OBJS-$(CONFIG_PCM_S32LE_DECODER)       += pcm.o
 434 -OBJS-$(CONFIG_PCM_S32LE_ENCODER)       += pcm.o
 435 -OBJS-$(CONFIG_PCM_S32BE_DECODER)       += pcm.o
 436 -OBJS-$(CONFIG_PCM_S32BE_ENCODER)       += pcm.o
 437 -OBJS-$(CONFIG_PCM_U32LE_DECODER)       += pcm.o
 438 -OBJS-$(CONFIG_PCM_U32LE_ENCODER)       += pcm.o
 439 -OBJS-$(CONFIG_PCM_U32BE_DECODER)       += pcm.o
 440 -OBJS-$(CONFIG_PCM_U32BE_ENCODER)       += pcm.o
 441 -OBJS-$(CONFIG_PCM_S24LE_DECODER)       += pcm.o
 442 -OBJS-$(CONFIG_PCM_S24LE_ENCODER)       += pcm.o
 443 -OBJS-$(CONFIG_PCM_S24BE_DECODER)       += pcm.o
 444 -OBJS-$(CONFIG_PCM_S24BE_ENCODER)       += pcm.o
 445 -OBJS-$(CONFIG_PCM_U24LE_DECODER)       += pcm.o
 446 -OBJS-$(CONFIG_PCM_U24LE_ENCODER)       += pcm.o
 447 -OBJS-$(CONFIG_PCM_U24BE_DECODER)       += pcm.o
 448 -OBJS-$(CONFIG_PCM_U24BE_ENCODER)       += pcm.o
 449 -OBJS-$(CONFIG_PCM_S24DAUD_DECODER)     += pcm.o
 450 -OBJS-$(CONFIG_PCM_S24DAUD_ENCODER)     += pcm.o
 451 -OBJS-$(CONFIG_PCM_S16LE_DECODER)       += pcm.o
 452 -OBJS-$(CONFIG_PCM_S16LE_ENCODER)       += pcm.o
 453 -OBJS-$(CONFIG_PCM_S16BE_DECODER)       += pcm.o
 454 -OBJS-$(CONFIG_PCM_S16BE_ENCODER)       += pcm.o
 455 -OBJS-$(CONFIG_PCM_U16LE_DECODER)       += pcm.o
 456 -OBJS-$(CONFIG_PCM_U16LE_ENCODER)       += pcm.o
 457 -OBJS-$(CONFIG_PCM_U16BE_DECODER)       += pcm.o
 458 -OBJS-$(CONFIG_PCM_U16BE_ENCODER)       += pcm.o
 459 -OBJS-$(CONFIG_PCM_S8_DECODER)          += pcm.o
 460 -OBJS-$(CONFIG_PCM_S8_ENCODER)          += pcm.o
 461 -OBJS-$(CONFIG_PCM_U8_DECODER)          += pcm.o
 462 -OBJS-$(CONFIG_PCM_U8_ENCODER)          += pcm.o
 463 -OBJS-$(CONFIG_PCM_ALAW_DECODER)        += pcm.o
 464 -OBJS-$(CONFIG_PCM_ALAW_ENCODER)        += pcm.o
 465 -OBJS-$(CONFIG_PCM_MULAW_DECODER)       += pcm.o
 466 -OBJS-$(CONFIG_PCM_MULAW_ENCODER)       += pcm.o
 467 -
 468 -OBJS-$(CONFIG_ADPCM_4XM_DECODER)       += adpcm.o
 469 -OBJS-$(CONFIG_ADPCM_4XM_ENCODER)       += adpcm.o
 470 -OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adx.o
 471 -OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adx.o
 472 -OBJS-$(CONFIG_ADPCM_CT_DECODER)        += adpcm.o
 473 -OBJS-$(CONFIG_ADPCM_CT_ENCODER)        += adpcm.o
 474 -OBJS-$(CONFIG_ADPCM_EA_DECODER)        += adpcm.o
 475 -OBJS-$(CONFIG_ADPCM_EA_ENCODER)        += adpcm.o
 476 -OBJS-$(CONFIG_ADPCM_G726_DECODER)      += g726.o
 477 -OBJS-$(CONFIG_ADPCM_G726_ENCODER)      += g726.o
 478 -OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)   += adpcm.o
 479 -OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER)   += adpcm.o
 480 -OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)   += adpcm.o
 481 -OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER)   += adpcm.o
 482 -OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)    += adpcm.o
 483 -OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)    += adpcm.o
 484 -OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.o
 485 -OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.o
 486 -OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)   += adpcm.o
 487 -OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)   += adpcm.o
 488 -OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)    += adpcm.o
 489 -OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER)    += adpcm.o
 490 -OBJS-$(CONFIG_ADPCM_MS_DECODER)        += adpcm.o
 491 -OBJS-$(CONFIG_ADPCM_MS_ENCODER)        += adpcm.o
 492 -OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER)   += adpcm.o
 493 -OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER)   += adpcm.o
 494 -OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER)   += adpcm.o
 495 -OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER)   += adpcm.o
 496 -OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)   += adpcm.o
 497 -OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER)   += adpcm.o
 498 -OBJS-$(CONFIG_ADPCM_SWF_DECODER)       += adpcm.o
 499 -OBJS-$(CONFIG_ADPCM_SWF_ENCODER)       += adpcm.o
 500 -OBJS-$(CONFIG_ADPCM_XA_DECODER)        += adpcm.o
 501 -OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.o
 502 -OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.o
 503 -OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 504 -
 505 -OBJS-$(CONFIG_FAAD)                    += faad.o
 506 -OBJS-$(CONFIG_FAAC)                    += faac.o
 507 -OBJS-$(CONFIG_XVID)                    += xvidff.o xvid_rc.o
 508 -OBJS-$(CONFIG_X264)                    += x264.o
 509 -OBJS-$(CONFIG_MP3LAME)                 += mp3lameaudio.o
 510 -OBJS-$(CONFIG_LIBVORBIS)               += oggvorbis.o
 511 -OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
 512 +OBJS-$(CONFIG_AASC_DECODER)            += aasc.lo
 513 +OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.lo
 514 +OBJS-$(CONFIG_ALAC_DECODER)            += alac.lo
 515 +OBJS-$(CONFIG_ASV1_DECODER)            += asv1.lo
 516 +OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.lo
 517 +OBJS-$(CONFIG_ASV2_DECODER)            += asv1.lo
 518 +OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.lo
 519 +OBJS-$(CONFIG_AVS_DECODER)             += avs.lo
 520 +OBJS-$(CONFIG_BMP_DECODER)             += bmp.lo
 521 +OBJS-$(CONFIG_CAVS_DECODER)            += cavs.lo cavsdsp.lo
 522 +OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.lo
 523 +OBJS-$(CONFIG_CLJR_DECODER)            += cljr.lo
 524 +OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.lo
 525 +OBJS-$(CONFIG_COOK_DECODER)            += cook.lo
 526 +OBJS-$(CONFIG_CSCD_DECODER)            += cscd.lo lzo.lo
 527 +OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.lo
 528 +OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.lo
 529 +OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.lo
 530 +OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.lo
 531 +OBJS-$(CONFIG_DVBSUB_ENCODER)          += dvbsub.lo
 532 +OBJS-$(CONFIG_DVDSUB_DECODER)          += dvdsubdec.lo
 533 +OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.lo
 534 +OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.lo
 535 +OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.lo
 536 +OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.lo
 537 +OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.lo
 538 +OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.lo
 539 +OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.lo
 540 +OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.lo
 541 +OBJS-$(CONFIG_FLAC_DECODER)            += flac.lo
 542 +OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.lo
 543 +OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.lo
 544 +OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.lo
 545 +OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.lo
 546 +OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.lo
 547 +OBJS-$(CONFIG_GIF_DECODER)             += gifdec.lo lzw.lo
 548 +OBJS-$(CONFIG_GIF_ENCODER)             += gif.lo
 549 +OBJS-$(CONFIG_H261_DECODER)            += h261.lo
 550 +OBJS-$(CONFIG_H261_ENCODER)            += h261.lo
 551 +OBJS-$(CONFIG_H264_DECODER)            += h264.lo
 552 +OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.lo
 553 +OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.lo
 554 +OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.lo
 555 +OBJS-$(CONFIG_IMC_DECODER)             += imc.lo
 556 +OBJS-$(CONFIG_INDEO2_DECODER)          += indeo2.lo
 557 +OBJS-$(CONFIG_INDEO3_DECODER)          += indeo3.lo
 558 +OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.lo
 559 +OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.lo
 560 +OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.lo
 561 +OBJS-$(CONFIG_LOCO_DECODER)            += loco.lo
 562 +OBJS-$(CONFIG_MACE3_DECODER)           += mace.lo
 563 +OBJS-$(CONFIG_MACE6_DECODER)           += mace.lo
 564 +OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.lo
 565 +OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudio.lo
 566 +OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.lo
 567 +OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.lo
 568 +OBJS-$(CONFIG_MSZH_DECODER)            += lcl.lo
 569 +OBJS-$(CONFIG_NUV_DECODER)             += nuv.lo rtjpeg.lo lzo.lo
 570 +OBJS-$(CONFIG_PNG_DECODER)             += png.lo
 571 +OBJS-$(CONFIG_PNG_ENCODER)             += png.lo
 572 +OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.lo
 573 +OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.lo
 574 +OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.lo
 575 +OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.lo
 576 +OBJS-$(CONFIG_RA_144_DECODER)          += ra144.lo
 577 +OBJS-$(CONFIG_RA_288_DECODER)          += ra288.lo
 578 +OBJS-$(CONFIG_ROQ_DECODER)             += roqvideo.lo
 579 +OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.lo
 580 +OBJS-$(CONFIG_RPZA_DECODER)            += rpza.lo
 581 +OBJS-$(CONFIG_RV10_DECODER)            += rv10.lo
 582 +OBJS-$(CONFIG_RV10_ENCODER)            += rv10.lo
 583 +OBJS-$(CONFIG_RV20_DECODER)            += rv10.lo
 584 +OBJS-$(CONFIG_RV20_ENCODER)            += rv10.lo
 585 +OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.lo
 586 +OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.lo
 587 +OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.lo
 588 +OBJS-$(CONFIG_SMC_DECODER)             += smc.lo
 589 +OBJS-$(CONFIG_SNOW_DECODER)            += snow.lo
 590 +OBJS-$(CONFIG_SNOW_ENCODER)            += snow.lo
 591 +OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.lo
 592 +OBJS-$(CONFIG_SONIC_DECODER)           += sonic.lo
 593 +OBJS-$(CONFIG_SONIC_ENCODER)           += sonic.lo
 594 +OBJS-$(CONFIG_SONIC_LS_DECODER)        += sonic.lo
 595 +OBJS-$(CONFIG_SVQ1_DECODER)            += svq1.lo
 596 +OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1.lo
 597 +OBJS-$(CONFIG_SVQ3_DECODER)            += h264.lo
 598 +OBJS-$(CONFIG_TARGA_DECODER)           += targa.lo
 599 +OBJS-$(CONFIG_THEORA_DECODER)          += vp3.lo
 600 +OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.lo
 601 +OBJS-$(CONFIG_TIFF_DECODER)            += tiff.lo lzw.lo
 602 +OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.lo
 603 +OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.lo
 604 +OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.lo
 605 +OBJS-$(CONFIG_TSCC_DECODER)            += tscc.lo
 606 +OBJS-$(CONFIG_TTA_DECODER)             += tta.lo
 607 +OBJS-$(CONFIG_ULTI_DECODER)            += ulti.lo
 608 +OBJS-$(CONFIG_VC1_DECODER)             += vc1.lo vc1dsp.lo
 609 +OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.lo
 610 +OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.lo
 611 +OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.lo
 612 +OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.lo
 613 +OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.lo
 614 +OBJS-$(CONFIG_VORBIS_DECODER)          += vorbis.lo vorbis_data.lo
 615 +OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.lo vorbis.lo vorbis_data.lo
 616 +OBJS-$(CONFIG_VP3_DECODER)             += vp3.lo
 617 +OBJS-$(CONFIG_VP5_DECODER)             += vp5.lo vp56.lo vp56data.lo
 618 +OBJS-$(CONFIG_VP6_DECODER)             += vp6.lo vp56.lo vp56data.lo
 619 +OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.lo
 620 +OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.lo
 621 +OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.lo
 622 +OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.lo
 623 +OBJS-$(CONFIG_WMV3_DECODER)            += vc1.lo vc1dsp.lo
 624 +OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.lo
 625 +OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.lo
 626 +OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.lo
 627 +OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.lo
 628 +OBJS-$(CONFIG_XAN_WC4_DECODER)         += xan.lo
 629 +OBJS-$(CONFIG_XL_DECODER)              += xl.lo
 630 +OBJS-$(CONFIG_ZLIB_DECODER)            += lcl.lo
 631 +OBJS-$(CONFIG_ZLIB_ENCODER)            += lcl.lo
 632 +OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.lo
 633 +
 634 +OBJS-$(CONFIG_PCM_S32LE_DECODER)       += pcm.lo
 635 +OBJS-$(CONFIG_PCM_S32LE_ENCODER)       += pcm.lo
 636 +OBJS-$(CONFIG_PCM_S32BE_DECODER)       += pcm.lo
 637 +OBJS-$(CONFIG_PCM_S32BE_ENCODER)       += pcm.lo
 638 +OBJS-$(CONFIG_PCM_U32LE_DECODER)       += pcm.lo
 639 +OBJS-$(CONFIG_PCM_U32LE_ENCODER)       += pcm.lo
 640 +OBJS-$(CONFIG_PCM_U32BE_DECODER)       += pcm.lo
 641 +OBJS-$(CONFIG_PCM_U32BE_ENCODER)       += pcm.lo
 642 +OBJS-$(CONFIG_PCM_S24LE_DECODER)       += pcm.lo
 643 +OBJS-$(CONFIG_PCM_S24LE_ENCODER)       += pcm.lo
 644 +OBJS-$(CONFIG_PCM_S24BE_DECODER)       += pcm.lo
 645 +OBJS-$(CONFIG_PCM_S24BE_ENCODER)       += pcm.lo
 646 +OBJS-$(CONFIG_PCM_U24LE_DECODER)       += pcm.lo
 647 +OBJS-$(CONFIG_PCM_U24LE_ENCODER)       += pcm.lo
 648 +OBJS-$(CONFIG_PCM_U24BE_DECODER)       += pcm.lo
 649 +OBJS-$(CONFIG_PCM_U24BE_ENCODER)       += pcm.lo
 650 +OBJS-$(CONFIG_PCM_S24DAUD_DECODER)     += pcm.lo
 651 +OBJS-$(CONFIG_PCM_S24DAUD_ENCODER)     += pcm.lo
 652 +OBJS-$(CONFIG_PCM_S16LE_DECODER)       += pcm.lo
 653 +OBJS-$(CONFIG_PCM_S16LE_ENCODER)       += pcm.lo
 654 +OBJS-$(CONFIG_PCM_S16BE_DECODER)       += pcm.lo
 655 +OBJS-$(CONFIG_PCM_S16BE_ENCODER)       += pcm.lo
 656 +OBJS-$(CONFIG_PCM_U16LE_DECODER)       += pcm.lo
 657 +OBJS-$(CONFIG_PCM_U16LE_ENCODER)       += pcm.lo
 658 +OBJS-$(CONFIG_PCM_U16BE_DECODER)       += pcm.lo
 659 +OBJS-$(CONFIG_PCM_U16BE_ENCODER)       += pcm.lo
 660 +OBJS-$(CONFIG_PCM_S8_DECODER)          += pcm.lo
 661 +OBJS-$(CONFIG_PCM_S8_ENCODER)          += pcm.lo
 662 +OBJS-$(CONFIG_PCM_U8_DECODER)          += pcm.lo
 663 +OBJS-$(CONFIG_PCM_U8_ENCODER)          += pcm.lo
 664 +OBJS-$(CONFIG_PCM_ALAW_DECODER)        += pcm.lo
 665 +OBJS-$(CONFIG_PCM_ALAW_ENCODER)        += pcm.lo
 666 +OBJS-$(CONFIG_PCM_MULAW_DECODER)       += pcm.lo
 667 +OBJS-$(CONFIG_PCM_MULAW_ENCODER)       += pcm.lo
 668 +
 669 +OBJS-$(CONFIG_ADPCM_4XM_DECODER)       += adpcm.lo
 670 +OBJS-$(CONFIG_ADPCM_4XM_ENCODER)       += adpcm.lo
 671 +OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adx.lo
 672 +OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adx.lo
 673 +OBJS-$(CONFIG_ADPCM_CT_DECODER)        += adpcm.lo
 674 +OBJS-$(CONFIG_ADPCM_CT_ENCODER)        += adpcm.lo
 675 +OBJS-$(CONFIG_ADPCM_EA_DECODER)        += adpcm.lo
 676 +OBJS-$(CONFIG_ADPCM_EA_ENCODER)        += adpcm.lo
 677 +OBJS-$(CONFIG_ADPCM_G726_DECODER)      += g726.lo
 678 +OBJS-$(CONFIG_ADPCM_G726_ENCODER)      += g726.lo
 679 +OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)   += adpcm.lo
 680 +OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER)   += adpcm.lo
 681 +OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)   += adpcm.lo
 682 +OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER)   += adpcm.lo
 683 +OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)    += adpcm.lo
 684 +OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)    += adpcm.lo
 685 +OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.lo
 686 +OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.lo
 687 +OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)   += adpcm.lo
 688 +OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)   += adpcm.lo
 689 +OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)    += adpcm.lo
 690 +OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER)    += adpcm.lo
 691 +OBJS-$(CONFIG_ADPCM_MS_DECODER)        += adpcm.lo
 692 +OBJS-$(CONFIG_ADPCM_MS_ENCODER)        += adpcm.lo
 693 +OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER)   += adpcm.lo
 694 +OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER)   += adpcm.lo
 695 +OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER)   += adpcm.lo
 696 +OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER)   += adpcm.lo
 697 +OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)   += adpcm.lo
 698 +OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER)   += adpcm.lo
 699 +OBJS-$(CONFIG_ADPCM_SWF_DECODER)       += adpcm.lo
 700 +OBJS-$(CONFIG_ADPCM_SWF_ENCODER)       += adpcm.lo
 701 +OBJS-$(CONFIG_ADPCM_XA_DECODER)        += adpcm.lo
 702 +OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.lo
 703 +OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.lo
 704 +OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.lo
 705 +
 706 +OBJS-$(CONFIG_FAAD)                    += faad.lo
 707 +OBJS-$(CONFIG_FAAC)                    += faac.lo
 708 +OBJS-$(CONFIG_XVID)                    += xvidff.lo xvid_rc.lo
 709 +OBJS-$(CONFIG_X264)                    += x264.lo
 710 +OBJS-$(CONFIG_MP3LAME)                 += mp3lameaudio.lo
 711 +OBJS-$(CONFIG_LIBVORBIS)               += oggvorbis.lo
 712 +OBJS-$(CONFIG_LIBGSM)                  += libgsm.lo
 713
 714  # currently using liba52 for ac3 decoding
 715 -OBJS-$(CONFIG_A52)                     += a52dec.o
 716 +OBJS-$(CONFIG_A52)                     += a52dec.lo
 717
 718  # using builtin liba52 or runtime linked liba52.so.0
 719 -OBJS-$(CONFIG_A52)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
 720 -                                          liba52/bitstream.o    \
 721 -                                          liba52/downmix.o      \
 722 -                                          liba52/imdct.o        \
 723 -                                          liba52/parse.o        \
 724 -                                          liba52/crc.o          \
 725 -                                          liba52/resample.o
 726 +OBJS-$(CONFIG_A52)$(CONFIG_A52BIN)     += liba52/bit_allocate.lo \
 727 +                                          liba52/bitstream.lo    \
 728 +                                          liba52/downmix.lo      \
 729 +                                          liba52/imdct.lo        \
 730 +                                          liba52/parse.lo        \
 731 +                                          liba52/crc.lo          \
 732 +                                          liba52/resample.lo
 733
 734  # currently using libdts for dts decoding
 735 -OBJS-$(CONFIG_DTS)                     += dtsdec.o
 736 +OBJS-$(CONFIG_DTS)                     += dtsdec.lo
 737
 738 -OBJS-$(CONFIG_AMR)                     += amr.o
 739 -OBJS-$(CONFIG_AMR_NB)                  += amr_float/sp_dec.o     \
 740 -                                          amr_float/sp_enc.o     \
 741 -                                          amr_float/interf_dec.o \
 742 -                                          amr_float/interf_enc.o
 743 +OBJS-$(CONFIG_AMR)                     += amr.lo
 744 +OBJS-$(CONFIG_AMR_NB)                  += amr_float/sp_dec.lo     \
 745 +                                          amr_float/sp_enc.lo     \
 746 +                                          amr_float/interf_dec.lo \
 747 +                                          amr_float/interf_enc.lo
 748
 749  ifeq ($(CONFIG_AMR_NB_FIXED),yes)
 750 -EXTRAOBJS += amr/*.o
 751 +EXTRAOBJS += amr/*.lo
 752  EXTRADEPS=amrlibs
 753  endif
 754
 755 -OBJS-$(CONFIG_AMR_WB)                  += amrwb_float/dec_acelp.o \
 756 -                                          amrwb_float/dec_dtx.o   \
 757 -                                          amrwb_float/dec_gain.o  \
 758 -                                          amrwb_float/dec_if.o    \
 759 -                                          amrwb_float/dec_lpc.o   \
 760 -                                          amrwb_float/dec_main.o  \
 761 -                                          amrwb_float/dec_rom.o   \
 762 -                                          amrwb_float/dec_util.o  \
 763 -                                          amrwb_float/enc_acelp.o \
 764 -                                          amrwb_float/enc_dtx.o   \
 765 -                                          amrwb_float/enc_gain.o  \
 766 -                                          amrwb_float/enc_if.o    \
 767 -                                          amrwb_float/enc_lpc.o   \
 768 -                                          amrwb_float/enc_main.o  \
 769 -                                          amrwb_float/enc_rom.o   \
 770 -                                          amrwb_float/enc_util.o  \
 771 -                                          amrwb_float/if_rom.o
 772 -
 773 -OBJS-$(CONFIG_AAC_PARSER)              += parser.o
 774 -OBJS-$(CONFIG_AC3_PARSER)              += parser.o
 775 -OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs.o parser.o
 776 -OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsubdec.o
 777 -OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsubdec.o
 778 -OBJS-$(CONFIG_H261_PARSER)             += h261.o
 779 -OBJS-$(CONFIG_H263_PARSER)             += h263dec.o
 780 -OBJS-$(CONFIG_H264_PARSER)             += h264.o
 781 -OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg.o
 782 -OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += parser.o
 783 -OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += parser.o
 784 -OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += parser.o
 785 -OBJS-$(CONFIG_PNM_PARSER)              += pnm.o
 786 -
 787 -OBJS-$(HAVE_PTHREADS)                  += pthread.o
 788 -OBJS-$(HAVE_W32THREADS)                += w32thread.o
 789 -OBJS-$(HAVE_OS2THREADS)                += os2thread.o
 790 -OBJS-$(HAVE_BEOSTHREADS)               += beosthread.o
 791 +OBJS-$(CONFIG_AMR_WB)                  += amrwb_float/dec_acelp.lo \
 792 +                                          amrwb_float/dec_dtx.lo   \
 793 +                                          amrwb_float/dec_gain.lo  \
 794 +                                          amrwb_float/dec_if.lo    \
 795 +                                          amrwb_float/dec_lpc.lo   \
 796 +                                          amrwb_float/dec_main.lo  \
 797 +                                          amrwb_float/dec_rom.lo   \
 798 +                                          amrwb_float/dec_util.lo  \
 799 +                                          amrwb_float/enc_acelp.lo \
 800 +                                          amrwb_float/enc_dtx.lo   \
 801 +                                          amrwb_float/enc_gain.lo  \
 802 +                                          amrwb_float/enc_if.lo    \
 803 +                                          amrwb_float/enc_lpc.lo   \
 804 +                                          amrwb_float/enc_main.lo  \
 805 +                                          amrwb_float/enc_rom.lo   \
 806 +                                          amrwb_float/enc_util.lo  \
 807 +                                          amrwb_float/if_rom.lo
 808 +
 809 +OBJS-$(CONFIG_AAC_PARSER)              += parser.lo
 810 +OBJS-$(CONFIG_AC3_PARSER)              += parser.lo
 811 +OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs.lo parser.lo
 812 +OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsubdec.lo
 813 +OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsubdec.lo
 814 +OBJS-$(CONFIG_H261_PARSER)             += h261.lo
 815 +OBJS-$(CONFIG_H263_PARSER)             += h263dec.lo
 816 +OBJS-$(CONFIG_H264_PARSER)             += h264.lo
 817 +OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg.lo
 818 +OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += parser.lo
 819 +OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += parser.lo
 820 +OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += parser.lo
 821 +OBJS-$(CONFIG_PNM_PARSER)              += pnm.lo
 822 +
 823 +OBJS-$(HAVE_PTHREADS)                  += pthread.lo
 824 +OBJS-$(HAVE_W32THREADS)                += w32thread.lo
 825 +OBJS-$(HAVE_OS2THREADS)                += os2thread.lo
 826 +OBJS-$(HAVE_BEOSTHREADS)               += beosthread.lo
 827
 828 -OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
 829 +OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.lo
 830
 831  ifneq ($(CONFIG_SWSCALER),yes)
 832 -OBJS += imgresample.o
 833 +OBJS += imgresample.lo
 834  endif
 835
 836  # i386 mmx specific stuff
 837  ifeq ($(TARGET_MMX),yes)
 838 -OBJS += i386/fdct_mmx.o \
 839 -        i386/cputest.o \
 840 -        i386/dsputil_mmx.o \
 841 -        i386/mpegvideo_mmx.o \
 842 -        i386/motion_est_mmx.o \
 843 -        i386/simple_idct_mmx.o \
 844 -        i386/idct_mmx_xvid.o \
 845 -        i386/fft_sse.o \
 846 -        i386/vp3dsp_mmx.o \
 847 -        i386/vp3dsp_sse2.o \
 848 -        i386/fft_3dn.o \
 849 -        i386/fft_3dn2.o \
 850 -        i386/snowdsp_mmx.o \
 851 +OBJS += i386/fdct_mmx.lo \
 852 +        i386/cputest.lo \
 853 +        i386/dsputil_mmx.lo \
 854 +        i386/mpegvideo_mmx.lo \
 855 +        i386/motion_est_mmx.lo \
 856 +        i386/simple_idct_mmx.lo \
 857 +        i386/idct_mmx_xvid.lo \
 858 +        i386/fft_sse.lo \
 859 +        i386/vp3dsp_mmx.lo \
 860 +        i386/vp3dsp_sse2.lo \
 861 +        i386/fft_3dn.lo \
 862 +        i386/fft_3dn2.lo \
 863 +        i386/snowdsp_mmx.lo \
 864
 865  ifeq ($(CONFIG_GPL),yes)
 866 -OBJS += i386/idct_mmx.o
 867 +OBJS += i386/idct_mmx.lo
 868  endif
 869  ifeq ($(CONFIG_CAVS_DECODER),yes)
 870 -OBJS += i386/cavsdsp_mmx.o
 871 +OBJS += i386/cavsdsp_mmx.lo
 872  endif
 873  endif
 874
 875  # armv4l specific stuff
 876 -ASM_OBJS-$(TARGET_ARCH_ARMV4L)         += armv4l/jrevdct_arm.o     \
 877 -                                          armv4l/simple_idct_arm.o \
 878 -                                          armv4l/dsputil_arm_s.o   \
 879 +ASM_OBJS-$(TARGET_ARCH_ARMV4L)         += armv4l/jrevdct_arm.lo     \
 880 +                                          armv4l/simple_idct_arm.lo \
 881 +                                          armv4l/dsputil_arm_s.lo   \
 882
 883 -OBJS-$(TARGET_ARCH_ARMV4L)             += armv4l/dsputil_arm.o   \
 884 -                                          armv4l/mpegvideo_arm.o \
 885 +OBJS-$(TARGET_ARCH_ARMV4L)             += armv4l/dsputil_arm.lo   \
 886 +                                          armv4l/mpegvideo_arm.lo \
 887
 888 -OBJS-$(TARGET_IWMMXT)                  += armv4l/dsputil_iwmmxt.o   \
 889 -                                          armv4l/mpegvideo_iwmmxt.o \
 890 +OBJS-$(TARGET_IWMMXT)                  += armv4l/dsputil_iwmmxt.lo   \
 891 +                                          armv4l/mpegvideo_iwmmxt.lo \
 892
 893 -ASM_OBJS-$(TARGET_ARMV5TE)             += armv4l/simple_idct_armv5te.o \
 894 +ASM_OBJS-$(TARGET_ARMV5TE)             += armv4l/simple_idct_armv5te.lo \
 895
 896  # sun sparc
 897 -OBJS-$(TARGET_ARCH_SPARC)              += sparc/dsputil_vis.o \
 898 +OBJS-$(TARGET_ARCH_SPARC)              += sparc/dsputil_vis.lo \
 899
 900 -sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
 901 +sparc/dsputil_vis.lo: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
 902
 903  # sun mediaLib specific stuff
 904 -OBJS-$(HAVE_MLIB)                      += mlib/dsputil_mlib.o \
 905 +OBJS-$(HAVE_MLIB)                      += mlib/dsputil_mlib.lo \
 906
 907  # alpha specific stuff
 908 -OBJS-$(TARGET_ARCH_ALPHA)              += alpha/dsputil_alpha.o     \
 909 -                                          alpha/mpegvideo_alpha.o   \
 910 -                                          alpha/simple_idct_alpha.o \
 911 -                                          alpha/motion_est_alpha.o  \
 912 -
 913 -ASM_OBJS-$(TARGET_ARCH_ALPHA)          += alpha/dsputil_alpha_asm.o  \
 914 -                                          alpha/motion_est_mvi_asm.o \
 915 -
 916 -OBJS-$(TARGET_ARCH_POWERPC)            += ppc/dsputil_ppc.o   \
 917 -                                          ppc/mpegvideo_ppc.o \
 918 -
 919 -OBJS-$(TARGET_MMI)                     += ps2/dsputil_mmi.o   \
 920 -                                          ps2/idct_mmi.o      \
 921 -                                          ps2/mpegvideo_mmi.o \
 922 -
 923 -OBJS-$(TARGET_ARCH_SH4)                += sh4/idct_sh4.o      \
 924 -                                          sh4/dsputil_sh4.o   \
 925 -                                          sh4/dsputil_align.o \
 926 -
 927 -OBJS-$(TARGET_ALTIVEC)                 += ppc/dsputil_altivec.o      \
 928 -                                          ppc/mpegvideo_altivec.o    \
 929 -                                          ppc/idct_altivec.o         \
 930 -                                          ppc/fft_altivec.o          \
 931 -                                          ppc/gmc_altivec.o          \
 932 -                                          ppc/fdct_altivec.o         \
 933 -                                          ppc/float_altivec.o        \
 934 +OBJS-$(TARGET_ARCH_ALPHA)              += alpha/dsputil_alpha.lo     \
 935 +                                          alpha/mpegvideo_alpha.lo   \
 936 +                                          alpha/simple_idct_alpha.lo \
 937 +                                          alpha/motion_est_alpha.lo  \
 938 +
 939 +ASM_OBJS-$(TARGET_ARCH_ALPHA)          += alpha/dsputil_alpha_asm.lo  \
 940 +                                          alpha/motion_est_mvi_asm.lo \
 941 +
 942 +OBJS-$(TARGET_ARCH_POWERPC)            += ppc/dsputil_ppc.lo   \
 943 +                                          ppc/mpegvideo_ppc.lo \
 944 +
 945 +OBJS-$(TARGET_MMI)                     += ps2/dsputil_mmi.lo   \
 946 +                                          ps2/idct_mmi.lo      \
 947 +                                          ps2/mpegvideo_mmi.lo \
 948 +
 949 +OBJS-$(TARGET_ARCH_SH4)                += sh4/idct_sh4.lo      \
 950 +                                          sh4/dsputil_sh4.lo   \
 951 +                                          sh4/dsputil_align.lo \
 952 +
 953 +OBJS-$(TARGET_ALTIVEC)                 += ppc/dsputil_altivec.lo      \
 954 +                                          ppc/mpegvideo_altivec.lo    \
 955 +                                          ppc/idct_altivec.lo         \
 956 +                                          ppc/fft_altivec.lo          \
 957 +                                          ppc/gmc_altivec.lo          \
 958 +                                          ppc/fdct_altivec.lo         \
 959 +                                          ppc/float_altivec.lo        \
 960
 961  ifeq ($(TARGET_ALTIVEC),yes)
 962 -OBJS-$(CONFIG_H264_DECODER)            += ppc/h264_altivec.o
 963 -OBJS-$(CONFIG_SNOW_DECODER)            += ppc/snow_altivec.o
 964 -OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
 965 -OBJS-$(CONFIG_WMV3_DECODER)            += ppc/vc1dsp_altivec.o
 966 +OBJS-$(CONFIG_H264_DECODER)            += ppc/h264_altivec.lo
 967 +OBJS-$(CONFIG_SNOW_DECODER)            += ppc/snow_altivec.lo
 968 +OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.lo
 969 +OBJS-$(CONFIG_WMV3_DECODER)            += ppc/vc1dsp_altivec.lo
 970  endif
 971
 972 -OBJS-$(TARGET_ARCH_BFIN)               += bfin/dsputil_bfin.o \
 973 +OBJS-$(TARGET_ARCH_BFIN)               += bfin/dsputil_bfin.lo \
 974
 975 -CFLAGS += $(CFLAGS-yes)
 976 -OBJS += $(OBJS-yes)
 977 -ASM_OBJS += $(ASM_OBJS-yes)
 978 +OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
 979 +ASM_OBJS += $(shell echo $(ASM_OBJS-yes) | tr ' ' '\n' | sort -u)
 980
 981 -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 982 +EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
 983
 984  NAME=avcodec
 985  ifeq ($(BUILD_SHARED),yes)
 986 @@ -425,21 +424,21 @@
 987
 988  clean::
 989         rm -f \
 990 -          i386/*.o i386/*~ \
 991 -          armv4l/*.o armv4l/*~ \
 992 -          mlib/*.o mlib/*~ \
 993 -          alpha/*.o alpha/*~ \
 994 -          ppc/*.o ppc/*~ \
 995 -          ps2/*.o ps2/*~ \
 996 -          sh4/*.o sh4/*~ \
 997 -          sparc/*.o sparc/*~ \
 998 -          liba52/*.o liba52/*~ \
 999 -          amr_float/*.o \
1000 +          i386/*.lo i386/*~ \
1001 +          armv4l/*.lo armv4l/*~ \
1002 +          mlib/*.lo mlib/*~ \
1003 +          alpha/*.lo alpha/*~ \
1004 +          ppc/*.lo ppc/*~ \
1005 +          ps2/*.lo ps2/*~ \
1006 +          sh4/*.lo sh4/*~ \
1007 +          sparc/*.lo sparc/*~ \
1008 +          liba52/*.lo liba52/*~ \
1009 +          amr_float/*.lo \
1010            apiexample $(TESTS)
1011         -$(MAKE) -C amr clean
1012         -$(MAKE) -C amrwb_float -f makefile.gcc clean
1013
1014 -apiexample: apiexample.o $(LIB)
1015 +apiexample: apiexample.lo $(LIB)
1016
1017  cpuid_test: i386/cputest.c
1018         $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
1019 @@ -447,10 +446,10 @@
1020  imgresample-test: imgresample.c $(LIB)
1021         $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
1022
1023 -dct-test: dct-test.o fdctref.o $(LIB)
1024 +dct-test: dct-test.lo fdctref.lo $(LIB)
1025
1026 -motion-test: motion_test.o $(LIB)
1027 +motion-test: motion_test.lo $(LIB)
1028
1029 -fft-test: fft-test.o $(LIB)
1030 +fft-test: fft-test.lo $(LIB)
1031
1032  .PHONY: amrlibs tests
1033 --- ffmpeg-export-2006-12-04/libavformat/Makefile       2006-11-21 15:18:21.000000000 +0200
1034 +++ ffmpeg-export-2006-12-04.libtool2/libavformat/Makefile      2006-12-05 13:08:44.131688378 +0200
1035 @@ -6,187 +6,186 @@
1036
1037  CFLAGS+=-I$(SRC_PATH)/libavcodec
1038
1039 -OBJS= utils.o cutils.o os_support.o allformats.o
1040 +OBJS= utils.lo cutils.lo os_support.lo allformats.lo
1041
1042  HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
1043
1044  # muxers/demuxers
1045 -OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o
1046 -OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
1047 -OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.o riff.o
1048 -OBJS-$(CONFIG_AIFF_MUXER)                += aiff.o riff.o
1049 -OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o
1050 -OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
1051 -OBJS-$(CONFIG_ASF_DEMUXER)               += asf.o riff.o
1052 -OBJS-$(CONFIG_ASF_MUXER)                 += asf-enc.o riff.o
1053 -OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asf-enc.o riff.o
1054 -OBJS-$(CONFIG_AU_DEMUXER)                += au.o riff.o
1055 -OBJS-$(CONFIG_AU_MUXER)                  += au.o riff.o
1056 -OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o riff.o
1057 -OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o riff.o
1058 -OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
1059 -OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o riff.o
1060 -OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
1061 -OBJS-$(CONFIG_FRAMECRC_MUXER)            += crc.o
1062 -OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
1063 -OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
1064 -OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
1065 -OBJS-$(CONFIG_DV_MUXER)                  += dvenc.o
1066 -OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.o
1067 -OBJS-$(CONFIG_FFM_DEMUXER)               += ffm.o
1068 -OBJS-$(CONFIG_FFM_MUXER)                 += ffm.o
1069 -OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.o
1070 -OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.o
1071 -OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.o
1072 -OBJS-$(CONFIG_GIF_MUXER)                 += gif.o
1073 -OBJS-$(CONFIG_GIF_DEMUXER)               += gifdec.o
1074 -OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.o
1075 -OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
1076 -OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
1077 -OBJS-$(CONFIG_IMAGE2_DEMUXER)            += img2.o
1078 -OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER)        += img2.o
1079 -OBJS-$(CONFIG_IMAGE2_MUXER)              += img2.o
1080 -OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.o
1081 -OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
1082 -OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroska.o riff.o
1083 -OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
1084 -OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o riff.o
1085 -OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o riff.o
1086 -OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o riff.o isom.o
1087 -OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o
1088 -OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.o
1089 -OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o isom.o
1090 -OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o
1091 -OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o
1092 -OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o riff.o isom.o
1093 -OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o
1094 -OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o
1095 -OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o
1096 -OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpeg.o
1097 -OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpeg.o
1098 -OBJS-$(CONFIG_MPEG2VOB_MUXER)            += mpeg.o
1099 -OBJS-$(CONFIG_MPEG2SVCD_MUXER)           += mpeg.o
1100 -OBJS-$(CONFIG_MPEG2DVD_MUXER)            += mpeg.o
1101 -OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.o
1102 -OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.o
1103 -OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
1104 -OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
1105 -OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.o
1106 -OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o riff.o
1107 -OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
1108 -OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
1109 -                                            oggparsevorbis.o \
1110 -                                            oggparsetheora.o \
1111 -                                            oggparseflac.o   \
1112 -                                            oggparseogm.o    \
1113 -                                            riff.o
1114 -OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
1115 -OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
1116 -OBJS-$(CONFIG_FLAC_DEMUXER)              += raw.o
1117 -OBJS-$(CONFIG_FLAC_MUXER)                += raw.o
1118 -OBJS-$(CONFIG_AC3_DEMUXER)               += raw.o
1119 -OBJS-$(CONFIG_AC3_MUXER)                 += raw.o
1120 -OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o
1121 -OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o
1122 -OBJS-$(CONFIG_H261_DEMUXER)              += raw.o
1123 -OBJS-$(CONFIG_H261_MUXER)                += raw.o
1124 -OBJS-$(CONFIG_H263_DEMUXER)              += raw.o
1125 -OBJS-$(CONFIG_H263_MUXER)                += raw.o
1126 -OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
1127 -OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
1128 -OBJS-$(CONFIG_H264_DEMUXER)              += raw.o
1129 -OBJS-$(CONFIG_H264_MUXER)                += raw.o
1130 -OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += raw.o
1131 -OBJS-$(CONFIG_MPEG1VIDEO_MUXER)          += raw.o
1132 -OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += raw.o
1133 -OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.o
1134 -OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
1135 -OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
1136 -OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o
1137 -OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o
1138 -OBJS-$(CONFIG_NULL_MUXER)                += raw.o
1139 -OBJS-$(CONFIG_RM_DEMUXER)                += rm.o
1140 -OBJS-$(CONFIG_RM_MUXER)                  += rm.o
1141 -OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
1142 -OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.o
1143 -OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
1144 -OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o
1145 -OBJS-$(CONFIG_SWF_DEMUXER)               += swf.o
1146 -OBJS-$(CONFIG_SWF_MUXER)                 += swf.o
1147 -OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
1148 -OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
1149 -OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.o voc.o riff.o
1150 -OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.o voc.o riff.o
1151 -OBJS-$(CONFIG_WAV_DEMUXER)               += wav.o riff.o
1152 -OBJS-$(CONFIG_WAV_MUXER)                 += wav.o riff.o
1153 -OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
1154 -OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
1155 -OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
1156 -OBJS-$(CONFIG_WV_DEMUXER)                += wv.o
1157 -OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.o
1158 -OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
1159 +OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.lo
1160 +OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.lo
1161 +OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.lo riff.lo
1162 +OBJS-$(CONFIG_AIFF_MUXER)                += aiff.lo riff.lo
1163 +OBJS-$(CONFIG_AMR_DEMUXER)               += amr.lo
1164 +OBJS-$(CONFIG_AMR_MUXER)                 += amr.lo
1165 +OBJS-$(CONFIG_ASF_DEMUXER)               += asf.lo riff.lo
1166 +OBJS-$(CONFIG_ASF_MUXER)                 += asf-enc.lo riff.lo
1167 +OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asf-enc.lo riff.lo
1168 +OBJS-$(CONFIG_AU_DEMUXER)                += au.lo riff.lo
1169 +OBJS-$(CONFIG_AU_MUXER)                  += au.lo riff.lo
1170 +OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.lo riff.lo
1171 +OBJS-$(CONFIG_AVI_MUXER)                 += avienc.lo riff.lo
1172 +OBJS-$(CONFIG_AVISYNTH)                  += avisynth.lo
1173 +OBJS-$(CONFIG_AVS_DEMUXER)               += avs.lo vocdec.lo voc.lo riff.lo
1174 +OBJS-$(CONFIG_CRC_MUXER)                 += crc.lo
1175 +OBJS-$(CONFIG_FRAMECRC_MUXER)            += crc.lo
1176 +OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.lo
1177 +OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.lo
1178 +OBJS-$(CONFIG_DV_DEMUXER)                += dv.lo
1179 +OBJS-$(CONFIG_DV_MUXER)                  += dvenc.lo
1180 +OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.lo
1181 +OBJS-$(CONFIG_FFM_DEMUXER)               += ffm.lo
1182 +OBJS-$(CONFIG_FFM_MUXER)                 += ffm.lo
1183 +OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.lo
1184 +OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.lo
1185 +OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.lo
1186 +OBJS-$(CONFIG_GIF_MUXER)                 += gif.lo
1187 +OBJS-$(CONFIG_GIF_DEMUXER)               += gifdec.lo
1188 +OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.lo
1189 +OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.lo
1190 +OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.lo
1191 +OBJS-$(CONFIG_IMAGE2_DEMUXER)            += img2.lo
1192 +OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER)        += img2.lo
1193 +OBJS-$(CONFIG_IMAGE2_MUXER)              += img2.lo
1194 +OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.lo
1195 +OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.lo
1196 +OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroska.lo riff.lo
1197 +OBJS-$(CONFIG_MM_DEMUXER)                += mm.lo
1198 +OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.lo riff.lo
1199 +OBJS-$(CONFIG_MMF_MUXER)                 += mmf.lo riff.lo
1200 +OBJS-$(CONFIG_MOV_DEMUXER)               += mov.lo riff.lo isom.lo
1201 +OBJS-$(CONFIG_MOV_MUXER)                 += movenc.lo riff.lo isom.lo
1202 +OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.lo
1203 +OBJS-$(CONFIG_TGP_MUXER)                 += movenc.lo riff.lo isom.lo
1204 +OBJS-$(CONFIG_MP4_MUXER)                 += movenc.lo riff.lo isom.lo
1205 +OBJS-$(CONFIG_PSP_MUXER)                 += movenc.lo riff.lo isom.lo
1206 +OBJS-$(CONFIG_TG2_MUXER)                 += movenc.lo riff.lo isom.lo
1207 +OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.lo
1208 +OBJS-$(CONFIG_MP2_MUXER)                 += mp3.lo
1209 +OBJS-$(CONFIG_MP3_MUXER)                 += mp3.lo
1210 +OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpeg.lo
1211 +OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpeg.lo
1212 +OBJS-$(CONFIG_MPEG2VOB_MUXER)            += mpeg.lo
1213 +OBJS-$(CONFIG_MPEG2SVCD_MUXER)           += mpeg.lo
1214 +OBJS-$(CONFIG_MPEG2DVD_MUXER)            += mpeg.lo
1215 +OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.lo
1216 +OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.lo
1217 +OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.lo
1218 +OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.lo
1219 +OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.lo
1220 +OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.lo riff.lo
1221 +OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.lo riff.lo
1222 +OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.lo           \
1223 +                                            oggparsevorbis.lo \
1224 +                                            oggparsetheora.lo \
1225 +                                            oggparseflac.lo   \
1226 +                                            oggparseogm.lo    \
1227 +                                            riff.lo
1228 +OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.lo
1229 +OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.lo
1230 +OBJS-$(CONFIG_FLAC_DEMUXER)              += raw.lo
1231 +OBJS-$(CONFIG_FLAC_MUXER)                += raw.lo
1232 +OBJS-$(CONFIG_AC3_DEMUXER)               += raw.lo
1233 +OBJS-$(CONFIG_AC3_MUXER)                 += raw.lo
1234 +OBJS-$(CONFIG_DTS_DEMUXER)               += raw.lo
1235 +OBJS-$(CONFIG_AAC_DEMUXER)               += raw.lo
1236 +OBJS-$(CONFIG_H261_DEMUXER)              += raw.lo
1237 +OBJS-$(CONFIG_H261_MUXER)                += raw.lo
1238 +OBJS-$(CONFIG_H263_DEMUXER)              += raw.lo
1239 +OBJS-$(CONFIG_H263_MUXER)                += raw.lo
1240 +OBJS-$(CONFIG_M4V_DEMUXER)               += raw.lo
1241 +OBJS-$(CONFIG_M4V_MUXER)                 += raw.lo
1242 +OBJS-$(CONFIG_H264_DEMUXER)              += raw.lo
1243 +OBJS-$(CONFIG_H264_MUXER)                += raw.lo
1244 +OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += raw.lo
1245 +OBJS-$(CONFIG_MPEG1VIDEO_MUXER)          += raw.lo
1246 +OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += raw.lo
1247 +OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.lo
1248 +OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.lo
1249 +OBJS-$(CONFIG_MJPEG_MUXER)               += raw.lo
1250 +OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.lo
1251 +OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.lo
1252 +OBJS-$(CONFIG_NULL_MUXER)                += raw.lo
1253 +OBJS-$(CONFIG_RM_DEMUXER)                += rm.lo
1254 +OBJS-$(CONFIG_RM_MUXER)                  += rm.lo
1255 +OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.lo
1256 +OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.lo
1257 +OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.lo
1258 +OBJS-$(CONFIG_SOL_DEMUXER)               += sol.lo
1259 +OBJS-$(CONFIG_SWF_DEMUXER)               += swf.lo
1260 +OBJS-$(CONFIG_SWF_MUXER)                 += swf.lo
1261 +OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.lo
1262 +OBJS-$(CONFIG_TTA_DEMUXER)               += tta.lo
1263 +OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.lo voc.lo riff.lo
1264 +OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.lo voc.lo riff.lo
1265 +OBJS-$(CONFIG_WAV_DEMUXER)               += wav.lo riff.lo
1266 +OBJS-$(CONFIG_WAV_MUXER)                 += wav.lo riff.lo
1267 +OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.lo
1268 +OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.lo
1269 +OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.lo
1270 +OBJS-$(CONFIG_WV_DEMUXER)                += wv.lo
1271 +OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.lo
1272 +OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.lo
1273
1274 -OBJS+= framehook.o
1275 +OBJS+= framehook.lo
1276
1277  ifeq ($(CONFIG_VIDEO4LINUX),yes)
1278 -OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
1279 +OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.lo
1280  endif
1281
1282  ifeq ($(CONFIG_VIDEO4LINUX2),yes)
1283 -OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
1284 +OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.lo
1285  endif
1286
1287  ifeq ($(CONFIG_BKTR),yes)
1288 -OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
1289 +OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.lo
1290  endif
1291
1292  ifeq ($(CONFIG_DV1394),yes)
1293 -OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
1294 +OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.lo
1295  endif
1296
1297  ifeq ($(CONFIG_DC1394),yes)
1298 -OBJS-$(CONFIG_DC1394_DEMUXER)            += dc1394.o
1299 +OBJS-$(CONFIG_DC1394_DEMUXER)            += dc1394.lo
1300  endif
1301
1302  ifeq ($(CONFIG_AUDIO_OSS),yes)
1303 -OBJS-$(CONFIG_AUDIO_DEMUXER)             += audio.o
1304 -OBJS-$(CONFIG_AUDIO_MUXER)               += audio.o
1305 +OBJS-$(CONFIG_AUDIO_DEMUXER)             += audio.lo
1306 +OBJS-$(CONFIG_AUDIO_MUXER)               += audio.lo
1307  endif
1308
1309 -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
1310 -             -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
1311 +EXTRALIBS += ../libavcodec/libavcodec.la ../libavutil/libavutil.la
1312
1313  ifeq ($(CONFIG_AUDIO_BEOS),yes)
1314 -CPPOBJS+= beosaudio.o
1315 +CPPOBJS+= beosaudio.lo
1316  endif
1317
1318  # protocols I/O
1319 -OBJS+= avio.o aviobuf.o
1320 +OBJS+= avio.lo aviobuf.lo
1321
1322  ifeq ($(CONFIG_PROTOCOLS),yes)
1323 -OBJS+= file.o
1324 +OBJS+= file.lo
1325  ifeq ($(CONFIG_NETWORK),yes)
1326 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
1327 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo mpegts.lo base64.lo rtp_h264.lo
1328  endif
1329  endif
1330
1331  ifeq ($(CONFIG_LIBNUT),yes)
1332 -OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.o riff.o
1333 -OBJS-$(CONFIG_NUT_MUXER)                 += libnut.o riff.o
1334 +OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.lo riff.lo
1335 +OBJS-$(CONFIG_NUT_MUXER)                 += libnut.lo riff.lo
1336  else
1337 -OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
1338 -#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
1339 +OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.lo riff.lo
1340 +#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.lo riff.lo
1341  endif
1342
1343  ifeq ($(CONFIG_LIBOGG),yes)
1344 -OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
1345 +OBJS-$(CONFIG_OGG_MUXER)                 += ogg.lo
1346  endif
1347
1348  ifeq ($(CONFIG_GPL),yes)
1349 -OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o
1350 +OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.lo
1351  endif
1352
1353 -OBJS += $(OBJS-yes)
1354 +OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
1355
1356  NAME=avformat
1357  ifeq ($(BUILD_SHARED),yes)
1358 --- ffmpeg-export-2006-12-04/libavutil/Makefile 2006-11-14 03:02:30.000000000 +0200
1359 +++ ffmpeg-export-2006-12-04.libtool2/libavutil/Makefile        2006-12-05 13:08:44.141688603 +0200
1360 @@ -5,17 +5,17 @@
1361
1362  CFLAGS+=-DBUILD_AVUTIL
1363
1364 -OBJS= mathematics.o \
1365 -      rational.o \
1366 -      intfloat_readwrite.o \
1367 -      crc.o \
1368 -      md5.o \
1369 -      lls.o \
1370 -      adler32.o \
1371 -      log.o \
1372 -      mem.o \
1373 -      fifo.o \
1374 -      tree.o \
1375 +OBJS= mathematics.lo \
1376 +      rational.lo \
1377 +      intfloat_readwrite.lo \
1378 +      crc.lo \
1379 +      md5.lo \
1380 +      lls.lo \
1381 +      adler32.lo \
1382 +      log.lo \
1383 +      mem.lo \
1384 +      fifo.lo \
1385 +      tree.lo \
1386
1387  HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
1388            intfloat_readwrite.h md5.h adler32.h log.h fifo.h
1389 --- ffmpeg-export-2006-12-04/libpostproc/Makefile       2006-11-08 02:02:15.000000000 +0200
1390 +++ ffmpeg-export-2006-12-04.libtool2/libpostproc/Makefile      2006-12-05 13:08:44.131688378 +0200
1391 @@ -12,8 +12,8 @@
1392  LIBMAJOR=$(SPPMAJOR)
1393  endif
1394
1395 -STATIC_OBJS=postprocess.o
1396 -SHARED_OBJS=postprocess_pic.o
1397 +STATIC_OBJS=postprocess.lo
1398 +SHARED_OBJS=postprocess_pic.lo
1399
1400  HEADERS = postprocess.h
1401
1402 @@ -21,6 +21,5 @@
1403
1404  depend dep: postprocess.c
1405
1406 -postprocess_pic.o: postprocess.c
1407 -       $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
1408 -
1409 +postprocess_pic.lo: postprocess.c
1410 +       libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
1411 --- ffmpeg-export-2006-12-04/vhook/Makefile     2006-11-08 02:02:15.000000000 +0200
1412 +++ ffmpeg-export-2006-12-04.libtool2/vhook/Makefile    2006-12-05 13:08:44.141688603 +0200
1413 @@ -28,8 +28,8 @@
1414         $(CC) -MM $(CFLAGS) $^ 1>.depend
1415
1416  install: $(HOOKS)
1417 -       install -d "$(shlibdir)/vhook"
1418 -       install -m 755 $(HOOKS) "$(shlibdir)/vhook"
1419 +       install -d "$(DESTDIR)$(shlibdir)/vhook"
1420 +       install -m 755 $(HOOKS) "$(DESTDIR)$(shlibdir)/vhook"
1421
1422  uninstall:
1423         rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))