diff options
| author | jamal <jamrial@gmail.com> | 2012-08-26 00:19:30 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 01:32:13 +0200 |
| commit | 95d1af118861e9fc09607de7fe879ee1c41c4328 (patch) | |
| tree | 76b6ffd7256870bd109962a457e064a2405bc3ea | |
| parent | 851bac4b06c59c51ad4b7d5c9f503d3aed87a10a (diff) | |
| download | ffmpeg-95d1af118861e9fc09607de7fe879ee1c41c4328.tar.gz | |
build: Fix compilation when configuring with a prog suffix
Fixes ticket #1676
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 |