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

[diego]

Author: diego
Date: Sun Mar 29 16:35:20 2009
New Revision: 18217

Log:
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.

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

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Mar 29 16:28:56 2009	(r18216)
+++ trunk/common.mak	Sun Mar 29 16:35:20 2009	(r18217)
@@ -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)))
 

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Mar 29 16:28:56 2009	(r18216)
+++ trunk/libavcodec/Makefile	Sun Mar 29 16:35:20 2009	(r18217)
@@ -531,7 +531,7 @@ OBJS-$(HAVE_VIS)                       +
                                           sparc/simple_idct_vis.o       \
 
 
-EXAMPLES = api-example$(EXESUF)
+EXAMPLES = api
 
 TESTPROGS = cabac dct eval fft h264 rangecoder snow
 TESTPROGS-$(ARCH_X86) += x86/cpuid

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Sun Mar 29 16:28:56 2009	(r18216)
+++ trunk/libavformat/Makefile	Sun Mar 29 16:35:20 2009	(r18217)
@@ -243,7 +243,7 @@ OBJS-$(CONFIG_RTP_PROTOCOL)             
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
-EXAMPLES  = output-example
+EXAMPLES  = output
 TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak