Changeset 643 for trunk/kBuild

Timestamp:

Dec 1, 2006, 9:25:28 PM (19 years ago)

Author:

bird

Message:

Don't delete object files we find in _SOURCES.*. Fixes #7.

File:

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

trunk/kBuild/footer.kmk

@@ -1453 +1453 @@
 out         := $(outbase)$(suff)
 TARGET_$(target) := $(out)
-$(target)_OBJS_ := $(filter %.o %.obj, \
-        $($(target)_SOURCES) \
-        $($(target)_SOURCES.$(bld_trg)) \
-        $($(target)_SOURCES.$(bld_trg_arch)) \
-        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
-        $($(target)_SOURCES.$(bld_trg_cpu)) \
-        $($(target)_SOURCES.$(bld_type)))
+$(target)_OBJS_ := 
 
 # source -> object
@@ -1485 +1479 @@
         $($(target)_SOURCES.$(bld_trg_cpu)) \
         $($(target)_SOURCES.$(bld_type)))
-objs         = $($(target)_OBJS_)
+objs         = $(filter %.o %.obj, \
+        $($(target)_SOURCES) \
+        $($(target)_SOURCES.$(bld_trg)) \
+        $($(target)_SOURCES.$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg_cpu)) \
+        $($(target)_SOURCES.$(bld_type))) \
+    $($(target)_OBJS_)
 dirdep      := $(call DIRDEP,$(dir $(out)))
 ## @todo fix dependencies on makefiles an such
@@ -1563 +1564 @@
 PATH_$(target)   := $(patsubst %/,%,$(dir $(outbase)))
 TARGET_$(target) := $(out)
-$(target)_OBJS_  := $(filter %.o %.obj, \
-        $($(target)_SOURCES) \
-        $($(target)_SOURCES.$(bld_trg)) \
-        $($(target)_SOURCES.$(bld_trg_arch)) \
-        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
-        $($(target)_SOURCES.$(bld_trg_cpu)) \
-        $($(target)_SOURCES.$(bld_type)))
+$(target)_OBJS_  := 
 
 # source -> object
@@ -1603 +1598 @@
         $($(target)_SOURCES.$(bld_trg_cpu)) \
         $($(target)_SOURCES.$(bld_type)))
-objs         = $($(target)_OBJS_)
+objs         = $(filter %.o %.obj, \
+        $($(target)_SOURCES) \
+        $($(target)_SOURCES.$(bld_trg)) \
+        $($(target)_SOURCES.$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg_cpu)) \
+        $($(target)_SOURCES.$(bld_type))) \
+        $($(target)_OBJS_)
 libs        :=\
         $($(target)_LIBS.$(bld_trg_cpu))\