aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun2009-03-29 14:35:20 +0000
committerDiego Biurrun2009-03-29 14:35:20 +0000
commit43a0cb7ca290f71b55d99e0bfa5232a3f58dad24 (patch)
treea31ad07fe6801f91953032af98a6ee4224fc96ee
parent7c17abaf9de53a0ccb0a2f5cc158f9881e024acc (diff)
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
-rw-r--r--common.mak2
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavformat/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/common.mak b/common.mak
index 83f2dbb1ca..b42b33e8f0 100644
--- 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 c1926c7021..d26a5cfed8 100644
--- 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 eaec4a9351..6ade1bb1dd 100644
--- 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