diff options
| author | Martin Storsjö <martin@martin.st> | 2013-11-26 12:10:03 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-11-26 23:31:09 +0200 |
| commit | dc80e2f7a529d6e4416b40b68699be16fed62d6c (patch) | |
| tree | c84e4f1916bd9893270158f095e74fe57a46b1b8 /Makefile | |
| parent | c6080d89009056530119ab794ad02e4d515c7754 (diff) | |
| download | ffmpeg-dc80e2f7a529d6e4416b40b68699be16fed62d6c.tar.gz | |
Makefile: Fix building programs on systems with a nonempty executable suffix
This fixes leftover issues from 14abeaa4 which caused make
rules for programs to not match up properly when the executable
suffix was nonempty.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -67,7 +67,7 @@ PROGS += $(AVPROGS) AVBASENAMES = avconv avplay avprobe avserver ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF)) -$(foreach prog,$(ALLAVPROGS),$(eval OBJS-$(prog) += cmdutils.o)) +$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o)) OBJS-avconv += avconv_opt.o avconv_filter.o OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o @@ -141,7 +141,7 @@ $(1)$(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:$(EXESUF)=)))) $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) |