From 95d1af118861e9fc09607de7fe879ee1c41c4328 Mon Sep 17 00:00:00 2001 From: jamal Date: Sun, 26 Aug 2012 00:19:30 -0300 Subject: [PATCH] build: Fix compilation when configuring with a prog suffix Fixes ticket #1676 Signed-off-by: Michael Niedermayer --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e722561520..e77dbe6f2b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFSERVER) += ffserver -PROGS := $(PROGS-yes:%=%$(EXESUF)) +PROGS := $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF)) INSTPROGS = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF)) OBJS = cmdutils.o OBJS-ffmpeg = ffmpeg_opt.o ffmpeg_filter.o @@ -52,9 +52,9 @@ FF_DEP_LIBS := $(DEP_LIBS) all: $(PROGS) -$(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF) - $(CP) $< $@$(PROGSSUF) - $(STRIP) $@$(PROGSSUF) +$(PROGS): %$(EXESUF): %_g$(EXESUF) + $(CP) $< $@ + $(STRIP) $@ $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) -o $@ $< $(ELIBS) @@ -92,10 +92,10 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) define DOPROG OBJS-$(1) += $(1).o -$(1)_g$(EXESUF): $(OBJS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): $(OBJS-$(1)) $$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) -$(1)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) -$(1)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef