Mercurial > libavcodec.hg
changeset 11500:8ae93fdefcd7 libavcodec
Move arch-specific makefile parts into $arch/Makefile
| author | mru |
|---|---|
| date | Tue, 16 Mar 2010 21:22:59 +0000 |
| parents | 2a4dc3c0b012 |
| children | cd71b238e78b |
| files | Makefile alpha/Makefile arm/Makefile bfin/Makefile mips/Makefile ppc/Makefile sh4/Makefile sparc/Makefile x86/Makefile |
| diffstat | 9 files changed, 122 insertions(+), 129 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Mar 16 01:17:00 2010 +0000 +++ b/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -582,137 +582,9 @@ OBJS-$(HAVE_PTHREADS) += pthread.o OBJS-$(HAVE_W32THREADS) += w32thread.o -# processor-specific code -X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o -X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o - -OBJS-$(ARCH_X86) += $(X86-OBJS-yes) - -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_GPL) += x86/idct_mmx.o -MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o -MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.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-$(HAVE_YASM) += x86/dsputil_yasm.o \ - $(YASM-OBJS-yes) - -MMX-OBJS-$(CONFIG_FFT) += x86/fft.o - -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 \ - -ARM-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \ - arm/h264pred_init_arm.o \ - -OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \ - arm/dsputil_arm.o \ - arm/fft_init_arm.o \ - arm/jrevdct_arm.o \ - arm/mpegvideo_arm.o \ - arm/simple_idct_arm.o \ - $(ARM-OBJS-yes) - -OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \ - arm/mpegvideo_armv5te.o \ - arm/mpegvideo_armv5te_s.o \ - arm/simple_idct_armv5te.o \ - -OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \ - arm/dsputil_armv6.o \ - arm/simple_idct_armv6.o \ - -OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \ - arm/dsputil_init_vfp.o \ - -OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \ - arm/mpegvideo_iwmmxt.o \ - -NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ - -NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \ - -NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \ - arm/h264idct_neon.o \ - arm/h264pred_neon.o \ - -NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o - -OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ - arm/dsputil_neon.o \ - arm/int_neon.o \ - arm/simple_idct_neon.o \ - $(NEON-OBJS-yes) - -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_H264DSP) += ppc/h264_altivec.o -ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_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 \ - $(ALTIVEC-OBJS-yes) - -OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \ - sh4/dsputil_sh4.o \ - sh4/idct_sh4.o \ - OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ -OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ - ps2/idct_mmi.o \ - ps2/mpegvideo_mmi.o \ - -OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ - sparc/simple_idct_vis.o \ +-include $(SUBDIR)$(ARCH)/Makefile SKIPHEADERS = %_tablegen.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alpha/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,6 @@ +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 \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/arm/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,41 @@ +ARM-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \ + arm/h264pred_init_arm.o \ + +OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \ + arm/dsputil_arm.o \ + arm/fft_init_arm.o \ + arm/jrevdct_arm.o \ + arm/mpegvideo_arm.o \ + arm/simple_idct_arm.o \ + $(ARM-OBJS-yes) + +OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \ + arm/mpegvideo_armv5te.o \ + arm/mpegvideo_armv5te_s.o \ + arm/simple_idct_armv5te.o \ + +OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \ + arm/dsputil_armv6.o \ + arm/simple_idct_armv6.o \ + +OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \ + arm/dsputil_init_vfp.o \ + +OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \ + arm/mpegvideo_iwmmxt.o \ + +NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ + +NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \ + +NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \ + arm/h264idct_neon.o \ + arm/h264pred_neon.o \ + +NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o + +OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ + arm/dsputil_neon.o \ + arm/int_neon.o \ + arm/simple_idct_neon.o \ + $(NEON-OBJS-yes)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bfin/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,7 @@ +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 \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mips/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,3 @@ +OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ + ps2/idct_mmi.o \ + ps2/mpegvideo_mmi.o \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ppc/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,18 @@ +OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \ + +ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o +ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o +ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o +ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o +ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_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 \ + $(ALTIVEC-OBJS-yes)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sh4/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,3 @@ +OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \ + sh4/dsputil_sh4.o \ + sh4/idct_sh4.o \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sparc/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,2 @@ +OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ + sparc/simple_idct_vis.o \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/x86/Makefile Tue Mar 16 21:22:59 2010 +0000 @@ -0,0 +1,41 @@ +X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o +X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o + +OBJS-$(ARCH_X86) += $(X86-OBJS-yes) + +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_GPL) += x86/idct_mmx.o +MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o +MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.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-$(HAVE_YASM) += x86/dsputil_yasm.o \ + $(YASM-OBJS-yes) + +MMX-OBJS-$(CONFIG_FFT) += x86/fft.o + +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 \