Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jul 2014 20:29:15 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jul 2014 20:29:15 +0000 (22:29 +0200)
* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
  build: Conditionally compile all avcodec test programs

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile

@@@ -851,18 -711,11 +851,16 @@@ SKIPHEADERS-$(CONFIG_VAAPI)            
  SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
  
- TESTPROGS = cabac                                                       \
-             fft                                                         \
-             fft-fixed                                                   \
-             fft-fixed32                                                 \
-             golomb                                                      \
-             imgconvert                                                  \
-             rangecoder                                                  \
-             snowenc                                                     \
 -TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed
++TESTPROGS = imgconvert                                                  \
 +
++TESTPROGS-$(CONFIG_CABAC)                 += cabac
++TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed fft-fixed32
  TESTPROGS-$(CONFIG_IDCTDSP)               += dct
  TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
 +TESTPROGS-$(HAVE_MMX)                     += motion
+ TESTPROGS-$(CONFIG_GOLOMB)                += golomb
+ TESTPROGS-$(CONFIG_RANGECODER)            += rangecoder
++TESTPROGS-$(CONFIG_SNOW_ENCODER)          += snowenc
  
  TESTOBJS = dctref.o