Changeset 1919 for trunk/kBuild

Timestamp:

Oct 24, 2008, 12:22:52 AM (17 years ago)

Author:

bird

Message:

footer.kmk: Postpone the big dependency lists until second (dependency) expansion where they can be handled more efficiently (i.e. not waste strcache memory).

File:

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

trunk/kBuild/footer.kmk

@@ -1996 +1996 @@
 define def_link_rule
 $(out) + $($(target)_OUTPUT_) +| $($(target)_OUTPUT_MAYBE_) : \
-                $($(target)_DEPEND_) \
+                $$$$($(target)_DEPEND_) \
                 $(value _DEP_LINK_CMDS) \
                 | \
-                $($(target)_DEPORD_)
+                $$$$($(target)_DEPORD_)
         %$$(call MSG_LINK,$(target),$$@,$(tool_do))
         $$(QUIET)$$(RM) -f -- $(dep) $(out) $($(target)_OUTPUT_) $($(target)_OUTPUT_MAYBE_)
@@ -3245 +3245 @@
 # the collection target
 TARGET_$(target) := $(PATH_TARGET)/$(target).ins
-$(TARGET_$(target)): $(INSTARGET_$(target)) | $(INSTARGET_DIRS_$(target)) $(call DIRDEP,$(PATH_TARGET))
+$(TARGET_$(target)): $$(INSTARGET_$(target)) | $$(INSTARGET_DIRS_$(target)) $(call DIRDEP,$(PATH_TARGET))
         @$(QUIET2)$(APPEND) $@
 
-$(target): $(TARGET_$(target))
+$(target): $$(TARGET_$(target))
 
 _INSTALLS += $(TARGET_$(target))
@@ -3440 +3440 @@
 define def_pass_nonstrict
 .PHONY:       pass_$(pass) pass_$(pass)_before pass_$(pass)_after pass_$(pass)_doit
-pass_$(pass)_doit: $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$($(var)))
+pass_$(pass)_doit: $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$$$$($(var)))
 pass_$(pass):   pass_$(pass)_doit
 endef # def_pass_nonstrict
@@ -3517 +3517 @@
 install: pass_installs
 
-# misc shortcuts.
+# misc shortcuts (use secondary expansion here to save strcache[file] space).
 targets:   bldprogs libraries dlls programs sysmods others installs
-objects:   $(_OBJS)
-bldprogs:  $(_BLDPROGS)
-libraries: $(_LIBS) $(_IMPORT_LIBS) $(_OTHER_LIBRARIES)
-dlls:      $(_DLLS)
-programs:  $(_PROGRAMS)
-sysmods:   $(_SYSMODS)
-others:    $(_OTHERS)
-installs:  $(_INSTALLS) $(_INSTALLS_DIRS) $(_INSTALLS_FILES)
+objects:   $$(_OBJS)
+bldprogs:  $$(_BLDPROGS)
+libraries: $$(_LIBS) $$(_IMPORT_LIBS) $$(_OTHER_LIBRARIES)
+dlls:      $$(_DLLS)
+programs:  $$(_PROGRAMS)
+sysmods:   $$(_SYSMODS)
+others:    $$(_OTHERS)
+installs:  $$(_INSTALLS) $$(_INSTALLS_DIRS) $$(_INSTALLS_FILES)