diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-07 04:43:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-07 04:43:03 +0200 |
commit | 40da61eff5acaaaec7d1247f7be4bb10fca30c1c (patch) | |
tree | 1d886414206a1a88b4be3ce1eecc6a3230f58394 /Makefile | |
parent | 174df6affc4e2cfdc6c91c1be3c3e1a8a794cf78 (diff) | |
download | ffmpeg-40da61eff5acaaaec7d1247f7be4bb10fca30c1c.tar.gz |
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@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |