summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorschodet2008-02-14 16:13:58 +0000
committerschodet2008-02-14 16:13:58 +0000
commit64b6d0bbd2f97a4fb95b948ba91e0021e7266eb7 (patch)
tree32287c16c2203c89240ecc20a756be7d596c312d /common
parent49c0357e0171c9fbbb9c1133c454fbc24b39b4dd (diff)
* common/make:
- add variants support. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1414 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'common')
-rw-r--r--common/make/config.mk2
-rw-r--r--common/make/ecos.mk2
-rw-r--r--common/make/top.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/common/make/config.mk b/common/make/config.mk
index 3f5012fca1..ae18a21b80 100644
--- a/common/make/config.mk
+++ b/common/make/config.mk
@@ -1,6 +1,6 @@
# Build time configuration.
-USER_PROJECT_CONFIG := $(wildcard Config)
+USER_PROJECT_CONFIG ?= $(wildcard $(if $(VARIANT),$(VARIANT)-)Config)
DEFAULT_PROJECT_CONFIG := $(OBJ_DIR)/Config.empty
PROJECT_CONFIG := $(if $(USER_PROJECT_CONFIG),$(USER_PROJECT_CONFIG),$(DEFAULT_PROJECT_CONFIG))
HEADERS_CONFIG := $(OBJ_INC_DIR)/config
diff --git a/common/make/ecos.mk b/common/make/ecos.mk
index 42d8af5dbe..5c9d70735c 100644
--- a/common/make/ecos.mk
+++ b/common/make/ecos.mk
@@ -7,7 +7,7 @@ ECOS_BUILD_DIR := $(ECOS_DIR)/build
ECOS_TREE_STAMP := $(ECOS_DIR)/tree.stamp
ECOS_HEADERS_STAMP := $(ECOS_DIR)/headers.stamp
ECOS_DEFS := $(ECOS_INSTALL_DIR)/include/pkgconf/ecos.mak
-ECOS_CONFIG_COMPACT := ecos.ecc.sh
+ECOS_CONFIG_COMPACT ?= $(if $(VARIANT),$(VARIANT)-)ecos.ecc.sh
ECOS_CONFIG := $(ECOS_DIR)/ecos.ecc
ECOS_CONFIG_COV := $(ECOS_CONFIG:%.ecc=%-cov.ecc)
ECOS_CONFIG_FOR_TREE := $(ECOS_CONFIG)
diff --git a/common/make/top.mk b/common/make/top.mk
index 4903aa7338..21c3260008 100644
--- a/common/make/top.mk
+++ b/common/make/top.mk
@@ -2,7 +2,7 @@
MAKE_DIR := $(BASE)/common/make
TOOLS_DIR := $(BASE)/common/tools
-OBJ_DIR := obj
+OBJ_DIR ?= obj$(if $(VARIANT),/$(VARIANT))
MERGED_CONFIG := $(OBJ_DIR)/Config.merged
.PHONY: all