From ae75174784f5c4172b28dafd7a3e91b1037a4dc4 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 8 Apr 2008 17:06:25 +0000
Subject: Merge simplifications from FFmpeg r12764.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 common.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common.mak')

diff --git a/common.mak b/common.mak
index c405430308..62dddcd5cf 100644
--- a/common.mak
+++ b/common.mak
@@ -4,7 +4,7 @@
 
 all: # make "all" default target
 
-ifeq ($(SUBDIR),)
+ifndef SUBDIR
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)
@@ -36,6 +36,7 @@ OBJS     += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
 CPP_OBJS += $(CPP_OBJS-yes)
 FFLIBS   := $(FFLIBS-yes) $(FFLIBS)
+TESTS    += $(TESTS-yes)
 
 FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
 FFLDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
-- 
cgit v1.2.3