Changeset 827 for trunk/kBuild

Timestamp:

Feb 3, 2007, 2:08:29 AM (18 years ago)

Author:

bird

Message:

New property 'ORDERDEPS' for listing order-only dependencies.

File:

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

trunk/kBuild/footer.kmk

@@ -110 +110 @@
 _SYSMODS  :=
 _INSTALLS :=
+_INSTALLS_FILES :=
 _INSTALLS_DIRS :=
 _OTHERS   :=
@@ -708 +709 @@
         $($(srcname)_DEPS)\
         $($(target)_DEPS)
+orderdeps := \
+        $($(target)_$(source)_ORDERDEPS)\
+        $($(target)_$(srcname)_ORDERDEPS)\
+        $($(source)_ORDERDEPS)\
+        $($(srcname)_ORDERDEPS)\
+        $($(target)_ORDERDEPS)
 md5 := $(firstword \
         $($(target)_$(source)_MD5)\
@@ -774 +781 @@
 $(target)_$(srcname)_FETCH_OUTPUT_ := $(TOOL_$(tool)_FETCH_OUTPUT)
 $(target)_$(srcname)_FETCH_DEPEND_ := $(TOOL_$(tool)_FETCH_DEPEND) $(deps)
-$(target)_$(srcname)_FETCH_DEPORD_ := $(TOOL_$(tool)_FETCH_DEPORD) $(dirdep)
+$(target)_$(srcname)_FETCH_DEPORD_ := $(TOOL_$(tool)_FETCH_DEPORD) $(dirdep) $(orderdeps)
 
 # generate the fetch rule.
@@ -832 +839 @@
 $(target)_$(srcname)_UNPACK_OUTPUT_ := $(TOOL_$(tool)_UNPACK_OUTPUT)
 $(target)_$(srcname)_UNPACK_DEPEND_ := $(TOOL_$(tool)_UNPACK_DEPEND) $(deps)
-$(target)_$(srcname)_UNPACK_DEPORD_ := $(TOOL_$(tool)_UNPACK_DEPORD) $(dirdep)
+$(target)_$(srcname)_UNPACK_DEPORD_ := $(TOOL_$(tool)_UNPACK_DEPORD) $(dirdep) $(orderdeps)
 
 # generate the fetch rule.
@@ -1123 +1130 @@
 $(eval $(def_link_install_rule))
 
-_INSTALLS += $(INSTARGET_$(target))
+_INSTALLS_FILES += $(INSTARGET_$(target))
 
 ifdef KBUILD_DO_AUTO_INSTALL
@@ -1213 +1220 @@
     $($(target)_OBJS_)
 dirdep      := $(call DIRDEP,$(dir $(out)))
-## @todo fix dependencies on makefiles an such
 deps        := $($(target)_DEPS)
+orderdeps   := $($(target)_ORDERDEPS)
 
 # Adjust paths if we got a default path.
@@ -1220 +1227 @@
  objs := $(call abspathex,$(objs),$(defpath))
  deps := $(call abspathex,$(deps),$(defpath))
+ orderdeps := $(call abspathex,$(orderdeps),$(defpath))
  othersrc := $(call abspathex,$(othersrc),$(defpath))
 endif
@@ -1252 +1260 @@
 $(target)_OUTPUT_ := $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT)
 $(target)_DEPEND_ := $(TOOL_$(tool)_LINK_LIBRARY_DEPEND) $(deps) $(objs)
-$(target)_DEPORD_ := $(TOOL_$(tool)_LINK_LIBRARY_DEPORD) $(dirdep)
+$(target)_DEPORD_ := $(TOOL_$(tool)_LINK_LIBRARY_DEPORD) $(dirdep) $(orderdeps)
 
 # generate the link rule.
@@ -1429 +1437 @@
         $(TOOL_$(tool)_LIBPATH)
 dirdep      := $(call DIRDEP,$(dir $(out)))
-## @todo fix dependencies
 deps        := $($(target)_DEPS)
+orderdeps   := $($(target)_ORDERDEPS)
 
 # Adjust paths if we got a default path.
@@ -1437 +1445 @@
  objs := $(call abspathex,$(objs),$(defpath))
  deps := $(call abspathex,$(deps),$(defpath))
+ orderdeps := $(call abspathex,$(orderdeps),$(defpath))
  othersrc := $(call abspathex,$(othersrc),$(defpath))
  # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_PATH)/lib if relative to current dir!
@@ -1442 +1451 @@
 
 ## @todo this stuff can't be working.
