Merge commit '92db5083077a8b0f8e1050507671b456fd155125'

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8731d3b6baef9e767e5dfc08921e1adc2a7842b8..0122e1628f7e9b6017b27827f35a16537614cbc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,6 @@ tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
 
 CONFIGURABLE_COMPONENTS =                                           \
     $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
-    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/version.h))              \
     $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
     $(SRC_PATH)/libavformat/protocols.c                             \
 
@@ -109,6 +108,12 @@ $(1) :=
 $(1)-yes :=
 endef
 
+ifdef CONFIG_RAISE_MAJOR
+RAISE_MAJOR = 100
+else
+RAISE_MAJOR = 0
+endif
+
 define DOSUBDIR
 $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 SUBDIR := $(1)/