do not set error if an unknown parameter is in config file, just skip

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index bd34a4cf73ecd08abb110628216244d4230c2b71..5e42841d9b9f7b33f9cde263971424eccad4c90a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ FFLIBS-$(CONFIG_SWSCALE)  += swscale
 
 FFLIBS := avdevice avformat avcodec avutil
 
+DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
+
 include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
@@ -35,7 +37,7 @@ ALL_TARGETS-$(BUILD_DOC)    += documentation
 
 INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
 ifneq ($(PROGS),)
-INSTALL_TARGETS-yes             += install-progs
+INSTALL_TARGETS-yes             += install-progs install-data
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
 endif
 INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
@@ -75,6 +77,8 @@ tools/%$(EXESUF): tools/%.c
 
 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
+cmdutils.o cmdutils.d: version.h
+
 alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher))
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
@@ -129,6 +133,10 @@ install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
        install -d "$(BINDIR)"
        install -c -m 755 $(PROGS) "$(BINDIR)"
 
+install-data: $(DATA_FILES)
+       install -d "$(DATADIR)"
+       install -m 644 $(DATA_FILES) "$(DATADIR)"
+
 install-man: $(MANPAGES)
        install -d "$(MANDIR)/man1"
        install -m 644 $(MANPAGES) "$(MANDIR)/man1"
@@ -137,11 +145,14 @@ install-vhook: videohook
        install -d "$(SHLIBDIR)/vhook"
        install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
 
-uninstall: uninstall-progs uninstall-man uninstall-vhook
+uninstall: uninstall-progs uninstall-data uninstall-man uninstall-vhook
 
 uninstall-progs:
        rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
 
+uninstall-data:
+       rm -rf "$(DATADIR)"
+
 uninstall-man:
        rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
@@ -149,10 +160,12 @@ uninstall-vhook:
        rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
        -rmdir "$(SHLIBDIR)/vhook/"
 
-clean::
+testclean:
+       rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
+
+clean:: testclean
        rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
-       rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
        rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr))
        rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher))
        rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
@@ -268,14 +281,23 @@ ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
 ifneq ($(CONFIG_SWSCALE),yes)
-servertest codectest $(CODEC_TESTS) libavtest: swscale_error
-swscale_error:
+servertest codectest $(CODEC_TESTS) libavtest: swscale-error
+swscale-error:
        @echo
        @echo "This regression test requires --enable-swscale."
        @echo
        @exit 1
 endif
 
+ifneq ($(CONFIG_ZLIB),yes)
+regtest-flashsv codectest: zlib-error
+endif
+zlib-error:
+       @echo
+       @echo "This regression test requires zlib."
+       @echo
+       @exit 1
+
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
        diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
        diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
@@ -299,14 +321,14 @@ $(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
+       $(SRC_PATH)/tests/regression.sh $@ vsynth   tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 $(LAVF_TESTS):
-       $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1 b
+       $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 seektest: codectest libavtest tests/seek_test$(EXESUF)
-       $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
+       $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
@@ -333,6 +355,6 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
-.PHONY: lib videohook documentation *test regtest-* swscale-error alltools check
+.PHONY: lib videohook documentation *test regtest-* swscale-error zlib-error alltools check
 
 -include $(VHOOK_DEPS)