Browse Source

Add rule for building API example programs.

Originally committed as revision 18161 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Diego Biurrun 17 years ago
parent
commit
6708cfc4d3
3 changed files with 9 additions and 4 deletions
  1. +3
    -1
      Makefile
  2. +4
    -2
      common.mak
  3. +2
    -1
      libavcodec/Makefile

+ 3
- 1
Makefile View File

@@ -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) :=


+ 4
- 2
common.mak View File

@@ -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)

+ 2
- 1
libavcodec/Makefile View File

@@ -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


Loading…
Cancel
Save