linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / Makefile

diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index c68f030..f722e1a 100644 (file)
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -1,9 +1,6 @@
 #
 # ia64/Makefile
 #
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies.
-#
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
@@ -45,12 +42,6 @@ ifeq ($(call cc-version),0304)
 endif
 
 CFLAGS += $(cflags-y)
-
-cppflags-$(CONFIG_XEN) += \
-       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-
-CPPFLAGS += $(cppflags-y)
-
 head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
 
 libs-y                         += arch/ia64/lib/
@@ -61,15 +52,9 @@ core-$(CONFIG_IA64_GENERIC)  += arch/ia64/dig/
 core-$(CONFIG_IA64_HP_ZX1)     += arch/ia64/dig/
 core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/
 core-$(CONFIG_IA64_SGI_SN2)    += arch/ia64/sn/
-core-$(CONFIG_XEN)             += arch/ia64/xen/
 
 drivers-$(CONFIG_PCI)          += arch/ia64/pci/
-ifneq ($(CONFIG_XEN),y)
 drivers-$(CONFIG_IA64_HP_SIM)  += arch/ia64/hp/sim/
-endif
-ifneq ($(CONFIG_IA64_GENERIC),y)
-drivers-$(CONFIG_XEN)          += arch/ia64/hp/sim/
-endif
 drivers-$(CONFIG_IA64_HP_ZX1)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/
@@ -77,14 +62,12 @@ drivers-$(CONFIG_OPROFILE)  += arch/ia64/oprofile/
 
 boot := arch/ia64/hp/sim/boot
 
-PHONY += boot compressed check
+.PHONY: boot compressed check
 
 all: compressed unwcheck
 
 compressed: vmlinux.gz
 
-vmlinuz: vmlinux.gz
-
 vmlinux.gz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
@@ -99,8 +82,8 @@ CLEAN_FILES += vmlinux.gz bootloader
 boot:  lib/lib.a vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
-install:
-       -yes | sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"
+install: vmlinux.gz
+       sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
 
 define archhelp
   echo '* compressed   - Build compressed kernel image'