diff options
| -rw-r--r-- | libavcodec/Makefile | 144 | ||||
| -rw-r--r-- | libavfilter/Makefile | 8 | ||||
| -rw-r--r-- | libavutil/Makefile | 72 |
3 files changed, 112 insertions, 112 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 26b7a7934f..fa1cba9e3d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -3,22 +3,22 @@ include $(SUBDIR)../config.mak NAME = avcodec FFLIBS = avutil -OBJS = allcodecs.o \ - audioconvert.o \ - bitstream.o \ - bitstream_filter.o \ - dsputil.o \ - eval.o \ - faanidct.o \ - imgconvert.o \ - jrevdct.o \ - opt.o \ - parser.o \ - raw.o \ - resample.o \ - resample2.o \ - simple_idct.o \ - utils.o \ +OBJS = allcodecs.o \ + audioconvert.o \ + bitstream.o \ + bitstream_filter.o \ + dsputil.o \ + eval.o \ + faanidct.o \ + imgconvert.o \ + jrevdct.o \ + opt.o \ + parser.o \ + raw.o \ + resample.o \ + resample2.o \ + simple_idct.o \ + utils.o \ HEADERS = avcodec.h opt.h @@ -388,19 +388,19 @@ endif # processor-specific code ifdef HAVE_MMX -OBJS += i386/fdct_mmx.o \ - i386/cpuid.o \ - i386/dsputil_mmx.o \ - i386/mpegvideo_mmx.o \ - i386/motion_est_mmx.o \ - i386/simple_idct_mmx.o \ - i386/idct_mmx_xvid.o \ - i386/idct_sse2_xvid.o \ - -OBJS-$(CONFIG_FFT_MMX) += i386/fft_mmx.o \ - i386/fft_sse.o \ - i386/fft_3dn.o \ - i386/fft_3dn2.o \ +OBJS += i386/fdct_mmx.o \ + i386/cpuid.o \ + i386/dsputil_mmx.o \ + i386/mpegvideo_mmx.o \ + i386/motion_est_mmx.o \ + i386/simple_idct_mmx.o \ + i386/idct_mmx_xvid.o \ + i386/idct_sse2_xvid.o \ + +OBJS-$(CONFIG_FFT_MMX) += i386/fft_mmx.o \ + i386/fft_sse.o \ + i386/fft_3dn.o \ + i386/fft_3dn2.o \ OBJS-$(HAVE_YASM) += i386/dsputil_yasm.o @@ -420,52 +420,52 @@ OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o endif -OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ - armv4l/simple_idct_arm.o \ - armv4l/dsputil_arm_s.o \ - armv4l/dsputil_arm.o \ - armv4l/mpegvideo_arm.o \ +OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ + armv4l/simple_idct_arm.o \ + armv4l/dsputil_arm_s.o \ + armv4l/dsputil_arm.o \ + armv4l/mpegvideo_arm.o \ -OBJS-$(HAVE_IWMMXT) += armv4l/dsputil_iwmmxt.o \ - armv4l/mpegvideo_iwmmxt.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_ARMV5TE) += armv4l/mpegvideo_armv5te.o \ + armv4l/simple_idct_armv5te.o \ -OBJS-$(HAVE_ARMVFP) += armv4l/float_arm_vfp.o \ +OBJS-$(HAVE_ARMVFP) += armv4l/float_arm_vfp.o \ -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 \ +OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ + sparc/simple_idct_vis.o \ -OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ +OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ -OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ - alpha/motion_est_alpha.o \ - alpha/mpegvideo_alpha.o \ - alpha/simple_idct_alpha.o \ - alpha/dsputil_alpha_asm.o \ - alpha/motion_est_mvi_asm.o \ +OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ + alpha/motion_est_alpha.o \ + alpha/mpegvideo_alpha.o \ + alpha/simple_idct_alpha.o \ + alpha/dsputil_alpha_asm.o \ + alpha/motion_est_mvi_asm.o \ -OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ +OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ -OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ - ps2/idct_mmi.o \ - ps2/mpegvideo_mmi.o \ +OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ + ps2/idct_mmi.o \ + ps2/mpegvideo_mmi.o \ -OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ - sh4/dsputil_align.o \ - sh4/dsputil_sh4.o \ +OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ + sh4/dsputil_align.o \ + sh4/dsputil_sh4.o \ -ALTIVEC-OBJS-yes += 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 += 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-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o ALTIVEC-OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o @@ -476,16 +476,16 @@ ALTIVEC-OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o $(addprefix $(SUBDIR),$(ALTIVEC-OBJS-yes)): CFLAGS += -maltivec -mabi=altivec # check_altivec must be built without -maltivec -OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS-yes) \ +OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS-yes) \ ppc/check_altivec.o -OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ - bfin/mpegvideo_bfin.o \ - bfin/vp3_bfin.o \ - bfin/pixels_bfin.o \ - bfin/fdct_bfin.o \ - bfin/idct_bfin.o \ - bfin/vp3_idct_bfin.o \ +OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ + bfin/mpegvideo_bfin.o \ + bfin/vp3_bfin.o \ + bfin/pixels_bfin.o \ + bfin/fdct_bfin.o \ + bfin/idct_bfin.o \ + bfin/vp3_idct_bfin.o \ TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow) TESTS-$(ARCH_X86) += i386/cpuid-test$(EXESUF) motion-test$(EXESUF) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 2357aeea44..1cd4992442 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -5,10 +5,10 @@ FFLIBS = avcodec avutil FFLIBS-$(CONFIG_SWSCALE) += swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat -OBJS = allfilters.o \ - avfilter.o \ - defaults.o \ - formats.o \ +OBJS = allfilters.o \ + avfilter.o \ + defaults.o \ + formats.o \ #OBJS-$(CONFIG_XXX_FILTER) += vf_xxx.o diff --git a/libavutil/Makefile b/libavutil/Makefile index bd95156760..bcbc9b3c9a 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -2,43 +2,43 @@ include $(SUBDIR)../config.mak NAME = avutil -OBJS = adler32.o \ - aes.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.o \ - rational.o \ - rc4.o \ - sha1.o \ - string.o \ - tree.o \ - utils.o \ +OBJS = adler32.o \ + aes.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.o \ + rational.o \ + rc4.o \ + sha1.o \ + string.o \ + tree.o \ + utils.o \ -HEADERS = adler32.h \ - avstring.h \ - avutil.h \ - base64.h \ - common.h \ - crc.h \ - fifo.h \ - intfloat_readwrite.h \ - log.h \ - lzo.h \ - mathematics.h \ - md5.h \ - mem.h \ - random.h \ - rational.h \ +HEADERS = adler32.h \ + avstring.h \ + avutil.h \ + base64.h \ + common.h \ + crc.h \ + fifo.h \ + intfloat_readwrite.h \ + log.h \ + lzo.h \ + mathematics.h \ + md5.h \ + mem.h \ + random.h \ + rational.h \ sha1.h TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 pca random sha1 softfloat tree) |