summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorschodet2008-10-09 12:41:46 +0000
committerschodet2008-10-09 12:41:46 +0000
commit83c9ae8f4185c7b4052edef141ee16ac11443627 (patch)
tree11ab7c3941fc2607c2990dc21f6fcc8d295c4f76 /cesar
parent1bbcd9749b9be5c76404ffb3f60681dc0ee74621 (diff)
* common/make:
- added compile & link dependencies variables. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@3230 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/common/make/config.mk3
-rw-r--r--cesar/common/make/default.mk4
-rw-r--r--cesar/common/make/setup.mk8
3 files changed, 9 insertions, 6 deletions
diff --git a/cesar/common/make/config.mk b/cesar/common/make/config.mk
index 78f8ab5367..b33923f84b 100644
--- a/cesar/common/make/config.mk
+++ b/cesar/common/make/config.mk
@@ -14,8 +14,7 @@ CONFIG_FORCE := $(if $(call list-neq,$(CONFIG_LIST),$(PROJECT_CONFIG) $(MODULES_
HEADERS_CONFIG_STAMP := $(HEADERS_CONFIG)/headers.stamp
-HOST_COMPILE_DEPS += $(HEADERS_CONFIG_STAMP)
-TARGET_COMPILE_DEPS += $(HEADERS_CONFIG_STAMP)
+COMPILE_DEPS += $(HEADERS_CONFIG_STAMP)
$(DEFAULT_PROJECT_CONFIG): $(OBJ_DIR_STAMP)
touch $@
diff --git a/cesar/common/make/default.mk b/cesar/common/make/default.mk
index 0ac7fdfea5..3e67150469 100644
--- a/cesar/common/make/default.mk
+++ b/cesar/common/make/default.mk
@@ -5,6 +5,7 @@ DEFS := $(DEFS)
HOST_INCLUDES := $(HOST_INCLUDES:%=-I$(BASE)/%) $(INCLUDES)
HOST_DEFS := $(HOST_DEFS) $(DEFS)
+HOST_COMPILE_DEPS := $(HOST_COMPILE_DEPS) $(COMPILE_DEPS)
HOST_CPPFLAGS = $(EXTRA_HOST_CPPFLAGS) $(HOST_DEFS) $(HOST_INCLUDES)
HOST_CFLAGS := $(EXTRA_HOST_CFLAGS) -g $(call isdebug,,-O2) -finline -W -Wall -Wundef -Wno-unused-parameter
ifneq ($(HOST_COV)$(COV),)
@@ -12,11 +13,13 @@ ifneq ($(HOST_COV)$(COV),)
endif
HOST_ASFLAGS := $(HOST_CFLAGS)
HOST_CXXFLAGS := $(HOST_CFLAGS)
+HOST_LINK_DEPS := $(HOST_LINK_DEPS) $(LINK_DEPS)
HOST_LDFLAGS := $(EXTRA_HOST_LDFLAGS)
HOST_LDLIBS := $(EXTRA_HOST_LDLIBS)
TARGET_INCLUDES := $(TARGET_INCLUDES:%=-I$(BASE)/%) $(INCLUDES)
TARGET_DEFS := $(TARGET_DEFS) $(DEFS)
+TARGET_COMPILE_DEPS := $(TARGET_COMPILE_DEPS) $(COMPILE_DEPS)
TARGET_CPPFLAGS = $(EXTRA_TARGET_CPPFLAGS) $(TARGET_DEFS) $(TARGET_INCLUDES)
TARGET_CFLAGS := $(EXTRA_TARGET_CFLAGS) -g $(call isdebug,,-O2) -finline -W -Wall -Wundef -Wno-unused-parameter
ifneq ($(TARGET_COV)$(COV),)
@@ -24,6 +27,7 @@ ifneq ($(TARGET_COV)$(COV),)
endif
TARGET_ASFLAGS := $(TARGET_CFLAGS)
TARGET_CXXFLAGS := $(TARGET_CFLAGS)
+TARGET_LINK_DEPS := $(TARGET_LINK_DEPS) $(LINK_DEPS)
TARGET_LDFLAGS := $(EXTRA_TARGET_LDFLAGS)
TARGET_LDLIBS := $(EXTRA_TARGET_LDLIBS)
diff --git a/cesar/common/make/setup.mk b/cesar/common/make/setup.mk
index 5504b2a538..a29e2cc702 100644
--- a/cesar/common/make/setup.mk
+++ b/cesar/common/make/setup.mk
@@ -1,5 +1,9 @@
# Setup build parameters.
+OBJ_DIR_STAMP := $(OBJ_DIR)/dir.stamp
+OBJ_INC_DIR := $(OBJ_DIR)/inc
+OBJ_INC_DIR_STAMP := $(OBJ_INC_DIR)/dir.stamp
+
HOST_EXES := $(call prog2exe,$(HOST_PROGRAMS),host)
TARGET_ELFS := $(call prog2exe,$(TARGET_PROGRAMS),target)
TARGET_BINS := $(call prog2bin,$(TARGET_PROGRAMS))
@@ -69,7 +73,3 @@ ALL_SOURCES := $(sort $(HOST_SOURCES) $(TARGET_SOURCES))
vpath %.c $(BASE)
vpath %.cpp $(BASE)
vpath %.S $(BASE)
-
-OBJ_DIR_STAMP := $(OBJ_DIR)/dir.stamp
-OBJ_INC_DIR := $(OBJ_DIR)/inc
-OBJ_INC_DIR_STAMP := $(OBJ_INC_DIR)/dir.stamp