# HG changeset patch
# User diego
# Date 1207674385 0
# Node ID 955f4b8ac094e8f6a903d113745ac6c6c760aa2c
# Parent  7abf7a9345d9fe1fbe3cf1e8b965a5263d657e41
Merge simplifications from FFmpeg r12764.

diff -r 7abf7a9345d9 -r 955f4b8ac094 common.mak
--- a/common.mak	Mon Apr 07 23:49:39 2008 +0000
+++ b/common.mak	Tue Apr 08 17:06:25 2008 +0000
@@ -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 @@
 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)
diff -r 7abf7a9345d9 -r 955f4b8ac094 subdir.mak
--- a/subdir.mak	Mon Apr 07 23:49:39 2008 +0000
+++ b/subdir.mak	Tue Apr 08 17:06:25 2008 +0000
@@ -19,7 +19,7 @@
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 define RULES
-ifeq ($(BUILD_SHARED),yes)
+ifdef BUILD_SHARED
 all: $(SUBDIR)$(SLIBNAME)
 
 install-libs: install-lib$(NAME)-shared
@@ -32,7 +32,7 @@
 	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
-ifneq ($(SUBDIR),)
+ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
     $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
 endif