mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
Makefile: Fix building programs on systems with a nonempty executable suffix
Conflicts:
Makefile
See: f1db007e00
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
875f9aea3e
6
Makefile
6
Makefile
|
@ -17,7 +17,7 @@ AVPROGS-$(CONFIG_FFSERVER) += ffserver
|
||||||
|
|
||||||
AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
|
AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
|
||||||
INSTPROGS = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
|
INSTPROGS = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
|
||||||
PROGS += $(AVPROGS-yes)
|
PROGS += $(AVPROGS)
|
||||||
|
|
||||||
AVBASENAMES = ffmpeg ffplay ffprobe ffserver
|
AVBASENAMES = ffmpeg ffplay ffprobe ffserver
|
||||||
ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
|
ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
|
||||||
|
@ -100,9 +100,9 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
|
||||||
-include $$(OBJS-$(1):.o=.d)
|
-include $$(OBJS-$(1):.o=.d)
|
||||||
endef
|
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) $< $@
|
$(CP) $< $@
|
||||||
$(STRIP) $@
|
$(STRIP) $@
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ ALL_DOC_EXAMPLES = muxing
|
||||||
|
|
||||||
DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
|
DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
|
||||||
ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=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
|
all-$(CONFIG_DOC): doc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue