typo fixes: tempBlured --> tempBlurred

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 92141e23c5595dd991772281a85002c1a69e8dab..f2b6142bbf32f01c3702addbf2370c59a6e04f99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@
 #
 include config.mak
 
+SRC_DIR = $(SRC_PATH_BARE)
+
 vpath %.c    $(SRC_PATH_BARE)
 vpath %.h    $(SRC_PATH_BARE)
 vpath %.texi $(SRC_PATH_BARE)
@@ -79,7 +81,7 @@ endif
 MAKE-yes = $(MAKE)
 MAKE-    = : $(MAKE)
 
-all: lib $(PROGS) $(ALL_TARGETS-yes)
+all: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
 
 lib:
        $(MAKE)                    -C libavutil   all
@@ -90,14 +92,11 @@ lib:
        $(MAKE-$(CONFIG_SWSCALE))  -C libswscale  all
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
 
-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
-
-ffserver$(EXESUF): ffserver.o cmdutils.o .libs
-       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS)
+ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS)
+ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
 
-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
+%_g$(EXESUF): %.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
 
 %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
@@ -117,11 +116,12 @@ output_example$(EXESUF): output_example.o .libs
 tools/%$(EXESUF): tools/%.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
+ffplay.o .depend: CFLAGS += $(SDL_CFLAGS)
 
 ffmpeg.o ffplay.o ffserver.o: version.h
 
-videohook: $(HOOKS)
+# vhooks compile fine without libav*, but need them nonetheless.
+videohook: .libs $(HOOKS)
 
 vhook/%$(SLIBSUF): vhook/%.o
        $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
@@ -155,10 +155,6 @@ install-progs: $(PROGS)
        install -d "$(BINDIR)"
        install -c -m 755 $(PROGS) "$(BINDIR)"
 
-# Create the Windows installer.
-wininstaller: all install
-       makensis ffinstall.nsi
-
 install-man:
        install -d "$(MANDIR)/man1"
        install -m 644 $(MANPAGES) "$(MANDIR)/man1"
@@ -226,11 +222,10 @@ depend dep: .depend .vhookdep
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+       $(DEPEND_CMD) > $@
 
-# gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS) version.h
-       $(CC) $(VHOOKCFLAGS) -MM $^ | sed 's,^\([a-z]\),vhook/\1,' > $@
+       $(VHOOK_DEPEND_CMD) > $@
 
 $(DEP_LIBS): lib
 
@@ -436,7 +431,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c .libs
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS)
 
 
-.PHONY: all lib videohook documentation install* wininstaller uninstall*
+.PHONY: all lib videohook documentation install* uninstall*
 .PHONY: dep depend clean distclean TAGS
 .PHONY: codectest libavtest seektest test-server fulltest test
 .PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error