* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

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