From 3e1cf06af67bd377d2adebc595d72dbdd4009ad5 Mon Sep 17 00:00:00 2001
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Thu, 14 May 2009 16:46:32 +0200
Subject: [PATCH] The first step in omkization.

Libraries Makefile.omk modified to use (.c) source
names instead of (.o) and libraries build translated
to OMK style.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
 libavcodec/Makefile.omk  | 1024 +++++++++++++++++++-------------------
 libavdevice/Makefile.omk |   36 +-
 libavfilter/Makefile.omk |   16 +-
 libavformat/Makefile.omk |  478 +++++++++---------
 libavutil/Makefile.omk   |   52 +-
 libpostproc/Makefile.omk |    8 +-
 6 files changed, 804 insertions(+), 810 deletions(-)

diff --git a/libavcodec/Makefile.omk b/libavcodec/Makefile.omk
index 505d27830..f169ab9aa 100644
--- a/libavcodec/Makefile.omk
+++ b/libavcodec/Makefile.omk
@@ -1,541 +1,542 @@
-include $(SUBDIR)../config.mak
-
 NAME = avcodec
 FFLIBS = avutil
 
 HEADERS = avcodec.h opt.h vdpau.h xvmc.h
 
-OBJS = allcodecs.o                                                      \
-       audioconvert.o                                                   \
-       avpacket.o                                                       \
-       bitstream.o                                                      \
-       bitstream_filter.o                                               \
-       dsputil.o                                                        \
-       eval.o                                                           \
-       faanidct.o                                                       \
-       imgconvert.o                                                     \
-       jrevdct.o                                                        \
-       opt.o                                                            \
-       options.o                                                        \
-       parser.o                                                         \
-       raw.o                                                            \
-       resample.o                                                       \
-       resample2.o                                                      \
-       simple_idct.o                                                    \
-       utils.o                                                          \
+OBJS = allcodecs.c                                                      \
+       audioconvert.c                                                   \
+       avpacket.c                                                       \
+       bitstream.c                                                      \
+       bitstream_filter.c                                               \
+       dsputil.c                                                        \
+       eval.c                                                           \
+       faanidct.c                                                       \
+       imgconvert.c                                                     \
+       jrevdct.c                                                        \
+       opt.c                                                            \
+       options.c                                                        \
+       parser.c                                                         \
+       raw.c                                                            \
+       resample.c                                                       \
+       resample2.c                                                      \
+       simple_idct.c                                                    \
+       utils.c                                                          \
 
 # parts needed for many different codecs
-OBJS-$(CONFIG_AANDCT)                  += aandcttab.o
-OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
-OBJS-$(CONFIG_FFT)                     += fft.o
-OBJS-$(CONFIG_GOLOMB)                  += golomb.o
-OBJS-$(CONFIG_MDCT)                    += mdct.o
-OBJS-$(CONFIG_RDFT)                    += rdft.o
+OBJS-$(CONFIG_AANDCT)                  += aandcttab.c
+OBJS-$(CONFIG_ENCODERS)                += faandct.c jfdctfst.c jfdctint.c
+OBJS-$(CONFIG_FFT)                     += fft.c
+OBJS-$(CONFIG_GOLOMB)                  += golomb.c
+OBJS-$(CONFIG_MDCT)                    += mdct.c
+OBJS-$(CONFIG_RDFT)                    += rdft.c
 
 # decoders/encoders/hardware accelerators
