[FFmpeg-cvslog] Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before
Michael Niedermayer
git at videolan.org
Tue Jun 7 04:45:28 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 7 04:43:03 2011 +0200| [40da61eff5acaaaec7d1247f7be4bb10fca30c1c] | committer: Michael Niedermayer
Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40da61eff5acaaaec7d1247f7be4bb10fca30c1c
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 2ac30ef..cb3e60e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
-$(PROGS): %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
+%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
alltools: $(TOOLS)
More information about the ffmpeg-cvslog
mailing list