Changeset 748 for trunk/kBuild

Timestamp:

Dec 25, 2006, 2:21:48 AM (19 years ago)

Author:

bird

Message:

TARGET_BASE fix (not completed).

File:

• trunk/kBuild/header.kmk (modified) (9 diffs)

trunk/kBuild/header.kmk

@@ -170 +170 @@
 endif
 
-## CURSUBDIR is PATH_SUB_ROOT described relative to PATH_ROOT. 
+## CURSUBDIR is PATH_SUB_ROOT described relative to PATH_ROOT.
 # This variable is used to determin where the object files and other output goes.
 ifneq ($(PATH_ROOT),$(PATH_CURRENT))
@@ -211 +211 @@
 ## MAKEFILE is the name of the main makefile.
 MAKEFILE            := $(firstword $(MAKEFILE_LIST))
-## MAKEFILE_CURRENT is the name of the current makefile. 
+## MAKEFILE_CURRENT is the name of the current makefile.
 # This is updated everything a sub-makefile is included.
 MAKEFILE_CURRENT    := $(MAKEFILE)
@@ -224 +224 @@
    $(warning kBuild: kmk major version mismatch, expected '0' found '$(KBUILD_VERSION_MAJOR)'!)
   else
-   $(warning kBuild: kmk minor version mismatch, expected '1' found '$(KBUILD_VERSION_MINOR)'!) 
+   $(warning kBuild: kmk minor version mismatch, expected '1' found '$(KBUILD_VERSION_MINOR)'!)
   endif
  endif
-else 
+else
  include $(PATH_KBUILD)/gnumake-header.kmk
 endif
@@ -444 +444 @@
 #
 # Some Functions.
-# The lower cased ones are either fallbacks or candidates for functions.c. 
+# The lower cased ones are either fallbacks or candidates for functions.c.
 #
 
@@ -491 +491 @@
 # @param    $1      real target name.
 # @param    $2      normalized main target
-TARGET_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename $(1))))
+TARGET_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(1)))
 
 ## Figure out where to put object files.
@@ -540 +540 @@
 
 ## PROPS_ACCUMULATE_R
-# The list of accumulative target properties where the right most value/flag 
+# The list of accumulative target properties where the right most value/flag
 # is the 'most significant'.
 # A Config.kmk file can add it's own properties to this list and kBuild
@@ -554 +554 @@
 
 ## PROPS_ACCUMULATE
-# The list of accumulative target properties where the left most value/flag 
+# The list of accumulative target properties where the left most value/flag
 # is the 'most significant'.
 # A Config.kmk file can add it's own properties to this list and kBuild
@@ -569 +569 @@
 
 #
-# Here is a special 'hack' to prevent innocent environment variables being 
-# picked up and treated as properties. (The most annoying example of why 
+# Here is a special 'hack' to prevent innocent environment variables being
+# picked up and treated as properties. (The most annoying example of why
 # this is necessary is the Visual C++ commandline with it's LIBPATH.)
 #
-# Define KBUILD_DONT_KILL_ENV_PROPS in the env. or on the commandline to 
+# Define KBUILD_DONT_KILL_ENV_PROPS in the env. or on the commandline to
 # disable this 'hack'.
 #
@@ -716 +716 @@
 # Message macros.
 #
-# This is done after including Config.kmk as to allow for 
+# This is done after including Config.kmk as to allow for
 # KBUILD_QUIET and KBUILD_VERBOSE to be configurable.
 #