From 40da61eff5acaaaec7d1247f7be4bb10fca30c1c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 7 Jun 2011 04:43:03 +0200 Subject: 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 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2ac30ef5cd..cb3e60e7d8 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) -- cgit v1.2.3