-OBJS-$(CONFIG_AAC_DECODER)             += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o
-OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o
-OBJS-$(CONFIG_AC3_DECODER)             += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
-OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
-OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
-OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
-OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_APE_DECODER)             += apedec.o
-OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o
-OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o mpeg12data.o
-OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o mpeg12data.o
-OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.o mpeg12data.o
-OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o
-OBJS-$(CONFIG_AVS_DECODER)             += avs.o
-OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.o
-OBJS-$(CONFIG_BFI_DECODER)             += bfi.o
-OBJS-$(CONFIG_BMP_DECODER)             += bmp.o msrledec.o
-OBJS-$(CONFIG_BMP_ENCODER)             += bmpenc.o
-OBJS-$(CONFIG_C93_DECODER)             += c93.o
-OBJS-$(CONFIG_CAVS_DECODER)            += cavs.o cavsdec.o cavsdsp.o mpeg12data.o mpegvideo.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
-OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
-OBJS-$(CONFIG_DCA_DECODER)             += dca.o
-OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
-OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
-OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
-OBJS-$(CONFIG_DSICINVIDEO_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_DXA_DECODER)             += dxa.o
-OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
-OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
-OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o
-OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.o
-OBJS-$(CONFIG_EATQI_DECODER)           += eatqi.o eaidct.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.o
-OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER)    += 8svx.o
-OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER)    += 8svx.o
-OBJS-$(CONFIG_ESCAPE124_DECODER)       += escape124.o
-OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.o rangecoder.o
-OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.o rangecoder.o
-OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o
-OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o
-OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o lpc.o
-OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
-OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
-OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
-OBJS-$(CONFIG_FLV_DECODER)             += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_FLV_ENCODER)             += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
-OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o huffman.o
-OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
-OBJS-$(CONFIG_GIF_ENCODER)             += gif.o
-OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
-OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg4.o
-OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
-OBJS-$(CONFIG_H264_VDPAU_DECODER)      += vdpau.o h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.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_DPCM_DECODER)  += dpcm.o
-OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
-OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.o jpegls.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_JPEGLS_ENCODER)          += jpeglsenc.o jpegls.o
-OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.o
-OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
-OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
-OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
-OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
-OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
-OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
-OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlp_parser.o mlp.o mlpdsp.o
-OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
-OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.o
-OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MP3ADU_DECODER)          += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MP3ON4_DECODER)          += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o mpeg4audio.o
-OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPEG_VDPAU_DECODER)      += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG1_VDPAU_DECODER)     += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg2.o
-OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG4_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg4.o
-OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o msrledec.o
-OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
-OBJS-$(CONFIG_MSZH_DECODER)            += lcldec.o
-OBJS-$(CONFIG_NELLYMOSER_DECODER)      += nellymoserdec.o nellymoser.o
-OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
-OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o
-OBJS-$(CONFIG_PAM_DECODER)             += pnmenc.o pnm.o
-OBJS-$(CONFIG_PAM_ENCODER)             += pnmenc.o
-OBJS-$(CONFIG_PBM_DECODER)             += pnmenc.o pnm.o
-OBJS-$(CONFIG_PBM_ENCODER)             += pnmenc.o
-OBJS-$(CONFIG_PCX_DECODER)             += pcx.o
-OBJS-$(CONFIG_PCX_ENCODER)             += pcxenc.o
-OBJS-$(CONFIG_PGM_DECODER)             += pnmenc.o pnm.o
-OBJS-$(CONFIG_PGM_ENCODER)             += pnmenc.o
-OBJS-$(CONFIG_PGMYUV_DECODER)          += pnmenc.o pnm.o
-OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.o
-OBJS-$(CONFIG_PNG_DECODER)             += png.o pngdec.o
-OBJS-$(CONFIG_PNG_ENCODER)             += png.o pngenc.o
-OBJS-$(CONFIG_PPM_DECODER)             += pnmenc.o pnm.o
-OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o
-OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
-OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o qcelp_lsp.o celp_math.o celp_filters.o acelp_vectors.o
-OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.o
-OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.o
-OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
-OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.o
-OBJS-$(CONFIG_RA_144_DECODER)          += ra144.o celp_filters.o
-OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o celp_math.o celp_filters.o
-OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
-OBJS-$(CONFIG_RAWVIDEO_ENCODER)        += rawenc.o
-OBJS-$(CONFIG_RL2_DECODER)             += rl2.o
-OBJS-$(CONFIG_ROQ_DECODER)             += roqvideodec.o roqvideo.o
-OBJS-$(CONFIG_ROQ_ENCODER)             += roqvideoenc.o roqvideo.o elbg.o
-OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.o
-OBJS-$(CONFIG_ROQ_DPCM_ENCODER)        += roqaudioenc.o
-OBJS-$(CONFIG_RPZA_DECODER)            += rpza.o
-OBJS-$(CONFIG_RV10_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_RV20_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_RV30_DECODER)            += rv30.o rv34.o h264pred.o rv30dsp.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o h264pred.o rv40dsp.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
-OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.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 rangecoder.o
-OBJS-$(CONFIG_SNOW_ENCODER)            += snow.o rangecoder.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.o
-OBJS-$(CONFIG_SONIC_DECODER)           += sonic.o
-OBJS-$(CONFIG_SONIC_ENCODER)           += sonic.o
-OBJS-$(CONFIG_SONIC_LS_ENCODER)        += sonic.o
-OBJS-$(CONFIG_SP5X_DECODER)            += sp5xdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_SUNRAST_DECODER)         += sunrast.o
-OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o motion_est.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o svq1dec.o svq1.o h263.o
-OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
-OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
-OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o xiph.o vp3dsp.o
-OBJS-$(CONFIG_THP_DECODER)             += mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
-OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
-OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o
-OBJS-$(CONFIG_TMV_DECODER)             += tmv.o cga_data.o
-OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.o mlp_parser.o mlp.o mlpdsp.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 msrledec.o
-OBJS-$(CONFIG_TTA_DECODER)             += tta.o
-OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o
-OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
-OBJS-$(CONFIG_V210_DECODER)            += v210dec.o
-OBJS-$(CONFIG_V210_ENCODER)            += v210enc.o
-OBJS-$(CONFIG_V210X_DECODER)           += v210x.o
-OBJS-$(CONFIG_VB_DECODER)              += vb.o
-OBJS-$(CONFIG_VC1_DECODER)             += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
-OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o
-OBJS-$(CONFIG_VC1_VDPAU_DECODER)       += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.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_dec.o vorbis.o vorbis_data.o xiph.o
-OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.o vorbis.o vorbis_data.o
-OBJS-$(CONFIG_VP3_DECODER)             += vp3.o vp3dsp.o
-OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp3dsp.o
-OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o
-OBJS-$(CONFIG_VP6A_DECODER)            += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o
-OBJS-$(CONFIG_VP6F_DECODER)            += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o
-OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
-OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
-OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o
-OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o
-OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o
-OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o
-OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_WMV1_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_WMV3_DECODER)            += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
-OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL)      += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o
-OBJS-$(CONFIG_WMV3_VDPAU_DECODER)      += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.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_XSUB_DECODER)            += xsubdec.o
-OBJS-$(CONFIG_ZLIB_DECODER)            += lcldec.o
-OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.o
-OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.o
-OBJS-$(CONFIG_ZMBV_ENCODER)            += zmbvenc.o
+OBJS-$(CONFIG_AAC_DECODER)             += aac.c aactab.c mpeg4audio.c aac_parser.c aac_ac3_parser.c
+OBJS-$(CONFIG_AASC_DECODER)            += aasc.c msrledec.c
+OBJS-$(CONFIG_AC3_DECODER)             += eac3dec.c ac3dec.c ac3tab.c ac3dec_data.c ac3.c
+OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.c ac3tab.c ac3.c
+OBJS-$(CONFIG_ALAC_DECODER)            += alac.c
+OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.c lpc.c
+OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.c mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_APE_DECODER)             += apedec.c
+OBJS-$(CONFIG_ASV1_DECODER)            += asv1.c mpeg12data.c
+OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.c mpeg12data.c
+OBJS-$(CONFIG_ASV2_DECODER)            += asv1.c mpeg12data.c
+OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.c mpeg12data.c
+OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.c
+OBJS-$(CONFIG_AVS_DECODER)             += avs.c
+OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.c
+OBJS-$(CONFIG_BFI_DECODER)             += bfi.c
+OBJS-$(CONFIG_BMP_DECODER)             += bmp.c msrledec.c
+OBJS-$(CONFIG_BMP_ENCODER)             += bmpenc.c
+OBJS-$(CONFIG_C93_DECODER)             += c93.c
+OBJS-$(CONFIG_CAVS_DECODER)            += cavs.c cavsdec.c cavsdsp.c mpeg12data.c mpegvideo.c
+OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.c
+OBJS-$(CONFIG_CLJR_DECODER)            += cljr.c
+OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.c
+OBJS-$(CONFIG_COOK_DECODER)            += cook.c
+OBJS-$(CONFIG_CSCD_DECODER)            += cscd.c
+OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.c
+OBJS-$(CONFIG_DCA_DECODER)             += dca.c
+OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.c dnxhddata.c
+OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.c dnxhddata.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12data.c mpegvideo.c
+OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.c
+OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.c
+OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.c
+OBJS-$(CONFIG_DVBSUB_ENCODER)          += dvbsub.c
+OBJS-$(CONFIG_DVDSUB_DECODER)          += dvdsubdec.c
+OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.c
+OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.c
+OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.c
+OBJS-$(CONFIG_DXA_DECODER)             += dxa.c
+OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.c ac3dec.c ac3tab.c ac3dec_data.c ac3.c
+OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.c
+OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.c eaidct.c
+OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.c
+OBJS-$(CONFIG_EATQI_DECODER)           += eatqi.c eaidct.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.c
+OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER)    += 8svx.c
+OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER)    += 8svx.c
+OBJS-$(CONFIG_ESCAPE124_DECODER)       += escape124.c
+OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.c rangecoder.c
+OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.c rangecoder.c
+OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.c
+OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.c
+OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.c flacdata.c flac.c lpc.c
+OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.c
+OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.c
+OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.c
+OBJS-$(CONFIG_FLV_DECODER)             += h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_FLV_ENCODER)             += mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.c
+OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.c huffman.c
+OBJS-$(CONFIG_GIF_DECODER)             += gifdec.c lzw.c
+OBJS-$(CONFIG_GIF_ENCODER)             += gif.c
+OBJS-$(CONFIG_H261_DECODER)            += h261dec.c h261.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H261_ENCODER)            += h261enc.c h261.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12data.c mpegvideo.c
+OBJS-$(CONFIG_H263_DECODER)            += h263dec.c h263.c h263_parser.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += h263dec.c h263.c h263_parser.c mpeg12data.c mpegvideo.c error_resilience.c vaapi.c vaapi_mpeg4.c
+OBJS-$(CONFIG_H263I_DECODER)           += h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H264_DECODER)            += h264.c h264idct.c h264pred.c h264_parser.c cabac.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_H264_ENCODER)            += h264enc.c h264dspenc.c
+OBJS-$(CONFIG_H264_VDPAU_DECODER)      += vdpau.c h264.c h264idct.c h264pred.c h264_parser.c cabac.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.c
+OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.c
+OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.c
+OBJS-$(CONFIG_IMC_DECODER)             += imc.c
+OBJS-$(CONFIG_INDEO2_DECODER)          += indeo2.c
+OBJS-$(CONFIG_INDEO3_DECODER)          += indeo3.c
+OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.c
+OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.c
+OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.c jpegls.c mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_JPEGLS_ENCODER)          += jpeglsenc.c jpegls.c
+OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.c
+OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.c mjpegenc.c mjpeg.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12data.c mpegvideo.c
+OBJS-$(CONFIG_LOCO_DECODER)            += loco.c
+OBJS-$(CONFIG_MACE3_DECODER)           += mace.c
+OBJS-$(CONFIG_MACE6_DECODER)           += mace.c
+OBJS-$(CONFIG_MDEC_DECODER)            += mdec.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.c
+OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.c mjpeg.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12data.c mpegvideo.c
+OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.c mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.c mlp_parser.c mlp.c mlpdsp.c
+OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.c
+OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.c
+OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MP3ADU_DECODER)          += mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MP3ON4_DECODER)          += mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c mpeg4audio.c
+OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.c mpc.c mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.c mpc.c mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_MPEG_VDPAU_DECODER)      += vdpau.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG1_VDPAU_DECODER)     += vdpau.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.c mpeg12data.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c vaapi.c vaapi_mpeg2.c
+OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.c mpeg12data.c mpegvideo_enc.c motion_est.c ratecontrol.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.c h263.c mpeg4video_parser.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG4_ENCODER)           += mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += h263dec.c h263.c mpeg4video_parser.c mpeg12data.c mpegvideo.c error_resilience.c vaapi.c vaapi_mpeg4.c
+OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.c msmpeg4data.c h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.c msmpeg4data.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.c msmpeg4data.c h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.c msmpeg4data.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.c msmpeg4data.c h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.c msmpeg4data.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.c msrledec.c
+OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.c
+OBJS-$(CONFIG_MSZH_DECODER)            += lcldec.c
+OBJS-$(CONFIG_NELLYMOSER_DECODER)      += nellymoserdec.c nellymoser.c
+OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.c nellymoser.c
+OBJS-$(CONFIG_NUV_DECODER)             += nuv.c rtjpeg.c
+OBJS-$(CONFIG_PAM_DECODER)             += pnmenc.c pnm.c
+OBJS-$(CONFIG_PAM_ENCODER)             += pnmenc.c
+OBJS-$(CONFIG_PBM_DECODER)             += pnmenc.c pnm.c
+OBJS-$(CONFIG_PBM_ENCODER)             += pnmenc.c
+OBJS-$(CONFIG_PCX_DECODER)             += pcx.c
+OBJS-$(CONFIG_PCX_ENCODER)             += pcxenc.c
+OBJS-$(CONFIG_PGM_DECODER)             += pnmenc.c pnm.c
+OBJS-$(CONFIG_PGM_ENCODER)             += pnmenc.c
+OBJS-$(CONFIG_PGMYUV_DECODER)          += pnmenc.c pnm.c
+OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.c
+OBJS-$(CONFIG_PNG_DECODER)             += png.c pngdec.c
+OBJS-$(CONFIG_PNG_ENCODER)             += png.c pngenc.c
+OBJS-$(CONFIG_PPM_DECODER)             += pnmenc.c pnm.c
+OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.c
+OBJS-$(CONFIG_PTX_DECODER)             += ptx.c
+OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.c qcelp_lsp.c celp_math.c celp_filters.c acelp_vectors.c
+OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.c mpegaudiodec.c mpegaudiodecheader.c mpegaudio.c mpegaudiodata.c
+OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.c
+OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.c
+OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.c
+OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.c
+OBJS-$(CONFIG_RA_144_DECODER)          += ra144.c celp_filters.c
+OBJS-$(CONFIG_RA_288_DECODER)          += ra288.c celp_math.c celp_filters.c
+OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.c
+OBJS-$(CONFIG_RAWVIDEO_ENCODER)        += rawenc.c
+OBJS-$(CONFIG_RL2_DECODER)             += rl2.c
+OBJS-$(CONFIG_ROQ_DECODER)             += roqvideodec.c roqvideo.c
+OBJS-$(CONFIG_ROQ_ENCODER)             += roqvideoenc.c roqvideo.c elbg.c
+OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.c
+OBJS-$(CONFIG_ROQ_DPCM_ENCODER)        += roqaudioenc.c
+OBJS-$(CONFIG_RPZA_DECODER)            += rpza.c
+OBJS-$(CONFIG_RV10_DECODER)            += rv10.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_RV10_ENCODER)            += rv10.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_RV20_DECODER)            += rv10.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_RV20_ENCODER)            += rv10.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_RV30_DECODER)            += rv30.c rv34.c h264pred.c rv30dsp.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_RV40_DECODER)            += rv40.c rv34.c h264pred.c rv40dsp.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_SGI_DECODER)             += sgidec.c
+OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.c rle.c
+OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.c
+OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.c
+OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.c
+OBJS-$(CONFIG_SMC_DECODER)             += smc.c
+OBJS-$(CONFIG_SNOW_DECODER)            += snow.c rangecoder.c
+OBJS-$(CONFIG_SNOW_ENCODER)            += snow.c rangecoder.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.c
+OBJS-$(CONFIG_SONIC_DECODER)           += sonic.c
+OBJS-$(CONFIG_SONIC_ENCODER)           += sonic.c
+OBJS-$(CONFIG_SONIC_LS_ENCODER)        += sonic.c
+OBJS-$(CONFIG_SP5X_DECODER)            += sp5xdec.c mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_SUNRAST_DECODER)         += sunrast.c
+OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.c svq1.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.c svq1.c motion_est.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_SVQ3_DECODER)            += h264.c h264idct.c h264pred.c h264_parser.c cabac.c mpegvideo.c error_resilience.c svq1dec.c svq1.c h263.c
+OBJS-$(CONFIG_TARGA_DECODER)           += targa.c
+OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.c rle.c
+OBJS-$(CONFIG_THEORA_DECODER)          += vp3.c xiph.c vp3dsp.c
+OBJS-$(CONFIG_THP_DECODER)             += mjpegdec.c mjpeg.c
+OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.c
+OBJS-$(CONFIG_TIFF_DECODER)            += tiff.c lzw.c faxcompr.c
+OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.c rle.c lzwenc.c
+OBJS-$(CONFIG_TMV_DECODER)             += tmv.c cga_data.c
+OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.c mlp_parser.c mlp.c mlpdsp.c
+OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.c
+OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.c
+OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.c
+OBJS-$(CONFIG_TSCC_DECODER)            += tscc.c msrledec.c
+OBJS-$(CONFIG_TTA_DECODER)             += tta.c
+OBJS-$(CONFIG_TXD_DECODER)             += txd.c s3tc.c
+OBJS-$(CONFIG_ULTI_DECODER)            += ulti.c
+OBJS-$(CONFIG_V210_DECODER)            += v210dec.c
+OBJS-$(CONFIG_V210_ENCODER)            += v210enc.c
+OBJS-$(CONFIG_V210X_DECODER)           += v210x.c
+OBJS-$(CONFIG_VB_DECODER)              += vb.c
+OBJS-$(CONFIG_VC1_DECODER)             += vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c
+OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c vaapi.c vaapi_vc1.c
+OBJS-$(CONFIG_VC1_VDPAU_DECODER)       += vdpau.c vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c
+OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.c
+OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.c
+OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.c
+OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.c
+OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.c
+OBJS-$(CONFIG_VORBIS_DECODER)          += vorbis_dec.c vorbis.c vorbis_data.c xiph.c
+OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.c vorbis.c vorbis_data.c
+OBJS-$(CONFIG_VP3_DECODER)             += vp3.c vp3dsp.c
+OBJS-$(CONFIG_VP5_DECODER)             += vp5.c vp56.c vp56data.c vp3dsp.c
+OBJS-$(CONFIG_VP6_DECODER)             += vp6.c vp56.c vp56data.c vp3dsp.c vp6dsp.c huffman.c
+OBJS-$(CONFIG_VP6A_DECODER)            += vp6.c vp56.c vp56data.c vp3dsp.c vp6dsp.c huffman.c
+OBJS-$(CONFIG_VP6F_DECODER)            += vp6.c vp56.c vp56data.c vp3dsp.c vp6dsp.c huffman.c
+OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.c
+OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.c
+OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.c wma.c
+OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.c wma.c
+OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.c wma.c
+OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.c wma.c
+OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_WMV1_ENCODER)            += mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.c wmv2.c msmpeg4.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.c wmv2.c msmpeg4.c msmpeg4data.c mpegvideo_enc.c motion_est.c ratecontrol.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_WMV3_DECODER)            += vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c
+OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL)      += vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c vaapi.c vaapi_vc1.c
+OBJS-$(CONFIG_WMV3_VDPAU_DECODER)      += vdpau.c vc1.c vc1data.c vc1dsp.c msmpeg4data.c h263dec.c h263.c intrax8.c intrax8dsp.c error_resilience.c mpegvideo.c msmpeg4.c
+OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.c
+OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.c
+OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.c
+OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.c
+OBJS-$(CONFIG_XAN_WC4_DECODER)         += xan.c
+OBJS-$(CONFIG_XL_DECODER)              += xl.c
+OBJS-$(CONFIG_XSUB_DECODER)            += xsubdec.c
+OBJS-$(CONFIG_ZLIB_DECODER)            += lcldec.c
+OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.c
+OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.c
+OBJS-$(CONFIG_ZMBV_ENCODER)            += zmbvenc.c
 
 # (AD)PCM decoders/encoders
