diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 01:52:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:09:16 +0100 |
| commit | 875f9aea3ea0614061e03363cf832f9047a683c9 (patch) | |
| tree | 9b00c7245418c35d6a9e8a3ffb5013ea540619ad | |
| parent | 6d9dad6a7cb5d544d540abf941fedbd34c14d2bd (diff) | |
| parent | dc80e2f7a529d6e4416b40b68699be16fed62d6c (diff) | |
| download | ffmpeg-875f9aea3ea0614061e03363cf832f9047a683c9.tar.gz | |
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
Makefile: Fix building programs on systems with a nonempty executable suffix
Conflicts:
Makefile
See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | doc/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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) $@ diff --git a/doc/Makefile b/doc/Makefile index fad5cfc5f1..5856f3de01 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -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 |