diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-10-26 14:26:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-10-26 14:26:28 +0000 |
| commit | 864ac5d6487783785de6c0ae588f957762d23bc6 (patch) | |
| tree | 5031577865c669baa07aa6dd0b8947f2e42da486 | |
| parent | ba5fc967f6bd1d9866bcf52880da99dd8f1f5520 (diff) | |
Merge OBJS-$(FOO) lists with same FOO
Originally committed as revision 15716 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a5c63a258f..26b7a7934f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -423,19 +423,17 @@ endif OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ armv4l/simple_idct_arm.o \ armv4l/dsputil_arm_s.o \ - -OBJS-$(ARCH_ARMV4L) += armv4l/dsputil_arm.o \ + armv4l/dsputil_arm.o \ armv4l/mpegvideo_arm.o \ OBJS-$(HAVE_IWMMXT) += armv4l/dsputil_iwmmxt.o \ armv4l/mpegvideo_iwmmxt.o \ OBJS-$(HAVE_ARMV5TE) += armv4l/mpegvideo_armv5te.o \ + armv4l/simple_idct_armv5te.o \ OBJS-$(HAVE_ARMVFP) += armv4l/float_arm_vfp.o \ -OBJS-$(HAVE_ARMV5TE) += armv4l/simple_idct_armv5te.o \ - OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ @@ -447,8 +445,7 @@ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ alpha/motion_est_alpha.o \ alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ - -OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ + alpha/dsputil_alpha_asm.o \ alpha/motion_est_mvi_asm.o \ OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ @@ -485,8 +482,7 @@ OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS-yes) \ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ bfin/mpegvideo_bfin.o \ bfin/vp3_bfin.o \ - -OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ + bfin/pixels_bfin.o \ bfin/fdct_bfin.o \ bfin/idct_bfin.o \ bfin/vp3_idct_bfin.o \ |