-custom_pre  := $(strip $(firstword \
+custom_pre := $(strip $(firstword \
         $($(target)_CUSTOM_PRE.$(bld_trg).$(bld_trg_arch))\
         $($(target)_CUSTOM_PRE.$(bld_trg).$(bld_type))\
@@ -1454 +1463 @@
         $(CUSTOM_PRE)\
 ))
-custom_post    := $(strip $(firstword \
+custom_post := $(strip $(firstword \
         $($(target)_CUSTOM_POST.$(bld_trg).$(bld_trg_arch))\
         $($(target)_CUSTOM_POST.$(bld_trg).$(bld_type))\
@@ -1513 +1522 @@
 $(target)_OUTPUT_ := $(TOOL_$(tool)_$(tool_do)_OUTPUT)
 $(target)_DEPEND_ := $(TOOL_$(tool)_$(tool_do)_DEPEND) $(deps) $(objs)
-$(target)_DEPORD_ := $(TOOL_$(tool)_$(tool_do)_DEPORD) $(dirdep)
+$(target)_DEPORD_ := $(TOOL_$(tool)_$(tool_do)_DEPORD) $(dirdep) $(orderdeps)
 
 # generate the link rule.
@@ -1523 +1532 @@
 _OUT_FILES += $($(target)_OUTPUT_) $(out)
 _CLEAN_FILES += $($(target)_CLEAN)
-_INSTALLS += $(INSTARGET_$(target))
+_INSTALLS_FILES += $(INSTARGET_$(target))
 
 endef
@@ -1769 +1778 @@
 # _INSTFUN
 ifdef $(symlnk)_INSTFUN
-instfun := $(symlnk)_INSTFUN
-else
-ifdef $(target)_INSTFUN
+ instfun := $(symlnk)_INSTFUN
+else ifdef $(target)_INSTFUN
 instfun := $(target)_INSTFUN
 else
-instfun := _INSTALL_FILE
-endif
+ instfun := _INSTALL_FILE
 endif
 
@@ -1781 +1788 @@
 ifdef $(symlnk)_INST
  inst := $(patsubst %/,%,$($(symlnk)_INST))/$(dir $(symlnk))
+else ifdef $(target)_INST
+ inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
 else
- ifdef $(target)_INST
-  inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
- else
-  inst := $(dir $(symlnk))
- endif
+ inst := $(dir $(symlnk))
 endif
 
@@ -1821 +1826 @@
 ifdef $(directory)_INST
  inst := $(PATH_INS)/$(patsubst %/,%,$($(directory)_INST))
+else ifdef $(target)_INST
+ inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
 else
- ifdef $(target)_INST
-  inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
- else
-  inst := $(PATH_INS)
- endif
+ inst := $(PATH_INS)
 endif
 
@@ -1878 +1881 @@
 bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_TARGET_CPU))
 
-INSTARGET_$(target) :=
+INSTARGET_$(target) := $($(target)_GOALS)
 INSTARGET_DIRS_$(target) :=
 
@@ -1890 +1893 @@
         $(eval $(value def_install_symlink)))
 
-_INSTALLS += $(INSTARGET_$(target)) $($(target)_GOALS)
+# the collection target
+TARGET_$(target) := $(PATH_TARGET)/$(target).ins
+$(TARGET_$(target)): $(INSTARGET_$(target)) | $(INSTARGET_DIRS_$(target))
+        @$(QUIET2)$(APPEND) $@
+
+$(target): $(TARGET_$(target))
+
+_INSTALLS += $(TARGET_$(target))
+_INSTALLS_FILES += $(INSTARGET_$(target))
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
 endef
@@ -1913 +1924 @@
 # DIRECTORIES
 #
-_DIR_ALL := $(sort $(addsuffix /,$(patsubst %/,%,$(_DIRS))) $(dir $(_OUT_FILES) $(_OBJS) $(_INSTALLS)))
+_DIR_ALL := $(sort $(addsuffix /,$(patsubst %/,%,$(_DIRS))) $(dir $(_OUT_FILES) $(_OBJS) $(_INSTALLS_FILES)))
 $(foreach directory,$(_INSTALLS_DIRS), $(eval _DIR_ALL := $(filter-out $(directory),$(_DIR_ALL))))
 
@@ -2078 +2089 @@
 # @todo make this a non-default pass!
 uninstall:
-        $(RM) -f $(_INSTALLS)
+        $(RM) -f $(_INSTALLS_FILES)
 
 install: pass_installs
@@ -2091 +2102 @@
 sysmods:   $(_SYSMODS)
 others:    $(_OTHERS)
-installs:  $(_INSTALLS_DIRS) $(_INSTALLS)
+installs:  $(_INSTALLS)