ref: 825304938353b2e8737818e1d90a3fa7291db7a1
parent: 300cceaabf0c423a3f464c963ac1b7abdae6e6b3
author: Martin Storsjö <martin@martin.st>
date: Wed Jul 23 20:24:12 EDT 2014
Add dependencies to generating version.h in the object files that use it 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.
--- a/Makefile
+++ b/Makefile
@@ -121,9 +121,13 @@
.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))