X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=69b4c9fb829badd70a8772d96a905bfc30b41115;hb=6003ec880b5654ece467293b0c9c92f328235b86;hp=c0af5c2c74e55067f46e8dc516d5b1ca749283a3;hpb=840ecc9e075a0268884141eb25e4f2dc3f35d9dc;p=ffmpeg diff --git a/Makefile b/Makefile index c0af5c2c74e..69b4c9fb829 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ vpath %.S $(SRC_PATH) vpath %.asm $(SRC_PATH) vpath %.v $(SRC_PATH) vpath %.texi $(SRC_PATH) +vpath %/fate_config.sh.template $(SRC_PATH) PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_AVCONV) += avconv @@ -38,7 +39,7 @@ FFLIBS-$(CONFIG_SWSCALE) += swscale FFLIBS := avutil -DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) +DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd SKIPHEADERS = cmdutils_common_opts.h @@ -77,6 +78,7 @@ define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile +include $(SRC_PATH)/library.mak endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))