config.target is included already in base.

This is necessary if there USE_LEAF_MAKEFILES is set there.

darcs-hash:20080128101915-f2ef6-708f41a37bd14ca62ec8844ee99a75499fd870a7.gz

diff --git a/snippets/base b/snippets/base
index 488170652cf9f732f5afaece99cad48e8f431948..4239e7ff441888ca924257232e1e95c0666ee529 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -66,6 +66,8 @@ $(warning Please, run "make default-config" first)
 endif
 endif
 
+-include $(MAKERULES_DIR)/config.target
+
 ifneq ($(wildcard $(CONFIG_FILE)),)
 include $(CONFIG_FILE)
 CONFIG_FILE_OK = y

diff --git a/snippets/linux b/snippets/linux
index 9458b56950be62fa5e5d1975972cfb8b2667c184..3751c154a63e3dda541e5fde9bf5724441d9f885 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -35,8 +35,6 @@
 
 -include $(MAKERULES_DIR)/OCERA_TOP_DIR
 
--include $(MAKERULES_DIR)/config.target
-
 BUILD_DIR_NAME = _build
 COMPILED_DIR_NAME = _compiled
 ifndef GROUP_DIR_NAME

diff --git a/snippets/rtems b/snippets/rtems
index e84cc25a0336bd0217867642cec95f0d3265884a..18e30ee42f0486a43f216c3d8b60af33f956aa19 100644 (file)
--- a/snippets/rtems
+++ b/snippets/rtems
@@ -13,9 +13,6 @@
 # INCLUDES         .. additional include directories and defines for user-space
 # tar_EMBEDFILES   .. list of tars with embedded files
 
-# Include RTEMS target configuration defining RTEMS_MAKEFILE_PATH
--include $(MAKERULES_DIR)/config.target
-
 ifdef OMK_TESTSROOT
 ifeq ($(RTEMS_MAKEFILE_PATH),)
 $(error $(shell $(call canttest,RTEMS_MAKEFILE_PATH not defined)))

diff --git a/snippets/sdcc b/snippets/sdcc
index 1d5baaedf7238fe969850518a2046617835ef4a2..76b4286d0a352b7924d2dea6acc698c1fceddbdd 100644 (file)
--- a/snippets/sdcc
+++ b/snippets/sdcc
@@ -34,9 +34,6 @@ TARGETLOADER = ul_sendhex
 ARFLAGS = -a
 A51TOASX = $(MAKERULES_DIR)/a51toasx.sh
 
-# Include possible target configuration
--include $(MAKERULES_DIR)/config.target
-
 BUILD_DIR_NAME = _build
 COMPILED_DIR_NAME = _compiled
 GROUP_DIR_NAME =

diff --git a/snippets/sysless b/snippets/sysless
index 5b01a3151a882ab450d862cacf182fa6eebd4f4a..0e763a4215a14495e537da4855133eb108382a63 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -21,8 +21,6 @@
 #                    specified, then the value of DEFAULT_LD_SCRIPT_VARIANT from config.target is used.
 # PREFIX_DIR       .. Prefix to  directories in _compiled and _build. Used in config.omk.
 
--include $(MAKERULES_DIR)/config.target
-
 BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR))
 COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR))
 

diff --git a/snippets/vxworks b/snippets/vxworks
index 3eb411360395a28c8e124f1da2336350ab812000..443e05b7b490890d0587e793445b4bc5d10e16cb 100644 (file)
--- a/snippets/vxworks
+++ b/snippets/vxworks
@@ -12,9 +12,6 @@
 # xxx_SOURCES      .. list of specific target sources
 # INCLUDES         .. additional include directories and defines for user-space
 
-# Include VxWorks target configuration containig definition of these
-# variables: WIND_BASE CPU TOOL
--include $(MAKERULES_DIR)/config.target
 ifndef WRENV
 $(error $(shell $(call canttest,WRENV is not defined in config.target)))
 endif