summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mak1
-rw-r--r--libavcodec/Makefile4
2 files changed, 2 insertions, 3 deletions
diff --git a/common.mak b/common.mak
index c405430308..66297ef5a1 100644
--- a/common.mak
+++ b/common.mak
@@ -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)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 124fc8d025..3652464c7e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -465,9 +465,7 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
bfin/vp3_idct_bfin.o \
TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
-ifeq ($(ARCH_X86),yes)
-TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)
-endif
+TESTS-$(ARCH_X86) += cpuid-test$(EXESUF) motion-test$(EXESUF)
CLEANFILES = \
alpha/*.o alpha/*~ \