Changeset 984 for trunk/kBuild/footer.kmk

Timestamp:

May 28, 2007, 9:41:38 PM (18 years ago)

Author:

bird

Message:

enabled the multi target rules. added some PORTME hints.

File:

• trunk/kBuild/footer.kmk (modified) (10 diffs)

trunk/kBuild/footer.kmk

@@ -34 +34 @@
 
 # all targets.
-ALL_TARGETS += \
+_ALL_TARGETS := \
         $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
         $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
@@ -47 +47 @@
 
 # all $(BUILD_TARGET) targets.
-_ALL_BUILD_TARGET_TARGETS += \
+_ALL_BUILD_TARGET_TARGETS := \
         $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
         $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
@@ -59 +59 @@
 
 # all $(BUILD_TARGET) targets.
-_ALL_BUILD_PLATFORM_TARGETS += \
+_ALL_BUILD_PLATFORM_TARGETS := \
         $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH))
 
+## all linkable targets.
+#_ALL_LINKABLE_TARGETS := \
+#       $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_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))
+#
+## all library targets.
+#_ALL_LIBRARY_TARGETS := \
+#       $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+#       $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+
 # all targets making use of srcname.
-_ALL_SRCNAME_TARGETS += \
+_ALL_SRCNAME_TARGETS := \
         $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
         $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
@@ -106 +118 @@
 
 
-#
-# Basic macros
+
+#
+# Footer macros
 #
 
@@ -138 +151 @@
 
 
-#
-# Include the additional footer macros when bootstrapping kBuild.
-#
-ifndef KMK_VERSION
- include $(PATH_KBUILD)/gnumake-footer.kmk
-endif
-
-
 
 #
@@ -158 +163 @@
 endif
 endef
-$(foreach target, $(ALL_TARGETS),$(eval $(def_check_target)))
+$(foreach target, $(_ALL_TARGETS),$(eval $(def_check_target)))
+
+
+#
+# Target inheritance.
+#
+# $ (foreach ...
 
 
@@ -170 +181 @@
 endif
 endef
-$(foreach target, $(ALL_TARGETS), $(eval $(def_templates)))
+$(foreach target, $(_ALL_TARGETS), $(eval $(def_templates)))
 _TEMPLATES := $(sort $(_TEMPLATES))
 # $ (warning dbg: _TEMPLATES=$(_TEMPLATES))
@@ -1139 +1150 @@
 endif
 
-## Temporary macro for testing the new multi target rules.
-ifdef USE_MULTI_TARGET
- _M_PLUSS=+
-else
- _M_PLUSS=
-endif
-
 ## Generates the rules for building a specific object, and the aliases
 # for building a source file.
 # @param    $(obj)    The object file.
 define def_target_source_rule
-$(obj) $(_M_PLUSS) $($(target)_$(source)_OUTPUT_): \
+$(obj) + $($(target)_$(source)_OUTPUT_) : \
                 $($(target)_$(source)_DEPEND_) \
                 $(_DEP_COMPILE_CMDS) \
@@ -1194 +1198 @@
 # @param    $($(target)_CMDS_PREV_) The link commands from the previous run.
 define def_link_rule
-$(out) $(_M_PLUSS) $($(target)_OUTPUT_): \
+$(out) + $($(target)_OUTPUT_) : \
                 $($(target)_DEPEND_) \
                 $(_DEP_LINK_CMDS) \
@@ -2456 +2460 @@
 #
 show_targets:
-        @$(foreach target, $(ALL_TARGETS),\
+        @$(foreach target, $(_ALL_TARGETS),\
         @$(ECHO) "target: $(target)" $(NLTAB)\
         @$(ECHO) "  PATH_$(target)=$(PATH_$(target))" $(NLTAB)\