[FFmpeg-cvslog] r18161 - in trunk: Makefile common.mak libavcodec/Makefile

[diego]

Author: diego
Date: Sun Mar 22 23:33:41 2009
New Revision: 18161

Log:
Add rule for building API example programs.

Modified:
   trunk/Makefile
   trunk/common.mak
   trunk/libavcodec/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Mar 22 23:13:10 2009	(r18160)
+++ trunk/Makefile	Sun Mar 22 23:33:41 2009	(r18161)
@@ -25,6 +25,8 @@ FFLIBS := avdevice avformat avcodec avut
 
 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) :=

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Mar 22 23:13:10 2009	(r18160)
+++ trunk/common.mak	Sun Mar 22 23:33:41 2009	(r18161)
@@ -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)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Mar 22 23:13:10 2009	(r18160)
+++ trunk/libavcodec/Makefile	Sun Mar 22 23:33:41 2009	(r18161)
@@ -525,11 +525,12 @@ OBJS-$(HAVE_VIS)                       +
                                           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