]> git.sesse.net Git - ffmpeg/blobdiff - Makefile
Replace the awkward '1>' with the more natural '>'.
[ffmpeg] / Makefile
index 3639e11b7829ded69b38cd323a76b357365e8ced..3d17a1c3e4447fbd90683e6beaed48feef49b786 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,13 @@
 #
 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 \
-       -I$(SRC_PATH)/libavdevice \
+       -I$(SRC_PATH)/libavdevice -I$(SRC_PATH)/libavfilter \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
 LDFLAGS+= -g
 
@@ -64,11 +66,16 @@ 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
 
+ifeq ($(CONFIG_AVFILTER),yes)
+LDFLAGS+=-L$(BUILD_ROOT)/libavfilter
+EXTRALIBS := -lavfilter$(BUILDSUF) $(EXTRALIBS)
+endif
+
 MAKE-yes = $(MAKE)
 MAKE-    = : $(MAKE)
 
@@ -79,8 +86,9 @@ 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
        $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
@@ -109,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
@@ -164,19 +173,18 @@ 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
-ifeq ($(BUILD_SHARED),yes)
-       -$(LDCONFIG)
-endif
+       $(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
 
@@ -197,6 +205,7 @@ uninstall-libs:
        $(MAKE) -C libavdevice uninstall-libs
        $(MAKE) -C libpostproc uninstall-libs
        $(MAKE) -C libswscale  uninstall-libs
+       $(MAKE) -C libavfilter uninstall-libs
 
 uninstall-headers:
        $(MAKE) -C libavutil   uninstall-headers
@@ -205,6 +214,7 @@ uninstall-headers:
        $(MAKE) -C libavdevice uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
        $(MAKE) -C libswscale  uninstall-headers
+       $(MAKE) -C libavfilter uninstall-headers
        -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
@@ -212,11 +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
@@ -234,6 +245,7 @@ clean:
        $(MAKE) -C libavdevice clean
        $(MAKE) -C libpostproc clean
        $(MAKE) -C libswscale  clean
+       $(MAKE) -C libavfilter clean
        rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
           output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
@@ -249,6 +261,7 @@ distclean: clean
        $(MAKE) -C libavdevice distclean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C libswscale  distclean
+       $(MAKE) -C libavfilter distclean
        rm -f .depend .vhookdep version.h config.* *.pc
 
 TAGS:
@@ -264,6 +277,132 @@ LIBAV_REFFILE    = $(SRC_PATH)/tests/libav.regression.ref
 ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref
 SEEK_REFFILE     = $(SRC_PATH)/tests/seek.regression.ref
 
+CODEC_TESTS = $(addprefix regtest-,             \
+        mpeg                                    \
+        mpeg2                                   \
+        mpeg2thread                             \
+        msmpeg4v2                               \
+        msmpeg4                                 \
+        wmv1                                    \
+        wmv2                                    \
+        h261                                    \
+        h263                                    \
+        h263p                                   \
+        mpeg4                                   \
+        huffyuv                                 \
+        rc                                      \
+        mpeg4adv                                \
+        mpeg4thread                             \
+        error                                   \
+        mpeg4nr                                 \
+        mpeg1b                                  \
+        mjpeg                                   \
+        ljpeg                                   \
+        jpegls                                  \
+        rv10                                    \
+        rv20                                    \
+        asv1                                    \
+        asv2                                    \
+        flv                                     \
+        ffv1                                    \
+        snow                                    \
+        snowll                                  \
+        dv                                      \
+        dv50                                    \
+        svq1                                    \
+        flashsv                                 \
+        mp2                                     \
+        ac3                                     \
+        g726                                    \
+        adpcm_ima_wav                           \
+        adpcm_ima_qt                            \
+        adpcm_ms                                \
+        adpcm_yam                               \
+        adpcm_swf                               \
+        flac                                    \
+        wma                                     \
+    )
+
+LAVF_TESTS = $(addprefix regtest-,              \
+        avi                                     \
+        asf                                     \
+        rm                                      \
+        mpg                                     \
+        ts                                      \
+        swf                                     \
+        ffm                                     \
+        flv_fmt                                 \
+        mov                                     \
+        dv_fmt                                  \
+        gxf                                     \
+        nut                                     \
+        mkv                                     \
+        pbmpipe                                 \
+        pgmpipe                                 \
+        ppmpipe                                 \
+        gif                                     \
+        yuv4mpeg                                \
+        pgm                                     \
+        ppm                                     \
+        bmp                                     \
+        tga                                     \
+        tiff                                    \
+        sgi                                     \
+        jpg                                     \
+        wav                                     \
+        alaw                                    \
+        mulaw                                   \
+        au                                      \
+        mmf                                     \
+        aiff                                    \
+        voc                                     \
+        ogg                                     \
+        pixfmt                                  \
+    )
+
+REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%)))
+
+CODEC_ROTOZOOM = $(call REGFILES,rotozoom.regression,$(CODEC_TESTS))
+CODEC_VSYNTH   = $(call REGFILES,vsynth.regression,$(CODEC_TESTS))
+
+LAVF_REGFILES = $(call REGFILES,lavf.regression,$(LAVF_TESTS))
+
+LAVF_REG     = tests/data/lavf.regression
+ROTOZOOM_REG = tests/data/rotozoom.regression
+VSYNTH_REG   = tests/data/vsynth.regression
+
+codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
+       diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
+       diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
+
+libavtest: $(LAVF_REG)
+       diff -u -w $(LIBAV_REFFILE) $(LAVF_REG)
+
+$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG):
+       cat $^ > $@
+
+$(LAVF_REG):     $(LAVF_REGFILES)
+$(ROTOZOOM_REG): $(CODEC_ROTOZOOM)
+$(VSYNTH_REG):   $(CODEC_VSYNTH)
+
+$(CODEC_VSYNTH) $(CODEC_ROTOZOOM): $(CODEC_TESTS)
+
+$(LAVF_REGFILES): $(LAVF_TESTS)
+
+$(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
+
+regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw
+
+$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(EXESUF)
+       $(SRC_PATH)/tests/regression.sh $@ vsynth   tests/vsynth1 a
+       $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2 a
+
+$(LAVF_TESTS):
+       $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1 b
+
+seektest: codectest libavtest tests/seek_test$(EXESUF)
+       $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
+
 test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
        @echo "Unfortunately ffserver is broken and therefore its regression"
@@ -271,21 +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
 
-codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw tests/tiny_psnr$(EXESUF)
-       $(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE)   tests/vsynth1
-       $(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
-
-libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
-       $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
-
-seektest: tests/seek_test$(EXESUF)
-       $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
-
-ifeq ($(CONFIG_SWSCALER),yes)
-test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
+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
@@ -311,7 +440,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c .libs
 .PHONY: all lib videohook documentation install* wininstaller uninstall*
 .PHONY: dep depend clean distclean TAGS
 .PHONY: codectest libavtest seektest test-server fulltest test
-.PHONY: mpeg4 mpeg ac3 snow snowll swscale-error
+.PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error
 
 -include .depend
 -include .vhookdep