fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / boot / Makefile

diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
index 181a5a5..b739e25 100644 (file)
--- a/arch/ppc/boot/Makefile
+++ b/arch/ppc/boot/Makefile
@@ -1,6 +1,9 @@
 #
 # arch/ppc/boot/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.
@@ -16,19 +19,18 @@ HOSTCFLAGS  += -Iarch/$(ARCH)/boot/include
 BOOT_TARGETS   = zImage zImage.initrd znetboot znetboot.initrd
 
 bootdir-y                      := simple
-bootdir-$(CONFIG_PPC_OF)       += openfirmware
-subdir-y                       := lib/ common/ images/
-subdir-$(CONFIG_PPC_OF)                += of1275/
+subdir-y                       := lib common images
+subdir-$(CONFIG_PPC_PREP)      += of1275
 
 # for cleaning
-subdir-                                += simple/ openfirmware/
+subdir-                                += simple
 
-host-progs := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree)
+hostprogs-y := $(addprefix utils/, mkprep mkbugboot mktree)
 
-.PHONY: $(BOOT_TARGETS) $(bootdir-y)
+PHONY += $(BOOT_TARGETS) $(bootdir-y)
 
 $(BOOT_TARGETS): $(bootdir-y)
 
 $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
-               $(addprefix $(obj)/,$(host-progs))
+               $(addprefix $(obj)/,$(hostprogs-y))
        $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)