[FFmpeg-cvslog] Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before

[avcoder]

Thanks for your quickly fix, but  Make  still removes  ffmpeg.o
ffplay.o ffprobe.o immediately after generated
ffmpeg.exe/ffplay.exe/ffprobe.exe ...

On Tue, Jun 7, 2011 at 10:45 AM, Michael Niedermayer <git at videolan.org> wrote:
> 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)
>
> _______________________________________________
> ffmpeg-cvslog mailing list
> ffmpeg-cvslog at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
>



-- 
-----------------------------------------------------------------------------------------
My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2