---
Makefile | 3 ++-
libavfilter/Makefile | 3 ++-
libavformat/Makefile | 1 +
subdir.mak | 4 ++--
tests/Makefile | 3 ---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 2518d61..7ae6763 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,8 @@ config.h: .config
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT
YASM-OBJS \
- HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS
+ HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS \
+ FATEPROGS
define RESET
$(1) :=
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 1a6fd9b..9955c47 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -62,6 +62,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
vsink_nullsink.o
DIRS = x86
-TOOLS = graph2dot lavfi-showfiltfmts
+FATEPROGS = tools/lavfi-showfiltfmts
+TOOLS = graph2dot
include $(SRC_PATH)/subdir.mak
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ca337e0..706b760 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -334,6 +334,7 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
OBJS-$(CONFIG_JACK_INDEV) += timefilter.o
EXAMPLES = metadata output
+FATEPROGS = tests/seek_test
TESTPROGS = timefilter
TOOLS = pktdumper probetest
diff --git a/subdir.mak b/subdir.mak
index a88955b..69ad5ac 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -34,7 +34,7 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
-$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
+$(FATEPROGS) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
@@ -91,7 +91,7 @@ endef
$(eval $(RULES))
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
+$(EXAMPLES) $(FATEPROGS) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
examples: $(EXAMPLES)
testprogs: $(TESTPROGS)
diff --git a/tests/Makefile b/tests/Makefile
index f33beb1..77088c5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -28,9 +28,6 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
-tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
- $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
-
include $(SRC_PATH)/tests/fate.mak
include $(SRC_PATH)/tests/fate2.mak
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
