Update autobuild scripts

Update autobuild scripts with reworked version that fixes building
outside of the source tree.  There are only small changes compared
to the WIP version that was committed to fix SPEC-3392.

Bug-AGL: SPEC-2049, SPEC-3300

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Iac529e39545861b90b963c7ec618fa5b88516834

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index 8ec476a..16181b8 100755 (executable)
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -25,9 +25,9 @@ ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 # type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
 # to yield the desired output hierarchy.
 BUILD_DIR = $(ROOT_DIR)/build
-BUILD_DIR_DEBUG := $(abspath $(BUILD_DIR)/../build-debug)
-BUILD_DIR_TEST := $(abspath $(BUILD_DIR)/../build-test)
-BUILD_DIR_COVERAGE := $(abspath $(BUILD_DIR)/../build-coverage)
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
+BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
+BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
 
 # Output directory variable for use in pattern rules.
 # This is intended for internal use only, hence the explicit override
@@ -44,7 +44,7 @@ BUILD_TYPE = RELEASE
 .PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
 .PHONY: configure configure-release configure-debug configure-test configure-coverage
 .PHONY: build build-release build-debug build-test build-coverage build-all
-.PHONY: package package-debug package-test package-coverage package-all
+.PHONY: package package-release package-debug package-test package-coverage package-all
 
 help:
        @echo "List of targets available:"

diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index 8ec476a..16181b8 100755 (executable)
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -25,9 +25,9 @@ ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 # type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
 # to yield the desired output hierarchy.
 BUILD_DIR = $(ROOT_DIR)/build
-BUILD_DIR_DEBUG := $(abspath $(BUILD_DIR)/../build-debug)
-BUILD_DIR_TEST := $(abspath $(BUILD_DIR)/../build-test)
-BUILD_DIR_COVERAGE := $(abspath $(BUILD_DIR)/../build-coverage)
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
+BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
+BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
 
 # Output directory variable for use in pattern rules.
 # This is intended for internal use only, hence the explicit override
@@ -44,7 +44,7 @@ BUILD_TYPE = RELEASE
 .PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
 .PHONY: configure configure-release configure-debug configure-test configure-coverage
 .PHONY: build build-release build-debug build-test build-coverage build-all
-.PHONY: package package-debug package-test package-coverage package-all
+.PHONY: package package-release package-debug package-test package-coverage package-all
 
 help:
        @echo "List of targets available:"