[FFmpeg-cvslog] build: arm: cosmetics: Place all OBJS declarations in alphabetical order
Diego Biurrun
git at videolan.org
Thu May 30 10:44:38 CEST 2013
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed May 29 23:15:16 2013 +0200| [9b9b2e9f3036abfd42916bcf734af14b4cb686aa] | committer: Martin Storsjö
build: arm: cosmetics: Place all OBJS declarations in alphabetical order
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b9b2e9f3036abfd42916bcf734af14b4cb686aa
---
libavcodec/arm/Makefile | 97 ++++++++++++++++++-----------------------------
1 file changed, 36 insertions(+), 61 deletions(-)
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 5b717b7..d4bb362 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -1,45 +1,28 @@
ARCH_HEADERS = mathops.h
+OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \
+ arm/sbrdsp_init_arm.o
OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
arm/ac3dsp_arm.o
-
-OBJS-$(CONFIG_AAC_DECODER) += arm/sbrdsp_init_arm.o \
- arm/aacpsdsp_init_arm.o
-
-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \
-
-ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
-
+OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o
OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \
- arm/flacdsp_arm.o \
-
+ arm/flacdsp_arm.o
+OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o
+OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
+OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
+OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_init_arm.o
+OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_arm.o \
+ arm/hpeldsp_arm.o
OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
-ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
-
OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o
OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o
OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o
OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_init_arm.o
OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_init_arm.o
OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o
-ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
- arm/vp8dsp_init_armv6.o \
- arm/vp8dsp_armv6.o
-
-OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o
-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
-OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_init_arm.o
-
-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_arm.o \
- arm/hpeldsp_arm.o
-ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
- arm/hpeldsp_armv6.o
-
OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o
OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \
- arm/rv40dsp_init_arm.o \
-
+ arm/rv40dsp_init_arm.o
OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o \
OBJS += arm/dsputil_init_arm.o \
@@ -51,60 +34,52 @@ OBJS += arm/dsputil_init_arm.o \
arm/simple_idct_arm.o \
ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \
- arm/mpegvideo_armv5te_s.o \
-
+ arm/mpegvideo_armv5te_s.o
ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \
- arm/videodsp_armv5te.o \
+ arm/videodsp_armv5te.o
ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \
arm/simple_idct_armv5te.o \
+ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
+ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
+ arm/hpeldsp_armv6.o
+ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
+ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
+ arm/vp8dsp_init_armv6.o \
+ arm/vp8dsp_armv6.o
+
ARMV6-OBJS += arm/dsputil_init_armv6.o \
arm/dsputil_armv6.o \
arm/simple_idct_armv6.o \
VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o
+NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
+NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \
+ arm/sbrdsp_neon.o
+NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \
+ arm/synth_filter_neon.o
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
- arm/fft_fixed_neon.o \
-
-NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
- arm/mdct_fixed_neon.o \
-
-NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o \
-
+ arm/fft_fixed_neon.o
NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o
NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
- arm/h264idct_neon.o \
-
-NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o \
-
-NEON-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_neon.o \
-
-NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
-
-NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/sbrdsp_neon.o \
- arm/aacpsdsp_neon.o
-
-NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \
- arm/synth_filter_neon.o \
-
+ arm/h264idct_neon.o
+NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o
+NEON-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_neon.o
NEON-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_neon.o \
arm/hpeldsp_neon.o
-
+NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
+ arm/mdct_fixed_neon.o
NEON-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_neon.o
+NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o
NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o
NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \
- arm/rv40dsp_neon.o \
-
+ arm/rv40dsp_neon.o
NEON-OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_neon.o
-
NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o
-
-NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o \
-
-NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \
-
+NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o
+NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o
NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_neon.o \
arm/vp8dsp_neon.o
More information about the ffmpeg-cvslog
mailing list