History

Move arch-specific makefile parts into $arch/Makefile

Originally committed as revision 22569 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård committed 16 years ago

Commit 43f60eb1 parent e0e335a10 files · +124 −130Browse files

Unified · Split

10 files
  1. configure +2 −1
  2. libavcodec/Makefile +1 −129
  3. libavcodec/alpha/Makefile +6 −0
  4. libavcodec/arm/Makefile +41 −0
  5. libavcodec/bfin/Makefile +7 −0
  6. libavcodec/mips/Makefile +3 −0
  7. libavcodec/ppc/Makefile +18 −0
  8. libavcodec/sh4/Makefile +3 −0
  9. libavcodec/sparc/Makefile +2 −0
  10. libavcodec/x86/Makefile +41 −0
configure+2−1
@@ -2948,6 +2948,7 @@ if enabled source_path_used; then · 2947 unmodified lines
2948 subdir.mak2948 subdir.mak
2949 doc/texi2pod.pl2949 doc/texi2pod.pl
2950 libavcodec/Makefile2950 libavcodec/Makefile
2951 libavcodec/${arch}/Makefile
2951 libavdevice/Makefile2952 libavdevice/Makefile
2952 libavfilter/Makefile2953 libavfilter/Makefile
2953 libavformat/Makefile2954 libavformat/Makefile
@@ -2956,7 +2957,7 @@ if enabled source_path_used; then · 2 unmodified lines
2956 libswscale/Makefile2957 libswscale/Makefile
2957 "2958 "
2958 map 'mkdir -p $v' $DIRS;2959 map 'mkdir -p $v' $DIRS;
2959 map '$ln_s "$source_path/$v" $v' $FILES2960 map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES
2960fi2961fi
2961 2962
2962enabled stripping || strip="echo skipping strip"2963enabled stripping || strip="echo skipping strip"
libavcodec/Makefile+1−129
@@ -582,137 +582,9 @@ OBJS-$(HAVE_OS2THREADS) += os2thread.o · 581 unmodified lines
582OBJS-$(HAVE_PTHREADS) += pthread.o582OBJS-$(HAVE_PTHREADS) += pthread.o
583OBJS-$(HAVE_W32THREADS) += w32thread.o583OBJS-$(HAVE_W32THREADS) += w32thread.o
584 584
585# processor-specific code
586X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
587X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
588
589OBJS-$(ARCH_X86) += $(X86-OBJS-yes)
590
591YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
592YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
593YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o
594YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
595 $(YASM-OBJS-FFT-yes)
596YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \
597 x86/h264_idct_sse2.o \
598
599MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
600MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
601MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
602MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
603MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
604MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
605MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o \
606 x86/vp3dsp_sse2.o
607MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o \
608 x86/vp3dsp_sse2.o
609MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o \
610 x86/vp3dsp_sse2.o \
611 x86/vp6dsp_mmx.o \
612 x86/vp6dsp_sse2.o
613MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \
614 $(YASM-OBJS-yes)
615
616MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
617
618OBJS-$(HAVE_MMX) += x86/cpuid.o \
619 x86/dnxhd_mmx.o \
620 x86/dsputil_mmx.o \
621 x86/fdct_mmx.o \
622 x86/idct_mmx_xvid.o \
623 x86/idct_sse2_xvid.o \
624 x86/motion_est_mmx.o \
625 x86/mpegvideo_mmx.o \
626 x86/simple_idct_mmx.o \
627
628OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
629 alpha/dsputil_alpha_asm.o \
630 alpha/motion_est_alpha.o \
631 alpha/motion_est_mvi_asm.o \
632 alpha/mpegvideo_alpha.o \
633 alpha/simple_idct_alpha.o \
634
635ARM-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \
636 arm/h264pred_init_arm.o \
637
638OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \
639 arm/dsputil_arm.o \
640 arm/fft_init_arm.o \
641 arm/jrevdct_arm.o \
642 arm/mpegvideo_arm.o \
643 arm/simple_idct_arm.o \
644 $(ARM-OBJS-yes)
645
646OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \
647 arm/mpegvideo_armv5te.o \
648 arm/mpegvideo_armv5te_s.o \
649 arm/simple_idct_armv5te.o \
650
651OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \
652 arm/dsputil_armv6.o \
653 arm/simple_idct_armv6.o \
654
655OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
656 arm/dsputil_init_vfp.o \
657
658OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
659 arm/mpegvideo_iwmmxt.o \
660
661NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
662
663NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
664
665NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
666 arm/h264idct_neon.o \
667 arm/h264pred_neon.o \
668
669NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
670
671OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \
672 arm/dsputil_neon.o \
673 arm/int_neon.o \
674 arm/simple_idct_neon.o \
675 $(NEON-OBJS-yes)
676
677OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
678 bfin/fdct_bfin.o \
679 bfin/idct_bfin.o \
680 bfin/mpegvideo_bfin.o \
681 bfin/pixels_bfin.o \
682 bfin/vp3_bfin.o \
683 bfin/vp3_idct_bfin.o \
684
685OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \
686
687ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o
688ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
689ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o
690ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o
691ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_altivec.o
692
693OBJS-$(HAVE_ALTIVEC) += ppc/check_altivec.o \
694 ppc/dsputil_altivec.o \
695 ppc/fdct_altivec.o \
696 ppc/fft_altivec.o \
697 ppc/float_altivec.o \
698 ppc/gmc_altivec.o \
699 ppc/idct_altivec.o \
700 ppc/int_altivec.o \
701 ppc/mpegvideo_altivec.o \
702 $(ALTIVEC-OBJS-yes)
703
704OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \
705 sh4/dsputil_sh4.o \
706 sh4/idct_sh4.o \
707
708OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \585OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
709 586
710OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \587-include $(SUBDIR)$(ARCH)/Makefile
711 ps2/idct_mmi.o \
712 ps2/mpegvideo_mmi.o \
713
714OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
715 sparc/simple_idct_vis.o \
716 588
717SKIPHEADERS = %_tablegen.h589SKIPHEADERS = %_tablegen.h
718SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h590SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
libavcodec/alpha/Makefile+6−0
@@ -0,0 +1,6 @@
1OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
2 alpha/dsputil_alpha_asm.o \
3 alpha/motion_est_alpha.o \
4 alpha/motion_est_mvi_asm.o \
5 alpha/mpegvideo_alpha.o \
6 alpha/simple_idct_alpha.o \
libavcodec/arm/Makefile+41−0
@@ -0,0 +1,41 @@
1ARM-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \
2 arm/h264pred_init_arm.o \
3
4OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \
5 arm/dsputil_arm.o \
6 arm/fft_init_arm.o \
7 arm/jrevdct_arm.o \
8 arm/mpegvideo_arm.o \
9 arm/simple_idct_arm.o \
10 $(ARM-OBJS-yes)
11
12OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \
13 arm/mpegvideo_armv5te.o \
14 arm/mpegvideo_armv5te_s.o \
15 arm/simple_idct_armv5te.o \
16
17OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \
18 arm/dsputil_armv6.o \
19 arm/simple_idct_armv6.o \
20
21OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
22 arm/dsputil_init_vfp.o \
23
24OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
25 arm/mpegvideo_iwmmxt.o \
26
27NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
28
29NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
30
31NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
32 arm/h264idct_neon.o \
33 arm/h264pred_neon.o \
34
35NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
36
37OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \
38 arm/dsputil_neon.o \
39 arm/int_neon.o \
40 arm/simple_idct_neon.o \
41 $(NEON-OBJS-yes)
libavcodec/bfin/Makefile+7−0
@@ -0,0 +1,7 @@
1OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
2 bfin/fdct_bfin.o \
3 bfin/idct_bfin.o \
4 bfin/mpegvideo_bfin.o \
5 bfin/pixels_bfin.o \
6 bfin/vp3_bfin.o \
7 bfin/vp3_idct_bfin.o \
libavcodec/mips/Makefile+3−0
@@ -0,0 +1,3 @@
1OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \
2 ps2/idct_mmi.o \
3 ps2/mpegvideo_mmi.o \
libavcodec/ppc/Makefile+18−0
@@ -0,0 +1,18 @@
1OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \
2
3ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o
4ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
5ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o
6ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o
7ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_altivec.o
8
9OBJS-$(HAVE_ALTIVEC) += ppc/check_altivec.o \
10 ppc/dsputil_altivec.o \
11 ppc/fdct_altivec.o \
12 ppc/fft_altivec.o \
13 ppc/float_altivec.o \
14 ppc/gmc_altivec.o \
15 ppc/idct_altivec.o \
16 ppc/int_altivec.o \
17 ppc/mpegvideo_altivec.o \
18 $(ALTIVEC-OBJS-yes)
libavcodec/sh4/Makefile+3−0
@@ -0,0 +1,3 @@
1OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \
2 sh4/dsputil_sh4.o \
3 sh4/idct_sh4.o \
libavcodec/sparc/Makefile+2−0
@@ -0,0 +1,2 @@
1OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
2 sparc/simple_idct_vis.o \
libavcodec/x86/Makefile+41−0
@@ -0,0 +1,41 @@
1X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
2X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
3
4OBJS-$(ARCH_X86) += $(X86-OBJS-yes)
5
6YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
7YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
8YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o
9YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
10 $(YASM-OBJS-FFT-yes)
11YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \
12 x86/h264_idct_sse2.o \
13
14MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
15MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
16MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
17MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
18MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
19MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
20MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o \
21 x86/vp3dsp_sse2.o
22MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o \
23 x86/vp3dsp_sse2.o
24MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o \
25 x86/vp3dsp_sse2.o \
26 x86/vp6dsp_mmx.o \
27 x86/vp6dsp_sse2.o
28MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \
29 $(YASM-OBJS-yes)
30
31MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
32
33OBJS-$(HAVE_MMX) += x86/cpuid.o \
34 x86/dnxhd_mmx.o \
35 x86/dsputil_mmx.o \
36 x86/fdct_mmx.o \
37 x86/idct_mmx_xvid.o \
38 x86/idct_sse2_xvid.o \
39 x86/motion_est_mmx.o \
40 x86/mpegvideo_mmx.o \
41 x86/simple_idct_mmx.o \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t