From 825304938353b2e8737818e1d90a3fa7291db7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 24 Jul 2014 00:24:12 +0300 Subject: [PATCH] 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. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 369dd0b1..06a1651c 100644 --- a/Makefile +++ b/Makefile @@ -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