diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-04 19:59:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-04 19:59:30 -0300 |
| commit | 6fdd35a3126f6ecbe4ebab12bdf8867e4f544958 (patch) | |
| tree | 7e0a89ba5a5e99377ec5461e9946ff1a0003a545 /Makefile | |
| parent | c0f17a905f3588bf61ba6d86a83c6835d431ed3d (diff) | |
| parent | 92db5083077a8b0f8e1050507671b456fd155125 (diff) | |
| download | ffmpeg-streaming-6fdd35a3126f6ecbe4ebab12bdf8867e4f544958.zip ffmpeg-streaming-6fdd35a3126f6ecbe4ebab12bdf8867e4f544958.tar.gz | |
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 commits 8a34f3659371680ca523aecfd9098c28f0f809eb and
ee164727dd64c199b87118917e674b17c25e0da3 to 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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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)/ |
