# HG changeset patch # User mru # Date 1224943228 0 # Node ID 509a7681c284e1b31c94547890ef9f33cfd1c303 # Parent 2b05a70e6c2dbb40349fb5fce6e351b45786de8e Use OBJS variable for all object files There is no longer any need to differentiate the object files by source type. diff -r 2b05a70e6c2d -r 509a7681c284 Makefile --- a/Makefile Sat Oct 25 13:51:47 2008 +0000 +++ b/Makefile Sat Oct 25 14:00:28 2008 +0000 @@ -420,7 +420,7 @@ OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o endif -ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ +OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ armv4l/simple_idct_arm.o \ armv4l/dsputil_arm_s.o \ @@ -434,9 +434,9 @@ OBJS-$(HAVE_ARMVFP) += armv4l/float_arm_vfp.o \ -ASM_OBJS-$(HAVE_ARMV5TE) += armv4l/simple_idct_armv5te.o \ +OBJS-$(HAVE_ARMV5TE) += armv4l/simple_idct_armv5te.o \ -ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ +OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ sparc/simple_idct_vis.o \ @@ -448,7 +448,7 @@ alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ -ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ +OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ alpha/motion_est_mvi_asm.o \ OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ @@ -486,7 +486,7 @@ bfin/mpegvideo_bfin.o \ bfin/vp3_bfin.o \ -ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ +OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ bfin/fdct_bfin.o \ bfin/idct_bfin.o \ bfin/vp3_idct_bfin.o \