generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add dependencies to generating version.h in the object files that use it

Browse Source 
Previously the makefile didn't know that there was any dependency between
compiling welsDecoderExt.o and welsEncoderExt.o and the regeneration
of the version.h header. This meant that in parallel builds (make -jX),
make could try to regenerate version.h while compiling welsDecoderExt.o
and welsEncoderExt.o, which would lead to errors about version.h not
existing.

Also add some spacing around the makefile rules.

This fixes parallel make building in certain cases.
This commit is contained in:
Martin Storsjö 2014-07-24 00:24:12 +03:00
parent 300cceaabf
commit 8253049383
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -121,10 +121,14 @@ MODULE_INCLUDES += -I$(SRC_PATH)gmp-api
.PHONY: test gtest-bootstrap clean
all: General_ver libraries binaries
all: libraries binaries
General_ver:
$(QUIET)cd $(SRC_PATH) && sh ./codec/common/generate_version.sh
codec/decoder/plus/src/welsDecoderExt.$(OBJ): | General_ver
codec/encoder/plus/src/welsEncoderExt.$(OBJ): | General_ver
clean:
ifeq (android,$(OS))
clean: clean_Android