Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
* commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits8a34f36593andee164727ddto fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
7
Makefile
7
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)/
|
||||
|
||||
Reference in New Issue
Block a user