Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 00:52:55 +0000 (01:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:09:16 +0000 (02:09 +0100)
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
Makefile

See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
doc/Makefile

index 06fc47d..495d6c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ AVPROGS-$(CONFIG_FFSERVER) += ffserver
 
 AVPROGS    := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
 INSTPROGS   = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
-PROGS      += $(AVPROGS-yes)
+PROGS      += $(AVPROGS)
 
 AVBASENAMES  = ffmpeg ffplay ffprobe ffserver
 ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
@@ -100,9 +100,9 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
 -include $$(OBJS-$(1):.o=.d)
 endef
 
-$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P))))
+$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=))))
 
-$(PROGS:%=%$(PROGSSUF)$(EXESUF)): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
        $(CP) $< $@
        $(STRIP) $@
 
index fad5cfc..5856f3d 100644 (file)
@@ -41,7 +41,7 @@ ALL_DOC_EXAMPLES = muxing
 
 DOC_EXAMPLES     := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
 ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF))
-PROGS            += $(DOC_EXAMPLES-yes:%=doc/examples/%)
+PROGS            += $(DOC_EXAMPLES)
 
 all-$(CONFIG_DOC): doc