From d4f667575aeffc5f3e10a7c1593a221a7b55cef3 Mon Sep 17 00:00:00 2001
From: John-Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 16 Nov 2014 10:30:21 +0000
Subject: Migrate to target triplets

---
 makefiles/Makefile.top | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'makefiles/Makefile.top')

diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 6329c47..89a040d 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -2,7 +2,7 @@
 #
 # Expected inputs:
 #
-# BUILD			Type of build to perform:
+# VARIANT		Type of build to perform:
 # 				release		-	Release build
 # 				debug		-	Debug build
 # COMPONENT		Name of the component (sans leading "lib" iff a library)
@@ -12,12 +12,12 @@
 # 				lib-static	-	Static library
 # 				lib-shared	-	Shared library
 # 				riscos-module	-	RISC OS module
-# TARGET		Target platform identifier
+# BUILD			Target platform identifier
 #
 # Optional inputs:
 #
 # BUILDDIR		Directory to build into (defaults to 
-# 			build-$(HOST)-$(TARGET)-$(BUILD)-$(COMPONENT_TYPE))
+# 			build-$(HOST)-$(BUILD)-$(VARIANT)-$(COMPONENT_TYPE))
 # CC_CAN_BUILD_AND_DEP	Flag whether $(CC) is capable of calculating dependency
 # 			information at the same time as compiling sources.
 # 			Set to "yes" if it can.
@@ -80,15 +80,15 @@ ifeq ($(COMPONENT_TYPE),)
 endif
 
 # Target platform must be defined by the client
-ifeq ($(TARGET),)
-  $(error TARGET not defined)
-endif
-
-# Build type, too
 ifeq ($(BUILD),)
   $(error BUILD not defined)
 endif
 
+# Build variant, too
+ifeq ($(VARIANT),)
+  $(error VARIANT not defined)
+endif
+
 ##############################################################################
 # Makefile variables
 ##############################################################################
@@ -109,7 +109,7 @@ patch-version := $(word 3,$(subst ., ,$(COMPONENT_VERSION)))
 ##############################################################################
 
 # Build directory
-BUILDDIR ?= build-$(HOST)-$(TARGET)-$(BUILD)-$(COMPONENT_TYPE)
+BUILDDIR ?= build-$(HOST)-$(BUILD)-$(VARIANT)-$(COMPONENT_TYPE)
 
 # Build tree subdirs
 COVERAGEDIR := $(BUILDDIR)/coverage
-- 
cgit v1.2.3