Sysles rules split to sysless a sysless-setup.

This is necessary if you want to use variables like USER_LIB_DIR in ifeq in
Makefile.omk.

darcs-hash:20060629095200-f2ef6-e6d72b5c3a63703de20270e2cedda8e05c5fe456.gz

diff --git a/rulesdef.py b/rulesdef.py
index 66d7be87153e304c9ada7e31c243be5aa6d4381c..239a4e97745f1b505b74c522948c5e4e4dc412e3 100755 (executable)
--- a/rulesdef.py
+++ b/rulesdef.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 rules = {
-    'sysless': [ 'base', 'gcc', 'config_h', 'include', 'sysless', 'localeval' ],
+    'sysless': [ 'sysless-setup', 'base', 'gcc', 'config_h', 'include', 'sysless', 'localeval' ],
     'linux':   [ 'linux-setup', 'base', 'config_h', 'include', 'linux' ],
     'rtems':   [ 'rtems-setup', 'base', 'config_h', 'include', 'rtems' ],
     }

diff --git a/snippets/sysless b/snippets/sysless
index b7929008ec41ae42d7b82a9dd6ac0310003fb9e4..cbd78e5c6a02cd5a7ede989f53dd18b83b80f738 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -33,28 +33,6 @@ ifeq ($(wildcard $(MAKERULES_DIR)/config.target),$(MAKERULES_DIR)/config.target)
 $(error Please, rename $(MAKERULES_DIR)/config.target to config.omk!)
 endif
 
-BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR))
-COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR))
-
-LOCAL_BUILD_DIR=$(MAKERULES_DIR)/$(BUILD_DIR_NAME)/$(RELATIVE_DIR)
-#$(warning LOCAL_BUILD_DIR = $(LOCAL_BUILD_DIR))
-
-#=====================================================================
-# Common utility rules
-
-link_VARIANTS ?= $(DEFAULT_LD_SCRIPT_VARIANT)
-
-
-#=====================================================================
-# Include correct rules for just running pass
-
-USER_COMPILED_DIR_NAME=$(MAKERULES_DIR)/$(COMPILED_DIR_NAME)
-
-USER_INCLUDE_DIR := $(USER_COMPILED_DIR_NAME)/include
-USER_LIB_DIR     := $(USER_COMPILED_DIR_NAME)/lib
-USER_UTILS_DIR   := $(USER_COMPILED_DIR_NAME)/bin-utils
-USER_BIN_DIR     := $(USER_COMPILED_DIR_NAME)/bin
-USER_OBJS_DIR    := $(LOCAL_BUILD_DIR)
 
 
 # -------------------------------------

diff --git a/snippets/sysless-setup b/snippets/sysless-setup
new file mode 100644 (file)
index 0000000..1f22d1e
--- /dev/null
+++ b/snippets/sysless-setup
@@ -0,0 +1,27 @@
+
+BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR))
+COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR))
+
+LOCAL_BUILD_DIR=$(MAKERULES_DIR)/$(BUILD_DIR_NAME)/$(RELATIVE_DIR)
+#$(warning LOCAL_BUILD_DIR = $(LOCAL_BUILD_DIR))
+
+#=====================================================================
+# Common utility rules
+
+link_VARIANTS ?= $(DEFAULT_LD_SCRIPT_VARIANT)
+
+
+#=====================================================================
+# Include correct rules for just running pass
+
+USER_COMPILED_DIR_NAME=$(MAKERULES_DIR)/$(COMPILED_DIR_NAME)
+
+USER_INCLUDE_DIR = $(USER_COMPILED_DIR_NAME)/include
+USER_LIB_DIR     = $(USER_COMPILED_DIR_NAME)/lib
+USER_UTILS_DIR   = $(USER_COMPILED_DIR_NAME)/bin-utils
+USER_BIN_DIR     = $(USER_COMPILED_DIR_NAME)/bin
+USER_OBJS_DIR    = $(LOCAL_BUILD_DIR)
+
+# Local Variables:
+# mode:makefile
+# End: