Generalize example target rule in common.mak so that it sets a -example$(EXESUF)

suffix for all example files instead of doing this in individual Makefiles.

Originally committed as revision 18217 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index 83f2dbb..b42b33e 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -65,7 +65,7 @@ TESTPROGS += $(TESTPROGS-yes)
 FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
 FFLDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
 
-EXAMPLES  := $(addprefix $(SUBDIR),$(EXAMPLES))
+EXAMPLES  := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
 OBJS      := $(addprefix $(SUBDIR),$(OBJS))
 TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
 

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c1926c7..d26a5cf 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -531,7 +531,7 @@ OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
                                           sparc/simple_idct_vis.o       \
 
 
-EXAMPLES = api-example$(EXESUF)
+EXAMPLES = api
 
 TESTPROGS = cabac dct eval fft h264 rangecoder snow
 TESTPROGS-$(ARCH_X86) += x86/cpuid

diff --git a/libavformat/Makefile b/libavformat/Makefile
index eaec4a9..6ade1bb 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -243,7 +243,7 @@ OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
-EXAMPLES  = output-example
+EXAMPLES  = output
 TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak