Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: simplify linking tools with cmdutils.o
  tiny_psnr: fix range calculation for sample size of 32 bits

Conflicts:
	Makefile
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Makefile
index 0abb300,3202f5d..f1570cd
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -91,18 -124,18 +91,18 @@@ ende
  $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
  
  define DOPROG
- OBJS-$(1) += $(1).o
- $(1)$(PROGSSUF)_g$(EXESUF): $(OBJS-$(1))
+ OBJS-$(1) += $(1).o cmdutils.o
 -$(1)$(EXESUF): $$(OBJS-$(1))
++$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
  $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))
 -$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
 -$(1)$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
 +$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
 +$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
  -include $$(OBJS-$(1):.o=.d)
  endef
  
  $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
  
- %$(PROGSSUF)_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
-       $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS)
 -$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
++%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)
+       $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
  
  OBJDIRS += tools