-OBJS-$(CONFIG_PCM_ALAW_DECODER)           += pcm.o
-OBJS-$(CONFIG_PCM_ALAW_ENCODER)           += pcm.o
-OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm.o
-OBJS-$(CONFIG_PCM_DVD_ENCODER)            += pcm.o
-OBJS-$(CONFIG_PCM_F32BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F32BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F32LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F32LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F64BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F64BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F64LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_F64LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_MULAW_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_MULAW_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S8_DECODER)             += pcm.o
-OBJS-$(CONFIG_PCM_S8_ENCODER)             += pcm.o
-OBJS-$(CONFIG_PCM_S16BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S16BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S16LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S16LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)   += pcm.o
-OBJS-$(CONFIG_PCM_S24BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S24BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S24DAUD_DECODER)        += pcm.o
-OBJS-$(CONFIG_PCM_S24DAUD_ENCODER)        += pcm.o
-OBJS-$(CONFIG_PCM_S24LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S24LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S32BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S32BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S32LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_S32LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U8_DECODER)             += pcm.o
-OBJS-$(CONFIG_PCM_U8_ENCODER)             += pcm.o
-OBJS-$(CONFIG_PCM_U16BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U16BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U16LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U16LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U24BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U24BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U24LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U24LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U32BE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U32BE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U32LE_DECODER)          += pcm.o
-OBJS-$(CONFIG_PCM_U32LE_ENCODER)          += pcm.o
-OBJS-$(CONFIG_PCM_ZORK_DECODER)           += pcm.o
-OBJS-$(CONFIG_PCM_ZORK_ENCODER)           += pcm.o
-
-OBJS-$(CONFIG_ADPCM_4XM_DECODER)          += adpcm.o
-OBJS-$(CONFIG_ADPCM_ADX_DECODER)          += adxdec.o
-OBJS-$(CONFIG_ADPCM_ADX_ENCODER)          += adxenc.o
-OBJS-$(CONFIG_ADPCM_CT_DECODER)           += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_DECODER)           += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER)  += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_R2_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_R3_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_XAS_DECODER)       += adpcm.o
-OBJS-$(CONFIG_ADPCM_G726_DECODER)         += g726.o
-OBJS-$(CONFIG_ADPCM_G726_ENCODER)         += g726.o
-OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER)  += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER)  += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER)      += 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_WAV_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)       += 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_3_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)      += adpcm.o
-OBJS-$(CONFIG_ADPCM_SWF_DECODER)          += adpcm.o
-OBJS-$(CONFIG_ADPCM_SWF_ENCODER)          += adpcm.o
-OBJS-$(CONFIG_ADPCM_THP_DECODER)          += adpcm.o
-OBJS-$(CONFIG_ADPCM_XA_DECODER)           += adpcm.o
-OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)       += adpcm.o
-OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcm.o
+OBJS-$(CONFIG_PCM_ALAW_DECODER)           += pcm.c
+OBJS-$(CONFIG_PCM_ALAW_ENCODER)           += pcm.c
+OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm.c
+OBJS-$(CONFIG_PCM_DVD_ENCODER)            += pcm.c
+OBJS-$(CONFIG_PCM_F32BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F32BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F32LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F32LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F64BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F64BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F64LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_F64LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_MULAW_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_MULAW_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S8_DECODER)             += pcm.c
+OBJS-$(CONFIG_PCM_S8_ENCODER)             += pcm.c
+OBJS-$(CONFIG_PCM_S16BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S16BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S16LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S16LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)   += pcm.c
+OBJS-$(CONFIG_PCM_S24BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S24BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S24DAUD_DECODER)        += pcm.c
+OBJS-$(CONFIG_PCM_S24DAUD_ENCODER)        += pcm.c
+OBJS-$(CONFIG_PCM_S24LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S24LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S32BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S32BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S32LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_S32LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U8_DECODER)             += pcm.c
+OBJS-$(CONFIG_PCM_U8_ENCODER)             += pcm.c
+OBJS-$(CONFIG_PCM_U16BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U16BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U16LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U16LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U24BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U24BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U24LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U24LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U32BE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U32BE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U32LE_DECODER)          += pcm.c
+OBJS-$(CONFIG_PCM_U32LE_ENCODER)          += pcm.c
+OBJS-$(CONFIG_PCM_ZORK_DECODER)           += pcm.c
+OBJS-$(CONFIG_PCM_ZORK_ENCODER)           += pcm.c
+
+OBJS-$(CONFIG_ADPCM_4XM_DECODER)          += adpcm.c
+OBJS-$(CONFIG_ADPCM_ADX_DECODER)          += adxdec.c
+OBJS-$(CONFIG_ADPCM_ADX_ENCODER)          += adxenc.c
+OBJS-$(CONFIG_ADPCM_CT_DECODER)           += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_DECODER)           += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER)  += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)        += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_R2_DECODER)        += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_R3_DECODER)        += adpcm.c
+OBJS-$(CONFIG_ADPCM_EA_XAS_DECODER)       += adpcm.c
+OBJS-$(CONFIG_ADPCM_G726_DECODER)         += g726.c
+OBJS-$(CONFIG_ADPCM_G726_ENCODER)         += g726.c
+OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER)  += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER)  += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)       += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)       += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)   += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)       += adpcm.c
+OBJS-$(CONFIG_ADPCM_MS_DECODER)           += adpcm.c
+OBJS-$(CONFIG_ADPCM_MS_ENCODER)           += adpcm.c
+OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)      += adpcm.c
+OBJS-$(CONFIG_ADPCM_SWF_DECODER)          += adpcm.c
+OBJS-$(CONFIG_ADPCM_SWF_ENCODER)          += adpcm.c
+OBJS-$(CONFIG_ADPCM_THP_DECODER)          += adpcm.c
+OBJS-$(CONFIG_ADPCM_XA_DECODER)           += adpcm.c
+OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)       += adpcm.c
+OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcm.c
 
 # libavformat dependencies
