Changeset 472

Timestamp:

Jul 15, 2006, 6:33:50 AM (19 years ago)

Author:

bird

Message:

New feature: Sub-Makefile.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (2 diffs)
• header.kmk (modified) (3 diffs)
• subfooter.kmk (added)
• subheader.kmk (added)

trunk/kBuild/footer.kmk

@@ -147 +147 @@
 # @remark There are two major hacks here:
 #           1. Source files in the output directory are translated into a gen/ subdir.
-#               2. Catch anyone specifying $(PATH_CURRENT)/sourcefile.c.
+#               2. Catch anyone specifying $(PATH_SUB_CURRENT)/sourcefile.c.
 _OBJECT_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename \
-        $(patsubst $(PATH_ROOT)/%,%,$(patsubst $(PATH_CURRENT)/%,%,$(patsubst $(PATH_TARGET)/$(2)/%,gen/%,$(1)))))))
+        $(patsubst $(PATH_ROOT)/%,%,$(patsubst $(PATH_SUB_CURRENT)/%,%,$(patsubst $(PATH_TARGET)/$(2)/%,gen/%,$(1)))))))
 
 ## Figure out where to put object files.
@@ -457 +457 @@
                 $($(target)_$(source)_DEPORD_)
         $(call MSG_L1,Creating $$@)
-        $(RM) -f $(dep) $(out) $($(target)_$(source)_OUTPUT_)
+        $(RM) -f $(dep) $(obj) $($(target)_$(source)_OUTPUT_)
         $(custom_pre)
 

trunk/kBuild/header.kmk

@@ -248 +248 @@
 #
 ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
+
 PATH_CURRENT        := $(abspath $(CURDIR))
+ifneq ($(strip $(SUB_DEPTH)),)
+PATH_SUB_CURRENT    := $(abspath $(PATH_CURRENT)/$(SUB_DEPTH))
+else
+PATH_SUB_CURRENT    := $(PATH_CURRENT)
+endif
 PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
 
@@ -254 +260 @@
 
 PATH_CURRENT        := $(CURDIR)
-# Get the real root path.
+PATH_SUB_CURRENT    := $(PATH_CURRENT)
+ifneq ($(strip $(SUB_DEPTH)),)
+ifneq ($(SUB_DEPTH),.)
+$(foreach d,$(subst /, ,$(SUB_DEPTH)), $(eval PATH_SUB_CURRENT := $(patsubst %/,%,$(dir $(PATH_SUB_CURRENT)))) )
+endif
+endif
 PATH_ROOT           := $(PATH_CURRENT)
 ifneq ($(DEPTH),.)
@@ -261 +272 @@
 
 endif
+
 # Subdirectory relative to the root.
 ifneq ($(PATH_ROOT),$(PATH_CURRENT))
-CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_CURRENT))
+CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_CURRENT))
 else
 CURSUBDIR           := .