Changeset 120 for trunk/kBuild

Timestamp:

Jun 25, 2004, 7:01:36 PM (21 years ago)

Author:

bird

Message:

Fixed rebuild dependency reload issue. Added two _SOURCE.somthing variations.

File:

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

trunk/kBuild/footer.kmk

@@ -273 +273 @@
         $($(target)_LDTOOL)\
         ,$(eval _TOOLS += $(tool)))
-$(foreach source, $($(target)_SOURCES), $(eval $(def_tools_target_source)))
+$(foreach source, $($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE)) \
+        , $(eval $(def_tools_target_source)))
 endef
 $(foreach target, $(ALL_TARGETS), $(eval $(def_tools_target)))
@@ -296 +297 @@
 define def_sdks_target
 $(foreach sdk, $($(target)_SDKS), $(eval _SDKS += $(sdk)))
-$(foreach source, $($(target)_SOURCES), $(eval $(def_sdks_target_source)))
+$(foreach source, $($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE))\
+        , $(eval $(def_sdks_target_source)))
 endef
 $(foreach target, $(ALL_TARGETS), $(eval $(def_sdks_target)))
@@ -595 +597 @@
 #$ (warning def_target_sources)
 # C sources
-$(foreach type,C,$(foreach source, $(filter %.c, $($(target)_SOURCES))\
+$(foreach type,C,$(foreach source, $(filter %.c, $($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE)))\
         ,$(eval $(def_target_source_c_cpp_asm)) ))
 
 # C++ sources
-$(foreach type,CXX,$(foreach source, $(filter %.cpp %.cxx %.xx, $($(target)_SOURCES))\
+$(foreach type,CXX,$(foreach source, $(filter %.cpp %.cxx %.xx, $($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE)))\
         ,$(eval $(def_target_source_c_cpp_asm)) ))
 
 # ASM sources
-$(foreach type,AS,$(foreach source, $(filter %.asm %.s %.S, $($(target)_SOURCES))\
+$(foreach type,AS,$(foreach source, $(filter %.asm %.s %.S, $($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE)))\
         ,$(eval $(def_target_source_c_cpp_asm)) ))
 endef
@@ -643 +645 @@
 ))
 $(eval objs         = $(_OBJS_$(target)))
-$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE))))
 $(eval dirdep      := $(dir $(lib)).dir_created)
 ## @todo fix dependencies on makefiles an such
@@ -759 +761 @@
         $(CUSTOM_POST)\
 )))
-$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE))))
 
 $(eval $(TOOL_$(tool)_LINK_PROGRAM))
@@ -878 +880 @@
         $(CUSTOM_POST)\
 )))
-$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE))))
 
 ifndef TOOL_$(tool)_LINK_SYSMOD
@@ -1072 +1074 @@
 all_recursive: $(foreach pass,$(PASSES),pass_$(pass))
 
-rebuild: clean all_recursive
+rebuild: clean 
+        $(MAKE) -f $(firstword $(MAKEFILE_LIST)) all_recursive