-OBJS-$(CONFIG_EAC3_DEMUXER)            += ac3_parser.o ac3tab.o aac_ac3_parser.o
-OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
-OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o
-OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o
-OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
-OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
-OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.o
+OBJS-$(CONFIG_EAC3_DEMUXER)            += ac3_parser.c ac3tab.c aac_ac3_parser.c
+OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.c
+OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.c mpeg4audio.c flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.c
+OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.c mpeg4audio.c flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.c mpegaudiodata.c
+OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.c
+OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.c
+OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_OGG_MUXER)               += xiph.c flacdec.c flacdata.c flac.c
+OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.c
 
 # external codec libraries
-OBJS-$(CONFIG_LIBAMR_NB)               += libamr.o
-OBJS-$(CONFIG_LIBAMR_WB)               += libamr.o
-OBJS-$(CONFIG_LIBDIRAC_DECODER)        += libdiracdec.o
-OBJS-$(CONFIG_LIBDIRAC_ENCODER)        += libdiracenc.o libdirac_libschro.o
-OBJS-$(CONFIG_LIBFAAC)                 += libfaac.o
-OBJS-$(CONFIG_LIBFAAD)                 += libfaad.o
-OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
-OBJS-$(CONFIG_LIBMP3LAME)              += libmp3lame.o
-OBJS-$(CONFIG_LIBOPENJPEG)             += libopenjpeg.o
-OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o
-OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o libschroedinger.o libdirac_libschro.o
-OBJS-$(CONFIG_LIBSPEEX)                += libspeexdec.o
-OBJS-$(CONFIG_LIBTHEORA)               += libtheoraenc.o
-OBJS-$(CONFIG_LIBVORBIS)               += libvorbis.o
-OBJS-$(CONFIG_LIBX264)                 += libx264.o
-OBJS-$(CONFIG_LIBXVID)                 += libxvidff.o libxvid_rc.o
+OBJS-$(CONFIG_LIBAMR_NB)               += libamr.c
+OBJS-$(CONFIG_LIBAMR_WB)               += libamr.c
+OBJS-$(CONFIG_LIBDIRAC_DECODER)        += libdiracdec.c
+OBJS-$(CONFIG_LIBDIRAC_ENCODER)        += libdiracenc.c libdirac_libschro.c
+OBJS-$(CONFIG_LIBFAAC)                 += libfaac.c
+OBJS-$(CONFIG_LIBFAAD)                 += libfaad.c
+OBJS-$(CONFIG_LIBGSM)                  += libgsm.c
+OBJS-$(CONFIG_LIBMP3LAME)              += libmp3lame.c
+OBJS-$(CONFIG_LIBOPENJPEG)             += libopenjpeg.c
+OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.c libschroedinger.c libdirac_libschro.c
+OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.c libschroedinger.c libdirac_libschro.c
+OBJS-$(CONFIG_LIBSPEEX)                += libspeexdec.c
+OBJS-$(CONFIG_LIBTHEORA)               += libtheoraenc.c
+OBJS-$(CONFIG_LIBVORBIS)               += libvorbis.c
+OBJS-$(CONFIG_LIBX264)                 += libx264.c
+OBJS-$(CONFIG_LIBXVID)                 += libxvidff.c libxvid_rc.c
 
 # parsers
-OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o mpeg4audio.o
-OBJS-$(CONFIG_AC3_PARSER)              += ac3_parser.o ac3tab.o aac_ac3_parser.o
-OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs_parser.o
-OBJS-$(CONFIG_DCA_PARSER)              += dca_parser.o
-OBJS-$(CONFIG_DIRAC_PARSER)            += dirac_parser.o
-OBJS-$(CONFIG_DNXHD_PARSER)            += dnxhd_parser.o
-OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsub_parser.o
-OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_parser.o
-OBJS-$(CONFIG_H261_PARSER)             += h261_parser.o
-OBJS-$(CONFIG_H263_PARSER)             += h263_parser.o
-OBJS-$(CONFIG_H264_PARSER)             += h264_parser.o
-OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.o
-OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.o mlp.o
-OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o mpegaudiodecheader.o mpegaudiodata.o
-OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
-OBJS-$(CONFIG_VC1_PARSER)              += vc1_parser.o
-OBJS-$(CONFIG_VP3_PARSER)              += vp3_parser.o
+OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.c aac_ac3_parser.c mpeg4audio.c
+OBJS-$(CONFIG_AC3_PARSER)              += ac3_parser.c ac3tab.c aac_ac3_parser.c
+OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs_parser.c
+OBJS-$(CONFIG_DCA_PARSER)              += dca_parser.c
+OBJS-$(CONFIG_DIRAC_PARSER)            += dirac_parser.c
+OBJS-$(CONFIG_DNXHD_PARSER)            += dnxhd_parser.c
+OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsub_parser.c
+OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_parser.c
+OBJS-$(CONFIG_H261_PARSER)             += h261_parser.c
+OBJS-$(CONFIG_H263_PARSER)             += h263_parser.c
+OBJS-$(CONFIG_H264_PARSER)             += h264_parser.c
+OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.c
+OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.c mlp.c
+OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.c h263.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.c mpegaudiodecheader.c mpegaudiodata.c
+OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.c mpeg12.c mpeg12data.c mpegvideo.c error_resilience.c
+OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.c pnm.c
+OBJS-$(CONFIG_VC1_PARSER)              += vc1_parser.c
+OBJS-$(CONFIG_VP3_PARSER)              += vp3_parser.c
 
 # bitstream filters
-OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.o
-OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.o
-OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.o
-OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.o
-OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.o
-OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF)    += mp3_header_compress_bsf.o
-OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.o mpegaudiodata.o
-OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
-OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o
-OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
+OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.c
+OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.c
+OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.c
+OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.c
+OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.c
+OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF)    += mp3_header_compress_bsf.c
+OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.c mpegaudiodata.c
+OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.c
+OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.c
+OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.c
 
 # thread libraries
-OBJS-$(HAVE_BEOSTHREADS)               += beosthread.o
-OBJS-$(HAVE_OS2THREADS)                += os2thread.o
-OBJS-$(HAVE_PTHREADS)                  += pthread.o
-OBJS-$(HAVE_W32THREADS)                += w32thread.o
+OBJS-$(HAVE_BEOSTHREADS)               += beosthread.c
+OBJS-$(HAVE_OS2THREADS)                += os2thread.c
+OBJS-$(HAVE_PTHREADS)                  += pthread.c
+OBJS-$(HAVE_W32THREADS)                += w32thread.c
 
 # processor-specific code
