[1/5] build: order

Message ID 1455694646-4848-1-git-send-email-diego@biurrun.de
State New
Headers show

Commit Message

Diego Biurrun Feb. 17, 2016, 7:37 a.m.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Luca Barbato Feb. 17, 2016, 7:47 a.m. | #1
On 17/02/16 08:37, Diego Biurrun wrote:
> ---
>  Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 7b1e550..5800b57 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -82,10 +82,10 @@ ALLAVPROGS  = $(AVBASENAMES:%=%$(EXESUF))
>  $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
>  
>  OBJS-avconv                   += avconv_opt.o avconv_filter.o
> -OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
> -OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
> -OBJS-avconv-$(CONFIG_VDA)     += avconv_vda.o
>  OBJS-avconv-$(CONFIG_LIBMFX)  += avconv_qsv.o
> +OBJS-avconv-$(CONFIG_VDA)     += avconv_vda.o
> +OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
> +OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
>  
>  TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
>  HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
> 

Sure, why not?

lu

Patch

diff --git a/Makefile b/Makefile
index 7b1e550..5800b57 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,10 @@  ALLAVPROGS  = $(AVBASENAMES:%=%$(EXESUF))
 $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
 
 OBJS-avconv                   += avconv_opt.o avconv_filter.o
-OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
-OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
-OBJS-avconv-$(CONFIG_VDA)     += avconv_vda.o
 OBJS-avconv-$(CONFIG_LIBMFX)  += avconv_qsv.o
+OBJS-avconv-$(CONFIG_VDA)     += avconv_vda.o
+OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
+OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
 
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options