From dc80e2f7a529d6e4416b40b68699be16fed62d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 26 Nov 2013 12:10:03 +0200 Subject: [PATCH] Makefile: Fix building programs on systems with a nonempty executable suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b8532a2f5..89f04a04a2 100644 --- a/Makefile +++ b/Makefile @@ -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)