Changeset 725 for trunk/kBuild/subfooter.kmk

Timestamp:

Dec 15, 2006, 6:18:47 AM (19 years ago)

Author:

bird

Message:

Partial implementation of a _PATH target property for resolving relative paths. It's primarily intended for sub-makefile mode where we apply it to all targets automatically. TODOs: INCS, DEPs (source level) and SUBDIRS*.

File:

• trunk/kBuild/subfooter.kmk (modified) (1 diff)

trunk/kBuild/subfooter.kmk

@@ -25 +25 @@
 #
 
-_SUB_MAKEFILE_STACK := $(filter-out $(words $(_SUB_MAKEFILE_STACK)), $(_SUB_MAKEFILE_STACK))
-ifeq ($(words $(_SUB_MAKEFILE_STACK)),0)
-include $(PATH_KBUILD)/footer.kmk
+
+#
+# Set the default path for all new targets.
+#
+define def_subheader
+ifndef $(target)_PATH
+$(target)_PATH := $(PATH_SUB_CURRENT)
+endif
+ifndef $(target)_MAKEFILE
+$(target)_MAKEFILE := $(MAKEFILE_CURRENT)
+endif
+endef
+
+$(foreach target,\
+        $(ALL_TARGETS) \
+        $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
+        $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+        $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+,$(eval $(def_subheader)))
+
+
+#
+# Switch back to the context of previous makefile on the stack.
+#
+MAKEFILE_CURRENT := $(call stack-pop,_SUB_MAKEFILE_STACK)
+PATH_SUB_CURRENT := $(abspath $(patsubst %/,%,$(dir $(MAKEFILE_CURRENT))))
+
+#
+# When we reach the last makefile we include the footer.
+#
+ifeq ($(_SUB_MAKEFILE_STACK),)
+ include $(PATH_KBUILD)/footer.kmk
 endif