aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorjamal <jamrial@gmail.com>2012-08-26 00:19:30 -0300
committerMichael Niedermayer <michaelni@gmx.at>2012-08-27 01:32:13 +0200
commit95d1af118861e9fc09607de7fe879ee1c41c4328 (patch)
tree76b6ffd7256870bd109962a457e064a2405bc3ea /Makefile
parent851bac4b06c59c51ad4b7d5c9f503d3aed87a10a (diff)
downloadffmpeg-95d1af118861e9fc09607de7fe879ee1c41c4328.tar.gz
build: Fix compilation when configuring with a prog suffix
Fixes ticket #1676 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files 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