Replace the awkward '1>' with the more natural '>'.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8191165ac8087884da5004b632bd144761caa7b1..3d17a1c3e4447fbd90683e6beaed48feef49b786 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@
 #
 include config.mak
 
-VPATH=$(SRC_PATH_BARE)
+vpath %.c    $(SRC_PATH_BARE)
+vpath %.h    $(SRC_PATH_BARE)
+vpath %.texi $(SRC_PATH_BARE)
 
 CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
@@ -64,7 +66,7 @@ SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
 LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
-ifeq ($(CONFIG_SWSCALER),yes)
+ifeq ($(CONFIG_SWSCALE),yes)
 LDFLAGS+=-L$(BUILD_ROOT)/libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
@@ -84,8 +86,8 @@ lib:
        $(MAKE)                    -C libavcodec  all
        $(MAKE)                    -C libavformat all
        $(MAKE)                    -C libavdevice all
-       $(MAKE-$(CONFIG_PP))       -C libpostproc all
-       $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  all
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all
+       $(MAKE-$(CONFIG_SWSCALE))  -C libswscale  all
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
@@ -115,10 +117,11 @@ 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
 
+# vhooks compile fine without libav*, but need them nonetheless.
 videohook: .libs $(HOOKS)
 
 vhook/%$(SLIBSUF): vhook/%.o
@@ -170,16 +173,17 @@ install-libs:
        $(MAKE)                    -C libavcodec  install-libs
        $(MAKE)                    -C libavformat install-libs
        $(MAKE)                    -C libavdevice install-libs
-       $(MAKE-$(CONFIG_PP))       -C libpostproc install-libs
-       $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  install-libs
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-libs
+       $(MAKE-$(CONFIG_SWSCALE))  -C libswscale  install-libs
+       $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs
 
 install-headers:
-       $(MAKE)              -C libavutil   install-headers
-       $(MAKE)              -C libavcodec  install-headers
-       $(MAKE)              -C libavformat install-headers
-       $(MAKE)              -C libavdevice install-headers
-       $(MAKE-$(CONFIG_PP)) -C libpostproc install-headers
-       $(MAKE)              -C libswscale  install-headers
+       $(MAKE)                    -C libavutil   install-headers
+       $(MAKE)                    -C libavcodec  install-headers
+       $(MAKE)                    -C libavformat install-headers
+       $(MAKE)                    -C libavdevice install-headers
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-headers
+       $(MAKE)                    -C libswscale  install-headers
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-headers
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
@@ -218,12 +222,12 @@ depend dep: .depend .vhookdep
        $(MAKE)                    -C libavcodec  depend
        $(MAKE)                    -C libavformat depend
        $(MAKE)                    -C libavdevice depend
-       $(MAKE-$(CONFIG_PP))       -C libpostproc depend
-       $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  depend
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend
+       $(MAKE-$(CONFIG_SWSCALE))  -C libswscale  depend
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+       $(CC) -MM $(CFLAGS) $(filter-out %.h,$^) > .depend
 
 # gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS) version.h
@@ -289,7 +293,6 @@ CODEC_TESTS = $(addprefix regtest-,             \
         rc                                      \
         mpeg4adv                                \
         mpeg4thread                             \
-        mp4psp                                  \
         error                                   \
         mpeg4nr                                 \
         mpeg1b                                  \
@@ -312,6 +315,7 @@ CODEC_TESTS = $(addprefix regtest-,             \
         ac3                                     \
         g726                                    \
         adpcm_ima_wav                           \
+        adpcm_ima_qt                            \
         adpcm_ms                                \
         adpcm_yam                               \
         adpcm_swf                               \
@@ -406,11 +410,11 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
        $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
-ifeq ($(CONFIG_SWSCALER),yes)
+ifeq ($(CONFIG_SWSCALE),yes)
 test-server codectest $(CODEC_TESTS) libavtest: swscale_error
 swscale_error:
        @echo
-       @echo "This regression test is incompatible with --enable-swscaler."
+       @echo "This regression test is incompatible with --enable-swscale."
        @echo
        @exit 1
 endif