[Xen-devel] [PATCH] squash into 'build: build Kconfig and config rules'

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
 xen/Makefile                       |  3 +--
 xen/tools/kconfig/Makefile.kconfig | 20 +++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 1d2c814..fd16650 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -25,8 +25,7 @@ EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi
 include $(XEN_ROOT)/Config.mk
 
 # Allow someone to change their config file
-KCONFIG_CONFIG ?= .config
-export KCONFIG_CONFIG
+export KCONFIG_CONFIG ?= .config
 
 .PHONY: default
 default: build
diff --git a/xen/tools/kconfig/Makefile.kconfig 
b/xen/tools/kconfig/Makefile.kconfig
index b46f18c..574ce1d 100644
--- a/xen/tools/kconfig/Makefile.kconfig
+++ b/xen/tools/kconfig/Makefile.kconfig
@@ -3,16 +3,14 @@
 # default rule to do nothing
 all:
 
-XEN_ROOT = $(CURDIR)/..
-
 # Xen doesn't have a silent build flag
 quiet := silent_
 Q := @
 kecho := :
 
 # eventually you'll want to do out of tree builds
-srctree = $(XEN_ROOT)/xen
-objtree = $(srctree)
+srctree := $(XEN_ROOT)/xen
+objtree := $(srctree)
 src := tools/kconfig
 obj := $(src)
 KBUILD_SRC :=
@@ -22,15 +20,8 @@ dot-target = $(dir $@).$(notdir $@)
 depfile = $(subst $(comma),,$(dot-target).d)
 basetarget = $(basename $(notdir $@))
 cmd = $(cmd_$(1))
-if_changed = $(if y, \
-       @set -e; \
-       $(cmd_$(1)); \
-       )
-
-if_changed_dep = $(if y, \
-       @set -e;        \
-       $(cmd_$(1)); \
-       )
+if_changed = $(cmd_$(1))
+if_changed_dep = $(cmd_$(1))
 
 define multi_depend
 $(foreach m, $(notdir $1), \
@@ -57,9 +48,8 @@ SRCARCH = $(shell echo $(ARCH) | \
        sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
 export SRCARCH
 
-# include the original Makefile from Linux
+# include the original Makefile and Makefile.host from Linux
 include $(src)/Makefile
-# include the Makefile.host from Linux
 include $(src)/Makefile.host
 
 # clean up rule
-- 
2.4.10


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel