Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2010/03/09 03:43:44... | ... |
@@ -56,7 +56,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) |
56 | 56 |
|
57 | 57 |
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ |
58 | 58 |
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \ |
59 |
- HOSTPROGS BUILT_HEADERS |
|
59 |
+ HOSTPROGS BUILT_HEADERS TESTOBJS |
|
60 | 60 |
|
61 | 61 |
define RESET |
62 | 62 |
$(1) := |
... | ... |
@@ -84,6 +84,7 @@ FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS) |
84 | 84 |
|
85 | 85 |
EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES))) |
86 | 86 |
OBJS := $(addprefix $(SUBDIR),$(OBJS)) |
87 |
+TESTOBJS := $(addprefix $(SUBDIR),$(TESTOBJS)) |
|
87 | 88 |
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS))) |
88 | 89 |
HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS))) |
89 | 90 |
HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS))) |
... | ... |
@@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak |
5 | 5 |
LIBVERSION := $(lib$(NAME)_VERSION) |
6 | 6 |
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) |
7 | 7 |
|
8 |
-$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o: CPPFLAGS += -DHAVE_AV_CONFIG_H |
|
8 |
+$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H |
|
9 | 9 |
|
10 | 10 |
ifdef CONFIG_STATIC |
11 | 11 |
all: $(SUBDIR)$(LIBNAME) |