[FFmpeg-cvslog] build: prettyprinting cosmetics
Diego Biurrun
git at videolan.org
Mon Mar 26 21:10:17 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Feb 2 23:55:57 2012 +0100| [ad0e31f1346bacdb04341a07375ff597dea8b2e2] | committer: Diego Biurrun
build: prettyprinting cosmetics
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad0e31f1346bacdb04341a07375ff597dea8b2e2
---
Makefile | 7 ++--
libavcodec/alpha/Makefile | 12 +++---
libavcodec/bfin/Makefile | 14 ++++----
libavcodec/ppc/Makefile | 11 ++----
libavcodec/sh4/Makefile | 6 ++--
libavcodec/sparc/Makefile | 4 +-
libavcodec/x86/Makefile | 87 ++++++++++++++++++++------------------------
libavformat/Makefile | 4 +-
libswscale/Makefile | 10 ++++-
9 files changed, 76 insertions(+), 79 deletions(-)
diff --git a/Makefile b/Makefile
index ae9c5fa..2d1c36d 100644
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,10 @@ config.h: .config
@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
@-tput sgr0 2>/dev/null
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
- ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \
- HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS
+SUBDIR_VARS := CLEANFILES DIRS EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
+ ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
+ ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \
+ OBJS TESTOBJS
define RESET
$(1) :=
diff --git a/libavcodec/alpha/Makefile b/libavcodec/alpha/Makefile
index 2779a23..e55fe49 100644
--- a/libavcodec/alpha/Makefile
+++ b/libavcodec/alpha/Makefile
@@ -1,6 +1,6 @@
-OBJS += alpha/dsputil_alpha.o \
- alpha/dsputil_alpha_asm.o \
- alpha/motion_est_alpha.o \
- alpha/motion_est_mvi_asm.o \
- alpha/mpegvideo_alpha.o \
- alpha/simple_idct_alpha.o \
+OBJS += alpha/dsputil_alpha.o \
+ alpha/dsputil_alpha_asm.o \
+ alpha/motion_est_alpha.o \
+ alpha/motion_est_mvi_asm.o \
+ alpha/mpegvideo_alpha.o \
+ alpha/simple_idct_alpha.o \
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index e50e3cd..6b3e7cf 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -1,7 +1,7 @@
-OBJS += bfin/dsputil_bfin.o \
- bfin/fdct_bfin.o \
- bfin/idct_bfin.o \
- bfin/mpegvideo_bfin.o \
- bfin/pixels_bfin.o \
- bfin/vp3_bfin.o \
- bfin/vp3_idct_bfin.o \
+OBJS += bfin/dsputil_bfin.o \
+ bfin/fdct_bfin.o \
+ bfin/idct_bfin.o \
+ bfin/mpegvideo_bfin.o \
+ bfin/pixels_bfin.o \
+ bfin/vp3_bfin.o \
+ bfin/vp3_idct_bfin.o \
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index 8e37fc7..85790ec 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -1,19 +1,16 @@
OBJS += ppc/dsputil_ppc.o \
+FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o \
+ALTIVEC-OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \
+ $(FFT-OBJS-yes)
ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodec_altivec.o
ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o
ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o
ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_altivec.o
ALTIVEC-OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o
-ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodec_altivec.o
-
-FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o \
-
-ALTIVEC-OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \
- $(FFT-OBJS-yes)
-
OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \
ppc/fdct_altivec.o \
ppc/float_altivec.o \
diff --git a/libavcodec/sh4/Makefile b/libavcodec/sh4/Makefile
index 142cba4..aa17eab 100644
--- a/libavcodec/sh4/Makefile
+++ b/libavcodec/sh4/Makefile
@@ -1,3 +1,3 @@
-OBJS += sh4/dsputil_align.o \
- sh4/dsputil_sh4.o \
- sh4/idct_sh4.o \
+OBJS += sh4/dsputil_align.o \
+ sh4/dsputil_sh4.o \
+ sh4/idct_sh4.o \
diff --git a/libavcodec/sparc/Makefile b/libavcodec/sparc/Makefile
index 4b38746..d42bed0 100644
--- a/libavcodec/sparc/Makefile
+++ b/libavcodec/sparc/Makefile
@@ -1,2 +1,2 @@
-OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
- sparc/simple_idct_vis.o \
+OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
+ sparc/simple_idct_vis.o \
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 7944799..89d6bae 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -1,79 +1,72 @@
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
+OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
-YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o
+OBJS-$(HAVE_MMX) += x86/dsputil_mmx.o \
+ x86/fdct_mmx.o \
+ x86/fmtconvert_mmx.o \
+ x86/idct_mmx_xvid.o \
+ x86/idct_sse2_xvid.o \
+ x86/motion_est_mmx.o \
+ x86/mpegvideo_mmx.o \
+ x86/simple_idct_mmx.o \
+MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
+MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o
+MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
+MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o
+MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
+MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
+MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
+MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
+MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
+MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
+MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
+MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
+MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o
+MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o
+MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o
+MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
+ x86/rv40dsp_init.o
+MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
+MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
+MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
+MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o
+
+YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
+YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
+YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o
+YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_yasm.o
YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o
YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
$(YASM-OBJS-FFT-yes)
-
YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
x86/h264_chromamc_10bit.o
-
-MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
x86/h264_deblock_10bit.o \
x86/h264_idct.o \
x86/h264_idct_10bit.o \
x86/h264_weight.o \
- x86/h264_weight_10bit.o \
-
+ x86/h264_weight_10bit.o
YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
x86/h264_intrapred_10bit.o
-MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_10bit.o
-
-MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o
+YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
+YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
+YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o
-MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
- x86/rv40dsp_init.o
YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \
x86/rv40dsp.o
-
YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o
-
-MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o
-YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
-MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
-MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o
-MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
-YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
-MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
-YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_yasm.o
-MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
-MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
-YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
-MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o
-YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
-MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o
-MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
-YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
-MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
-MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o
YASM-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp.o
-MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \
x86/vp56dsp.o
-MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o
-MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o
+
MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \
x86/deinterlace.o \
x86/fmtconvert.o \
$(YASM-OBJS-yes)
-
-MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
-
-OBJS-$(HAVE_MMX) += x86/dsputil_mmx.o \
- x86/fdct_mmx.o \
- x86/fmtconvert_mmx.o \
- x86/idct_mmx_xvid.o \
- x86/idct_sse2_xvid.o \
- x86/motion_est_mmx.o \
- x86/mpegvideo_mmx.o \
- x86/simple_idct_mmx.o \
-
-OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9682ece..681ea1b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,6 +4,8 @@ FFLIBS = avcodec avutil
HEADERS = avformat.h avio.h version.h
OBJS = allformats.o \
+ avio.o \
+ aviobuf.o \
cutils.o \
id3v1.o \
id3v2.o \
@@ -329,8 +331,6 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o
OBJS-$(CONFIG_LIBRTMP) += librtmp.o
# protocols I/O
-OBJS+= avio.o aviobuf.o
-
OBJS-$(CONFIG_APPLEHTTP_PROTOCOL) += hlsproto.o
OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o
OBJS-$(CONFIG_CRYPTO_PROTOCOL) += crypto.o
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 36c2bef..0401930 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -3,8 +3,14 @@ FFLIBS = avutil
HEADERS = swscale.h
-OBJS = input.o options.o output.o rgb2rgb.o swscale.o \
- swscale_unscaled.o utils.o yuv2rgb.o
+OBJS = input.o \
+ options.o \
+ output.o \
+ rgb2rgb.o \
+ swscale.o \
+ swscale_unscaled.o \
+ utils.o \
+ yuv2rgb.o \
OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \
bfin/swscale_bfin.o \
More information about the ffmpeg-cvslog
mailing list