summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--common.mak6
-rw-r--r--libavcodec/Makefile3
3 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 48f9620b04..c5e720363f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ FFLIBS := avdevice avformat avcodec avutil swscale
DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
+EXAMPLES = output_example$(EXESUF)
+
include common.mak
FF_LDFLAGS := $(FFLDFLAGS)
@@ -45,7 +47,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
cp -p $< $@
$(STRIP) $@
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS EXAMPLES
define RESET
$(1) :=
diff --git a/common.mak b/common.mak
index 9b1ebd7341..d0dc7bec8e 100644
--- a/common.mak
+++ b/common.mak
@@ -54,7 +54,7 @@ install: install-libs install-headers
uninstall: uninstall-libs uninstall-headers
-.PHONY: all depend dep *clean install* uninstall* tests
+.PHONY: all depend dep *clean install* uninstall* examples tests
endif
CFLAGS += $(CFLAGS-yes)
@@ -65,6 +65,7 @@ TESTS += $(TESTS-yes)
FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
+EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES))
OBJS := $(addprefix $(SUBDIR),$(OBJS))
TESTS := $(addprefix $(SUBDIR),$(TESTS))
@@ -97,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
clean::
- rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+ rm -f $(EXAMPLES) $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
distclean:: clean
@@ -107,6 +108,7 @@ endef
$(eval $(RULES))
+examples: $(EXAMPLES)
tests: $(TESTS)
-include $(DEPS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4843e0933a..196be013f4 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -525,11 +525,12 @@ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
sparc/simple_idct_vis.o \
+EXAMPLES = apiexample$(EXESUF)
+
TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
TESTS-$(ARCH_X86) += x86/cpuid-test$(EXESUF)
TESTS-$(HAVE_MMX) += motion-test$(EXESUF)
-CLEANFILES = apiexample$(EXESUF)
DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
include $(SUBDIR)../subdir.mak