-YASM-OBJS-FFT-$(HAVE_AMD3DNOW)         += x86/fft_3dn.o
-YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT)      += x86/fft_3dn2.o
-YASM-OBJS-FFT-$(HAVE_SSE)              += x86/fft_sse.o
-YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o $(YASM-OBJS-FFT-yes)
-YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
-                                          x86/h264_idct_sse2.o          \
-
-MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
-MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
-MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += x86/flacdsp_mmx.o
-MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
-MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp_mmx.o
-MMX-OBJS-$(CONFIG_THEORA_DECODER)      += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
-MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \
-                                          x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6A_DECODER)        += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \
-                                          x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6F_DECODER)        += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \
-                                          x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o
-MMX-OBJS-$(CONFIG_WMV3_DECODER)        += x86/vc1dsp_mmx.o
-MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
+YASM-OBJS-FFT-$(HAVE_AMD3DNOW)         += x86/fft_3dn.asm
+YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT)      += x86/fft_3dn2.asm
+YASM-OBJS-FFT-$(HAVE_SSE)              += x86/fft_sse.asm
+YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.asm $(YASM-OBJS-FFT-yes)
+YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.asm       \
+                                          x86/h264_idct_sse2.asm          \
+
+MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.c
+MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.c
+MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += x86/flacdsp_mmx.c
+MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.c
+MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp_mmx.c
+MMX-OBJS-$(CONFIG_THEORA_DECODER)      += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c
+MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.c
+MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c
+MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c
+MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c \
+                                          x86/vp6dsp_mmx.c x86/vp6dsp_sse2.c
+MMX-OBJS-$(CONFIG_VP6A_DECODER)        += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c \
+                                          x86/vp6dsp_mmx.c x86/vp6dsp_sse2.c
+MMX-OBJS-$(CONFIG_VP6F_DECODER)        += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c \
+                                          x86/vp6dsp_mmx.c x86/vp6dsp_sse2.c
+MMX-OBJS-$(CONFIG_WMV3_DECODER)        += x86/vc1dsp_mmx.c
+MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.c            \
                                           $(YASM-OBJS-yes)
 
-OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
-                                          x86/dnxhd_mmx.o               \
-                                          x86/dsputil_mmx.o             \
-                                          x86/fdct_mmx.o                \
-                                          x86/idct_mmx_xvid.o           \
-                                          x86/idct_sse2_xvid.o          \
-                                          x86/motion_est_mmx.o          \
-                                          x86/mpegvideo_mmx.o           \
-                                          x86/simple_idct_mmx.o         \
-
-OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o         \
-                                          alpha/dsputil_alpha_asm.o     \
-                                          alpha/motion_est_alpha.o      \
-                                          alpha/motion_est_mvi_asm.o    \
-                                          alpha/mpegvideo_alpha.o       \
-                                          alpha/simple_idct_alpha.o     \
-
-OBJS-$(ARCH_ARM)                       += arm/dsputil_arm.o             \
-                                          arm/dsputil_arm_s.o           \
-                                          arm/jrevdct_arm.o             \
-                                          arm/mpegvideo_arm.o           \
-                                          arm/simple_idct_arm.o         \
-
-OBJS-$(HAVE_ARMV5TE)                   += arm/mpegvideo_armv5te.o       \
-                                          arm/mpegvideo_armv5te_s.o     \
-                                          arm/simple_idct_armv5te.o     \
-
-OBJS-$(HAVE_ARMV6)                     += arm/simple_idct_armv6.o       \
-
-OBJS-$(HAVE_ARMVFP)                    += arm/dsputil_vfp.o             \
-                                          arm/float_arm_vfp.o           \
-
-OBJS-$(HAVE_IWMMXT)                    += arm/dsputil_iwmmxt.o          \
-                                          arm/mpegvideo_iwmmxt.o        \
-
-OBJS-$(HAVE_NEON)                      += arm/dsputil_neon.o            \
-                                          arm/dsputil_neon_s.o          \
-                                          arm/h264dsp_neon.o            \
-                                          arm/h264idct_neon.o           \
-                                          arm/simple_idct_neon.o        \
-
-OBJS-$(ARCH_BFIN)                      += bfin/dsputil_bfin.o           \
-                                          bfin/fdct_bfin.o              \
-                                          bfin/idct_bfin.o              \
-                                          bfin/mpegvideo_bfin.o         \
-                                          bfin/pixels_bfin.o            \
-                                          bfin/vp3_bfin.o               \
-                                          bfin/vp3_idct_bfin.o          \
-
-OBJS-$(ARCH_PPC)                       += ppc/dsputil_ppc.o             \
-
-ALTIVEC-OBJS-$(CONFIG_H264_DECODER)    += ppc/h264_altivec.o
-ALTIVEC-OBJS-$(CONFIG_VC1_DECODER)     += ppc/vc1dsp_altivec.o
-ALTIVEC-OBJS-$(CONFIG_WMV3_DECODER)    += ppc/vc1dsp_altivec.o
-
-OBJS-$(HAVE_ALTIVEC)                   += ppc/check_altivec.o           \
-                                          ppc/dsputil_altivec.o         \
-                                          ppc/fdct_altivec.o            \
-                                          ppc/fft_altivec.o             \
-                                          ppc/float_altivec.o           \
-                                          ppc/gmc_altivec.o             \
-                                          ppc/idct_altivec.o            \
-                                          ppc/int_altivec.o             \
-                                          ppc/mpegvideo_altivec.o       \
+OBJS-$(HAVE_MMX)                       += x86/cpuid.c                   \
+                                          x86/dnxhd_mmx.c               \
+                                          x86/dsputil_mmx.c             \
+                                          x86/fdct_mmx.c                \
+                                          x86/idct_mmx_xvid.c           \
+                                          x86/idct_sse2_xvid.c          \
+                                          x86/motion_est_mmx.c          \
+                                          x86/mpegvideo_mmx.c           \
+                                          x86/simple_idct_mmx.c         \
+
+OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes) $(MMX-OBJS-y)
+
+
+OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.c         \
+                                          alpha/dsputil_alpha_asm.c     \
+                                          alpha/motion_est_alpha.c      \
+                                          alpha/motion_est_mvi_asm.c    \
+                                          alpha/mpegvideo_alpha.c       \
+                                          alpha/simple_idct_alpha.c     \
+
+OBJS-$(ARCH_ARM)                       += arm/dsputil_arm.c             \
+                                          arm/dsputil_arm_s.c           \
+                                          arm/jrevdct_arm.c             \
+                                          arm/mpegvideo_arm.c           \
+                                          arm/simple_idct_arm.c         \
+
+OBJS-$(HAVE_ARMV5TE)                   += arm/mpegvideo_armv5te.c       \
+                                          arm/mpegvideo_armv5te_s.c     \
+                                          arm/simple_idct_armv5te.c     \
+
+OBJS-$(HAVE_ARMV6)                     += arm/simple_idct_armv6.c       \
+
+OBJS-$(HAVE_ARMVFP)                    += arm/dsputil_vfp.c             \
+                                          arm/float_arm_vfp.c           \
+
+OBJS-$(HAVE_IWMMXT)                    += arm/dsputil_iwmmxt.c          \
+                                          arm/mpegvideo_iwmmxt.c        \
+
+OBJS-$(HAVE_NEON)                      += arm/dsputil_neon.c            \
+                                          arm/dsputil_neon_s.c          \
+                                          arm/h264dsp_neon.c            \
+                                          arm/h264idct_neon.c           \
+                                          arm/simple_idct_neon.c        \
+
+OBJS-$(ARCH_BFIN)                      += bfin/dsputil_bfin.c           \
+                                          bfin/fdct_bfin.c              \
+                                          bfin/idct_bfin.c              \
+                                          bfin/mpegvideo_bfin.c         \
+                                          bfin/pixels_bfin.c            \
+                                          bfin/vp3_bfin.c               \
+                                          bfin/vp3_idct_bfin.c          \
+
+OBJS-$(ARCH_PPC)                       += ppc/dsputil_ppc.c             \
+
+ALTIVEC-OBJS-$(CONFIG_H264_DECODER)    += ppc/h264_altivec.c
+ALTIVEC-OBJS-$(CONFIG_VC1_DECODER)     += ppc/vc1dsp_altivec.c
+ALTIVEC-OBJS-$(CONFIG_WMV3_DECODER)    += ppc/vc1dsp_altivec.c
+
+OBJS-$(HAVE_ALTIVEC)                   += ppc/check_altivec.c           \
+                                          ppc/dsputil_altivec.c         \
+                                          ppc/fdct_altivec.c            \
+                                          ppc/fft_altivec.c             \
+                                          ppc/float_altivec.c           \
+                                          ppc/gmc_altivec.c             \
+                                          ppc/idct_altivec.c            \
+                                          ppc/int_altivec.c             \
+                                          ppc/mpegvideo_altivec.c       \
                                           $(ALTIVEC-OBJS-yes)
 
-OBJS-$(ARCH_SH4)                       += sh4/dsputil_align.o           \
-                                          sh4/dsputil_sh4.o             \
-                                          sh4/idct_sh4.o                \
+OBJS-$(ARCH_SH4)                       += sh4/dsputil_align.c           \
+                                          sh4/dsputil_sh4.c             \
+                                          sh4/idct_sh4.c                \
 
-OBJS-$(CONFIG_MLIB)                    += mlib/dsputil_mlib.o           \
+OBJS-$(CONFIG_MLIB)                    += mlib/dsputil_mlib.c           \
 
-OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.o             \
-                                          ps2/idct_mmi.o                \
-                                          ps2/mpegvideo_mmi.o           \
+OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.c             \
+                                          ps2/idct_mmi.c                \
+                                          ps2/mpegvideo_mmi.c           \
 
-OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
-                                          sparc/simple_idct_vis.o       \
+OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.c           \
+                                          sparc/simple_idct_vis.c       \
 
 
 EXAMPLES = api
@@ -544,8 +545,7 @@ TESTPROGS = cabac dct eval fft h264 rangecoder snow
 TESTPROGS-$(ARCH_X86) += x86/cpuid
 TESTPROGS-$(HAVE_MMX) += motion
 
-DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
-
-include $(SUBDIR)../subdir.mak
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
 
-$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
diff --git a/libavdevice/Makefile.omk b/libavdevice/Makefile.omk
index b769d16c7..4103266aa 100644
--- a/libavdevice/Makefile.omk
+++ b/libavdevice/Makefile.omk
@@ -1,29 +1,29 @@
-include $(SUBDIR)../config.mak
-
 NAME    = avdevice
 FFLIBS  = avformat avcodec avutil
 
 HEADERS = avdevice.h
 
-OBJS    = alldevices.o
+OBJS    = alldevices.c
 
 # input/output devices
-OBJS-$(CONFIG_ALSA_DEMUXER)              += alsa-audio-common.o alsa-audio-dec.o
-OBJS-$(CONFIG_ALSA_MUXER)                += alsa-audio-common.o alsa-audio-enc.o
-OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
-OBJS-$(CONFIG_JACK_DEMUXER)              += jack_audio.o
-OBJS-$(CONFIG_OSS_DEMUXER)               += oss_audio.o
-OBJS-$(CONFIG_OSS_MUXER)                 += oss_audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.o
-OBJS-$(CONFIG_VFWCAP_DEMUXER)            += vfwcap.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
+OBJS-$(CONFIG_ALSA_DEMUXER)              += alsa-audio-common.c alsa-audio-dec.c
+OBJS-$(CONFIG_ALSA_MUXER)                += alsa-audio-common.c alsa-audio-enc.c
+OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.c
+OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.c
+OBJS-$(CONFIG_JACK_DEMUXER)              += jack_audio.c
+OBJS-$(CONFIG_OSS_DEMUXER)               += oss_audio.c
+OBJS-$(CONFIG_OSS_MUXER)                 += oss_audio.c
+OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.c
+OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.c
+OBJS-$(CONFIG_VFWCAP_DEMUXER)            += vfwcap.c
+OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.c
 
 # external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
+OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.c
 
-OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)        += beosaudio.o
-OBJS-$(CONFIG_AUDIO_BEOS_MUXER)          += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)        += beosaudio.c
+OBJS-$(CONFIG_AUDIO_BEOS_MUXER)          += beosaudio.c
 
-include $(SUBDIR)../subdir.mak
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
diff --git a/libavfilter/Makefile.omk b/libavfilter/Makefile.omk
index ccf7909c0..6a810973f 100644
--- a/libavfilter/Makefile.omk
+++ b/libavfilter/Makefile.omk
@@ -1,16 +1,16 @@
-include $(SUBDIR)../config.mak
-
 NAME = avfilter
 FFLIBS = avcodec avutil swscale
 FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
 
 HEADERS = avfilter.h
 
-OBJS = allfilters.o                                                     \
-       avfilter.o                                                       \
-       defaults.o                                                       \
-       formats.o                                                        \
+OBJS = allfilters.c                                                     \
+       avfilter.c                                                       \
+       defaults.c                                                       \
+       formats.c                                                        \
 
-#OBJS-$(CONFIG_XXX_FILTER)    += vf_xxx.o
+#OBJS-$(CONFIG_XXX_FILTER)    += vf_xxx.c
 
-include $(SUBDIR)../subdir.mak
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
diff --git a/libavformat/Makefile.omk b/libavformat/Makefile.omk
index c0be725f8..80e30ad95 100644
--- a/libavformat/Makefile.omk
+++ b/libavformat/Makefile.omk
@@ -1,258 +1,256 @@
-include $(SUBDIR)../config.mak
-
 NAME = avformat
 FFLIBS = avcodec avutil
 
 HEADERS = avformat.h avio.h
 
-OBJS = allformats.o cutils.o metadata.o metadata_compat.o options.o os_support.o sdp.o utils.o
+OBJS = allformats.c cutils.c metadata.c metadata_compat.c options.c os_support.c sdp.c utils.c
 
 # muxers/demuxers
-OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o id3v2.o
-OBJS-$(CONFIG_AC3_DEMUXER)               += raw.o
-OBJS-$(CONFIG_AC3_MUXER)                 += raw.o
-OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
-OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.o riff.o raw.o
-OBJS-$(CONFIG_AIFF_MUXER)                += aiff.o riff.o
-OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o
-OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
-OBJS-$(CONFIG_APC_DEMUXER)               += apc.o
-OBJS-$(CONFIG_APE_DEMUXER)               += ape.o
-OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec.o asf.o asfcrypt.o riff.o avlanguage.o
-OBJS-$(CONFIG_ASF_MUXER)                 += asfenc.o asf.o riff.o
-OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asfenc.o asf.o riff.o
-OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.o
-OBJS-$(CONFIG_ASS_MUXER)                 += assenc.o
-OBJS-$(CONFIG_AU_DEMUXER)                += au.o raw.o
-OBJS-$(CONFIG_AU_MUXER)                  += au.o
-OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o riff.o
-OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o riff.o
-OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
-OBJS-$(CONFIG_AVM2_MUXER)                += swfenc.o
-OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
-OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
-OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
-OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
-OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o
-OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
-OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
-OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
-OBJS-$(CONFIG_DIRAC_DEMUXER)             += raw.o
-OBJS-$(CONFIG_DIRAC_MUXER)               += raw.o
-OBJS-$(CONFIG_DNXHD_DEMUXER)             += raw.o
-OBJS-$(CONFIG_DNXHD_MUXER)               += raw.o
-OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
-OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o id3v2.o
-OBJS-$(CONFIG_DTS_MUXER)                 += raw.o
-OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
-OBJS-$(CONFIG_DV_MUXER)                  += dvenc.o
-OBJS-$(CONFIG_DXA_DEMUXER)               += dxa.o riff.o
-OBJS-$(CONFIG_EA_CDATA_DEMUXER)          += eacdata.o
-OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.o
-OBJS-$(CONFIG_EAC3_DEMUXER)              += raw.o id3v2.o
-OBJS-$(CONFIG_EAC3_MUXER)                += raw.o
-OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.o
-OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.o
-OBJS-$(CONFIG_FLAC_DEMUXER)              += flacdec.o raw.o id3v2.o oggparsevorbis.o
-OBJS-$(CONFIG_FLAC_MUXER)                += flacenc.o
-OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.o
-OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.o
-OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.o avc.o
-OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o
-OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.o
-OBJS-$(CONFIG_GIF_MUXER)                 += gif.o
-OBJS-$(CONFIG_GSM_DEMUXER)               += raw.o id3v2.o
-OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.o
-OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o audiointerleave.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_H264_DEMUXER)              += raw.o
-OBJS-$(CONFIG_H264_MUXER)                += raw.o
-OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
-OBJS-$(CONFIG_IFF_DEMUXER)               += iff.o
-OBJS-$(CONFIG_IMAGE2_DEMUXER)            += img2.o
-OBJS-$(CONFIG_IMAGE2_MUXER)              += img2.o
-OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER)        += img2.o
-OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.o
-OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
-OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
-OBJS-$(CONFIG_IPOD_MUXER)                += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_ISS_DEMUXER)               += iss.o
-OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
-OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
-OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
-OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)      += matroskaenc.o matroska.o riff.o isom.o avc.o flacenc.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o riff.o isom.o
-OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o riff.o isom.o avc.o flacenc.o
-OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.o
-OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
-OBJS-$(CONFIG_MLP_DEMUXER)               += raw.o id3v2.o
-OBJS-$(CONFIG_MLP_MUXER)                 += raw.o
-OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
-OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o raw.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 avc.o
-OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o
-OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o id3v2.o
-OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o
-OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o id3v2.o
-OBJS-$(CONFIG_MPC8_DEMUXER)              += mpc8.o
-OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpegenc.o
-OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpegenc.o
-OBJS-$(CONFIG_MPEG2DVD_MUXER)            += mpegenc.o
-OBJS-$(CONFIG_MPEG2VOB_MUXER)            += mpegenc.o
-OBJS-$(CONFIG_MPEG2SVCD_MUXER)           += mpegenc.o
-OBJS-$(CONFIG_MPEG1VIDEO_MUXER)          += raw.o
-OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += raw.o
-OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.o
-OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.o
-OBJS-$(CONFIG_MPEGTSRAW_DEMUXER)         += mpegts.o
-OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
-OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += raw.o
-OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
-OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.o
-OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.o
-OBJS-$(CONFIG_MVI_DEMUXER)               += mvi.o
-OBJS-$(CONFIG_MXF_DEMUXER)               += mxfdec.o mxf.o
-OBJS-$(CONFIG_MXF_MUXER)                 += mxfenc.o mxf.o audiointerleave.o
-OBJS-$(CONFIG_MXF_D10_MUXER)             += mxfenc.o mxf.o audiointerleave.o
-OBJS-$(CONFIG_NC_DEMUXER)                += ncdec.o
-OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o
-OBJS-$(CONFIG_NULL_MUXER)                += raw.o
-OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o nut.o riff.o
-OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o nut.o riff.o
-OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
-OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
-                                            oggparseflac.o   \
-                                            oggparseogm.o    \
-                                            oggparsespeex.o  \
-                                            oggparsetheora.o \
-                                            oggparsevorbis.o \
-                                            riff.o
-OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o
-OBJS-$(CONFIG_OMA_DEMUXER)               += oma.o raw.o
-OBJS-$(CONFIG_PCM_ALAW_DEMUXER)          += raw.o
-OBJS-$(CONFIG_PCM_ALAW_MUXER)            += raw.o
-OBJS-$(CONFIG_PCM_F32BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_F32BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_F32LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_F32LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_F64BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_F64BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_F64LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_F64LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_MULAW_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_MULAW_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S16BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S16BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S16LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S16LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S24BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S24BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S24LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S24LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S32BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S32BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S32LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_S32LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_S8_DEMUXER)            += raw.o
-OBJS-$(CONFIG_PCM_S8_MUXER)              += raw.o
-OBJS-$(CONFIG_PCM_U16BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U16BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U16LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U16LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U24BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U24BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U24LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U24LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U32BE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U32BE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U32LE_DEMUXER)         += raw.o
-OBJS-$(CONFIG_PCM_U32LE_MUXER)           += raw.o
-OBJS-$(CONFIG_PCM_U8_DEMUXER)            += raw.o
-OBJS-$(CONFIG_PCM_U8_MUXER)              += raw.o
-OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
-OBJS-$(CONFIG_R3D_DEMUXER)               += r3d.o
-OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o
-OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o
-OBJS-$(CONFIG_REDIR_DEMUXER)             += rtsp.o
-OBJS-$(CONFIG_RL2_DEMUXER)               += rl2.o
-OBJS-$(CONFIG_RM_DEMUXER)                += rmdec.o rm.o
-OBJS-$(CONFIG_RM_MUXER)                  += rmenc.o rm.o
-OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
-OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o
-OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.o
-OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \
-                                            rtp_aac.o     \
-                                            rtp_amr.o     \
-                                            rtp_asf.o     \
-                                            rtp_h263.o    \
-                                            rtp_mpv.o     \
-                                            rtpenc.o      \
-                                            rtpenc_h264.o \
-                                            avc.o
-OBJS-$(CONFIG_RTSP_DEMUXER)              += rdt.o rtsp.o
-OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o rtp.o rtpdec.o rtp_h264.o rtp_vorbis.o
-OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
-OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
-OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
-OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
-OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o raw.o
-OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
-OBJS-$(CONFIG_SWF_DEMUXER)               += swfdec.o
-OBJS-$(CONFIG_SWF_MUXER)                 += swfenc.o
-OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_THP_DEMUXER)               += thp.o
-OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
-OBJS-$(CONFIG_TMV_DEMUXER)               += tmv.o
-OBJS-$(CONFIG_TRUEHD_DEMUXER)            += raw.o id3v2.o
-OBJS-$(CONFIG_TRUEHD_MUXER)              += raw.o
-OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
-OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
-OBJS-$(CONFIG_VC1_DEMUXER)               += raw.o
-OBJS-$(CONFIG_VC1T_DEMUXER)              += vc1test.o
-OBJS-$(CONFIG_VC1T_MUXER)                += vc1testenc.o
-OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.o
-OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.o voc.o
-OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.o voc.o
-OBJS-$(CONFIG_VQF_DEMUXER)               += vqf.o
-OBJS-$(CONFIG_WAV_DEMUXER)               += wav.o riff.o raw.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_XA_DEMUXER)                += xa.o
-OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.o
-OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
+OBJS-$(CONFIG_AAC_DEMUXER)               += raw.c id3v2.c
+OBJS-$(CONFIG_AC3_DEMUXER)               += raw.c
+OBJS-$(CONFIG_AC3_MUXER)                 += raw.c
+OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.c
+OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.c riff.c raw.c
+OBJS-$(CONFIG_AIFF_MUXER)                += aiff.c riff.c
+OBJS-$(CONFIG_AMR_DEMUXER)               += amr.c
+OBJS-$(CONFIG_AMR_MUXER)                 += amr.c
+OBJS-$(CONFIG_APC_DEMUXER)               += apc.c
+OBJS-$(CONFIG_APE_DEMUXER)               += ape.c
+OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec.c asf.c asfcrypt.c riff.c avlanguage.c
+OBJS-$(CONFIG_ASF_MUXER)                 += asfenc.c asf.c riff.c
+OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asfenc.c asf.c riff.c
+OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.c
+OBJS-$(CONFIG_ASS_MUXER)                 += assenc.c
+OBJS-$(CONFIG_AU_DEMUXER)                += au.c raw.c
+OBJS-$(CONFIG_AU_MUXER)                  += au.c
+OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.c riff.c
+OBJS-$(CONFIG_AVI_MUXER)                 += avienc.c riff.c
+OBJS-$(CONFIG_AVISYNTH)                  += avisynth.c
+OBJS-$(CONFIG_AVM2_MUXER)                += swfenc.c
+OBJS-$(CONFIG_AVS_DEMUXER)               += avs.c vocdec.c voc.c
+OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.c
+OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.c
+OBJS-$(CONFIG_C93_DEMUXER)               += c93.c vocdec.c voc.c
+OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.c
+OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.c
+OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.c
+OBJS-$(CONFIG_DAUD_MUXER)                += daud.c
+OBJS-$(CONFIG_DIRAC_DEMUXER)             += raw.c
+OBJS-$(CONFIG_DIRAC_MUXER)               += raw.c
+OBJS-$(CONFIG_DNXHD_DEMUXER)             += raw.c
+OBJS-$(CONFIG_DNXHD_MUXER)               += raw.c
+OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.c
+OBJS-$(CONFIG_DTS_DEMUXER)               += raw.c id3v2.c
+OBJS-$(CONFIG_DTS_MUXER)                 += raw.c
+OBJS-$(CONFIG_DV_DEMUXER)                += dv.c
+OBJS-$(CONFIG_DV_MUXER)                  += dvenc.c
+OBJS-$(CONFIG_DXA_DEMUXER)               += dxa.c riff.c
+OBJS-$(CONFIG_EA_CDATA_DEMUXER)          += eacdata.c
+OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.c
+OBJS-$(CONFIG_EAC3_DEMUXER)              += raw.c id3v2.c
+OBJS-$(CONFIG_EAC3_MUXER)                += raw.c
+OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.c
+OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.c
+OBJS-$(CONFIG_FLAC_DEMUXER)              += flacdec.c raw.c id3v2.c oggparsevorbis.c
+OBJS-$(CONFIG_FLAC_MUXER)                += flacenc.c
+OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.c
+OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.c
+OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.c avc.c
+OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.c
+OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.c
+OBJS-$(CONFIG_GIF_MUXER)                 += gif.c
+OBJS-$(CONFIG_GSM_DEMUXER)               += raw.c id3v2.c
+OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.c
+OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.c audiointerleave.c
+OBJS-$(CONFIG_H261_DEMUXER)              += raw.c
+OBJS-$(CONFIG_H261_MUXER)                += raw.c
+OBJS-$(CONFIG_H263_DEMUXER)              += raw.c
+OBJS-$(CONFIG_H263_MUXER)                += raw.c
+OBJS-$(CONFIG_H264_DEMUXER)              += raw.c
+OBJS-$(CONFIG_H264_MUXER)                += raw.c
+OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.c
+OBJS-$(CONFIG_IFF_DEMUXER)               += iff.c
+OBJS-$(CONFIG_IMAGE2_DEMUXER)            += img2.c
+OBJS-$(CONFIG_IMAGE2_MUXER)              += img2.c
+OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER)        += img2.c
+OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.c
+OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.c
+OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.c
+OBJS-$(CONFIG_IPOD_MUXER)                += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_ISS_DEMUXER)               += iss.c
+OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.c
+OBJS-$(CONFIG_M4V_DEMUXER)               += raw.c
+OBJS-$(CONFIG_M4V_MUXER)                 += raw.c
+OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)      += matroskaenc.c matroska.c riff.c isom.c avc.c flacenc.c
+OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.c matroska.c riff.c isom.c
+OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.c matroska.c riff.c isom.c avc.c flacenc.c
+OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.c
+OBJS-$(CONFIG_MJPEG_MUXER)               += raw.c
+OBJS-$(CONFIG_MLP_DEMUXER)               += raw.c id3v2.c
+OBJS-$(CONFIG_MLP_MUXER)                 += raw.c
+OBJS-$(CONFIG_MM_DEMUXER)                += mm.c
+OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.c raw.c
+OBJS-$(CONFIG_MMF_MUXER)                 += mmf.c riff.c
+OBJS-$(CONFIG_MOV_DEMUXER)               += mov.c riff.c isom.c
+OBJS-$(CONFIG_MOV_MUXER)                 += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_MP2_MUXER)                 += mp3.c
+OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.c id3v2.c
+OBJS-$(CONFIG_MP3_MUXER)                 += mp3.c
+OBJS-$(CONFIG_MP4_MUXER)                 += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.c id3v2.c
+OBJS-$(CONFIG_MPC8_DEMUXER)              += mpc8.c
+OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpegenc.c
+OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpegenc.c
+OBJS-$(CONFIG_MPEG2DVD_MUXER)            += mpegenc.c
+OBJS-$(CONFIG_MPEG2VOB_MUXER)            += mpegenc.c
+OBJS-$(CONFIG_MPEG2SVCD_MUXER)           += mpegenc.c
+OBJS-$(CONFIG_MPEG1VIDEO_MUXER)          += raw.c
+OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += raw.c
+OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.c
+OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.c
+OBJS-$(CONFIG_MPEGTSRAW_DEMUXER)         += mpegts.c
+OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.c
+OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += raw.c
+OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.c
+OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.c
+OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.c
+OBJS-$(CONFIG_MVI_DEMUXER)               += mvi.c
+OBJS-$(CONFIG_MXF_DEMUXER)               += mxfdec.c mxf.c
+OBJS-$(CONFIG_MXF_MUXER)                 += mxfenc.c mxf.c audiointerleave.c
+OBJS-$(CONFIG_MXF_D10_MUXER)             += mxfenc.c mxf.c audiointerleave.c
+OBJS-$(CONFIG_NC_DEMUXER)                += ncdec.c
+OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.c
+OBJS-$(CONFIG_NULL_MUXER)                += raw.c
+OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.c nut.c riff.c
+OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.c nut.c riff.c
+OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.c riff.c
+OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.c         \
+                                            oggparseflac.c   \
+                                            oggparseogm.c    \
+                                            oggparsespeex.c  \
+                                            oggparsetheora.c \
+                                            oggparsevorbis.c \
+                                            riff.c
+OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.c
+OBJS-$(CONFIG_OMA_DEMUXER)               += oma.c raw.c
+OBJS-$(CONFIG_PCM_ALAW_DEMUXER)          += raw.c
+OBJS-$(CONFIG_PCM_ALAW_MUXER)            += raw.c
+OBJS-$(CONFIG_PCM_F32BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_F32BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_F32LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_F32LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_F64BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_F64BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_F64LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_F64LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_MULAW_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_MULAW_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S16BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S16BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S16LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S16LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S24BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S24BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S24LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S24LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S32BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S32BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S32LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_S32LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_S8_DEMUXER)            += raw.c
+OBJS-$(CONFIG_PCM_S8_MUXER)              += raw.c
+OBJS-$(CONFIG_PCM_U16BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U16BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U16LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U16LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U24BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U24BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U24LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U24LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U32BE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U32BE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U32LE_DEMUXER)         += raw.c
+OBJS-$(CONFIG_PCM_U32LE_MUXER)           += raw.c
+OBJS-$(CONFIG_PCM_U8_DEMUXER)            += raw.c
+OBJS-$(CONFIG_PCM_U8_MUXER)              += raw.c
+OBJS-$(CONFIG_PSP_MUXER)                 += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_PVA_DEMUXER)               += pva.c
+OBJS-$(CONFIG_R3D_DEMUXER)               += r3d.c
+OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.c
+OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.c
+OBJS-$(CONFIG_REDIR_DEMUXER)             += rtsp.c
+OBJS-$(CONFIG_RL2_DEMUXER)               += rl2.c
+OBJS-$(CONFIG_RM_DEMUXER)                += rmdec.c rm.c
+OBJS-$(CONFIG_RM_MUXER)                  += rmenc.c rm.c
+OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.c
+OBJS-$(CONFIG_ROQ_MUXER)                 += raw.c
+OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.c
+OBJS-$(CONFIG_RTP_MUXER)                 += rtp.c         \
+                                            rtp_aac.c     \
+                                            rtp_amr.c     \
+                                            rtp_asf.c     \
+                                            rtp_h263.c    \
+                                            rtp_mpv.c     \
+                                            rtpenc.c      \
+                                            rtpenc_h264.c \
+                                            avc.c
+OBJS-$(CONFIG_RTSP_DEMUXER)              += rdt.c rtsp.c
+OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.c rtp.c rtpdec.c rtp_h264.c rtp_vorbis.c
+OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.c
+OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.c id3v2.c
+OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.c
+OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.c
+OBJS-$(CONFIG_SOL_DEMUXER)               += sol.c raw.c
+OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.c
+OBJS-$(CONFIG_SWF_DEMUXER)               += swfdec.c
+OBJS-$(CONFIG_SWF_MUXER)                 += swfenc.c
+OBJS-$(CONFIG_TG2_MUXER)                 += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_TGP_MUXER)                 += movenc.c riff.c isom.c avc.c
+OBJS-$(CONFIG_THP_DEMUXER)               += thp.c
+OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.c
+OBJS-$(CONFIG_TMV_DEMUXER)               += tmv.c
+OBJS-$(CONFIG_TRUEHD_DEMUXER)            += raw.c id3v2.c
+OBJS-$(CONFIG_TRUEHD_MUXER)              += raw.c
+OBJS-$(CONFIG_TTA_DEMUXER)               += tta.c
+OBJS-$(CONFIG_TXD_DEMUXER)               += txd.c
+OBJS-$(CONFIG_VC1_DEMUXER)               += raw.c
+OBJS-$(CONFIG_VC1T_DEMUXER)              += vc1test.c
+OBJS-$(CONFIG_VC1T_MUXER)                += vc1testenc.c
+OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.c
+OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.c voc.c
+OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.c voc.c
+OBJS-$(CONFIG_VQF_DEMUXER)               += vqf.c
+OBJS-$(CONFIG_WAV_DEMUXER)               += wav.c riff.c raw.c
+OBJS-$(CONFIG_WAV_MUXER)                 += wav.c riff.c
+OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.c
+OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.c
+OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.c
+OBJS-$(CONFIG_WV_DEMUXER)                += wv.c
+OBJS-$(CONFIG_XA_DEMUXER)                += xa.c
+OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.c
+OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.c
 
 # external libraries
-OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
-OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
+OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.c riff.c
+OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.c riff.c
 
 # protocols I/O
-OBJS+= avio.o aviobuf.o
+OBJS+= avio.c aviobuf.c
 
-OBJS-$(CONFIG_FILE_PROTOCOL)             += file.o
-OBJS-$(CONFIG_GOPHER_PROTOCOL)           += gopher.o
-OBJS-$(CONFIG_HTTP_PROTOCOL)             += http.o
-OBJS-$(CONFIG_PIPE_PROTOCOL)             += file.o
-OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
-OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
-OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
+OBJS-$(CONFIG_FILE_PROTOCOL)             += file.c
+OBJS-$(CONFIG_GOPHER_PROTOCOL)           += gopher.c
+OBJS-$(CONFIG_HTTP_PROTOCOL)             += http.c
+OBJS-$(CONFIG_PIPE_PROTOCOL)             += file.c
+OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.c
+OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.c
+OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.c
 
 # libavdevice dependencies
-OBJS-$(CONFIG_JACK_DEMUXER)              += timefilter.o
+OBJS-$(CONFIG_JACK_DEMUXER)              += timefilter.c
 
 EXAMPLES  = output
 TESTPROGS = timefilter
 
-include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
diff --git a/libavutil/Makefile.omk b/libavutil/Makefile.omk
index a8ff244b1..911075578 100644
--- a/libavutil/Makefile.omk
+++ b/libavutil/Makefile.omk
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
@@ -19,33 +17,31 @@ HEADERS = adler32.h                                                     \
           rational.h                                                    \
           sha1.h
 
-OBJS = adler32.o                                                        \
-       aes.o                                                            \
-       avstring.o                                                       \
-       base64.o                                                         \
-       crc.o                                                            \
-       des.o                                                            \
-       fifo.o                                                           \
-       intfloat_readwrite.o                                             \
-       lfg.o                                                            \
-       lls.o                                                            \
-       log.o                                                            \
-       lzo.o                                                            \
-       mathematics.o                                                    \
-       md5.o                                                            \
-       mem.o                                                            \
-       random_seed.o                                                    \
-       rational.o                                                       \
-       rc4.o                                                            \
-       sha1.o                                                           \
-       tree.o                                                           \
-       utils.o                                                          \
+OBJS = adler32.c                                                        \
+       aes.c                                                            \
+       avstring.c                                                       \
+       base64.c                                                         \
+       crc.c                                                            \
+       des.c                                                            \
+       fifo.c                                                           \
+       intfloat_readwrite.c                                             \
+       lfg.c                                                            \
+       lls.c                                                            \
+       log.c                                                            \
+       lzo.c                                                            \
+       mathematics.c                                                    \
+       md5.c                                                            \
+       mem.c                                                            \
+       random_seed.c                                                    \
+       rational.c                                                       \
+       rc4.c                                                            \
+       sha1.c                                                           \
+       tree.c                                                           \
+       utils.c                                                          \
 
 TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree
 TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 
-DIRS = arm bfin sh4 x86
-
-include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
diff --git a/libpostproc/Makefile.omk b/libpostproc/Makefile.omk
index bd0b71e3d..c8b04f47c 100644
--- a/libpostproc/Makefile.omk
+++ b/libpostproc/Makefile.omk
@@ -1,10 +1,10 @@
-include $(SUBDIR)../config.mak
-
 NAME = postproc
 FFLIBS = avutil
 
 HEADERS = postprocess.h
 
-OBJS = postprocess.o
+OBJS = postprocess.c
 
-include $(SUBDIR)../subdir.mak
+lib_LIBRARIES:=$(NAME)
+$(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes)
+renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
-- 
2.39.2