Changeset 2242 in kBuild

Timestamp:

Jan 10, 2009 2:16:34 AM (16 years ago)

Author:

bird

Message:

subheader.kmk,subfooter.kmk: removed unnecessary doulbe expansion and made use of $(evalval ) (more efficient and understandable).

Location:

trunk/kBuild

Files:

• subfooter.kmk (modified) (3 diffs)
• subheader.kmk (modified) (4 diffs)

trunk/kBuild/subfooter.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2006-2008 knut st. osmundsen <bird-kBuild-spam@anduin.net>
+# Copyright (c) 2006-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
 #
 # This file is part of kBuild.
@@ -42 +42 @@
 # Set the default path for all new targets.
 #
-## @todo use $(evalval ) instead of doubly expanded $(eval )?
 define def_subheader
  ifndef $(target)_PATH
   ifdef $(target)_DEFPATH
-   $(target)_PATH := $$($(target)_DEFPATH)
+   $(target)_PATH := $($(target)_DEFPATH)
   else
-   $(target)_PATH := $$(PATH_SUB_CURRENT)
-   $(target)_DEFPATH := $$(PATH_SUB_CURRENT)
+   $(target)_PATH := $(PATH_SUB_CURRENT)
+   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
   endif
  else ifndef $(target)_DEFPATH
-  $(target)_DEFPATH := $$($(target)_PATH)
+  $(target)_DEFPATH := $($(target)_PATH)
  endif
  ifndef $(target)_MAKEFILE
-  $(target)_MAKEFILE := $$(MAKEFILE_CURRENT)
+  $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
  endif
  ifndef $(target)_0_OUTDIR
-  $(target)_0_OUTDIR := $$(call TARGET_PATH,$(target))
-  PATH_$(target) := $$($(target)_0_OUTDIR)
+  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
+  PATH_$(target) := $($(target)_0_OUTDIR)
  endif
 endef
@@ -76 +75 @@
         $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
         $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
-,$(eval $(def_subheader)))
+,$(evalval def_subheader))
 
 

trunk/kBuild/subheader.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2006-2008 knut st. osmundsen <bird-kBuild-spam@anduin.net>
+# Copyright (c) 2006-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
 #
 # This file is part of kBuild.
@@ -53 +53 @@
  # Set the default path and makefile for all new targets.
  #
- ## @todo use $(evalval ) instead of doubly expanded $(eval )?
  define def_subfooter
   ifndef $(target)_PATH
    ifdef $(target)_DEFPATH
-    $(target)_PATH := $$($(target)_DEFPATH)
+    $(target)_PATH := $($(target)_DEFPATH)
    else
-    $(target)_PATH := $$(PATH_SUB_CURRENT)
-    $(target)_DEFPATH := $$(PATH_SUB_CURRENT)
+    $(target)_PATH := $(PATH_SUB_CURRENT)
+    $(target)_DEFPATH := $(PATH_SUB_CURRENT)
    endif
   else ifndef $(target)_DEFPATH
-   $(target)_DEFPATH := $$($(target)_PATH)
+   $(target)_DEFPATH := $($(target)_PATH)
   endif
   ifndef $(target)_MAKEFILE
@@ -69 +68 @@
   endif
   ifndef $(target)_0_OUTDIR
-   $(target)_0_OUTDIR := $$(call TARGET_PATH,$(target))
-   PATH_$(target) := $$($(target)_0_OUTDIR)
+   $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
+   PATH_$(target) := $($(target)_0_OUTDIR)
   endif
  endef
@@ -87 +86 @@
         $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
         $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
- ,$(eval $(def_subfooter)))
+ ,$(evalval def_subfooter))