kbuild: Replace host-progs with hostprogs-y

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile
index e309450..e1ae14c 100644 (file)
--- a/arch/alpha/boot/Makefile
+++ b/arch/alpha/boot/Makefile
@@ -8,7 +8,7 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-host-progs     := tools/mkbb tools/objstrip
+hostprogs-y    := tools/mkbb tools/objstrip
 targets                := vmlinux.gz vmlinux \
                   vmlinux.nh tools/lxboot tools/bootlx tools/bootph \
                   tools/bootpzh bootloader bootpheader bootpzheader 

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index ac2b3cd..aa7064a 100644 (file)
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -29,7 +29,7 @@ targets               := vmlinux.bin bootsect bootsect.o setup setup.o \
                   zImage bzImage
 subdir-        := compressed
 
-host-progs     := tools/build
+hostprogs-y    := tools/build
 
 HOSTCFLAGS_build.o := $(LINUXINCLUDE)
 

diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
index 8c1d7eb..995f89b 100644 (file)
--- a/arch/ppc/boot/Makefile
+++ b/arch/ppc/boot/Makefile
@@ -23,12 +23,12 @@ subdir-$(CONFIG_PPC_OF)             += of1275
 # for cleaning
 subdir-                                += simple openfirmware
 
-host-progs := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree)
+hostprogs-y := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree)
 
 .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)

diff --git a/arch/ppc64/boot/Makefile b/arch/ppc64/boot/Makefile
index 0099f1c..365cbaa 100644 (file)
--- a/arch/ppc64/boot/Makefile
+++ b/arch/ppc64/boot/Makefile
@@ -58,7 +58,7 @@ obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
 src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
 gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
 
-host-progs             := piggy addnote addSystemMap addRamDisk
+hostprogs-y            := piggy addnote addSystemMap addRamDisk
 targets                += zImage zImage.initrd imagesize.c \
                           $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
                           $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \

diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index d62e32d..5d78c8e 100644 (file)
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -7,7 +7,7 @@
 ROOT_IMG       := /usr/src/root.img
 ELFTOAOUT      := elftoaout
 
-host-progs     := piggyback btfixupprep
+hostprogs-y    := piggyback btfixupprep
 targets                := tftpboot.img btfix.o btfix.S image
 
 quiet_cmd_elftoaout    = ELFTOAOUT $@

diff --git a/arch/sparc64/boot/Makefile b/arch/sparc64/boot/Makefile
index 5eb14ff..6968a6d 100644 (file)
--- a/arch/sparc64/boot/Makefile
+++ b/arch/sparc64/boot/Makefile
@@ -7,7 +7,7 @@
 ROOT_IMG       := /usr/src/root.img
 ELFTOAOUT      := elftoaout
 
-host-progs     := piggyback
+hostprogs-y    := piggyback
 targets                := image tftpboot.img vmlinux.aout
 
 quiet_cmd_elftoaout = ELF2AOUT $@

diff --git a/arch/um/sys-i386/util/Makefile b/arch/um/sys-i386/util/Makefile
index a3eca5f..1fd4926 100644 (file)
--- a/arch/um/sys-i386/util/Makefile
+++ b/arch/um/sys-i386/util/Makefile
@@ -1,6 +1,6 @@
 
-host-progs     := mk_sc
-always         := $(host-progs) mk_thread
+hostprogs-y    := mk_sc
+always         := $(hostprogs-y) mk_thread
 targets                := mk_thread_kern.o mk_thread_user.o
 
 mk_sc-objs     := mk_sc.o

diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile
index 1c2d3cb..99b7904 100644 (file)
--- a/arch/x86_64/boot/Makefile
+++ b/arch/x86_64/boot/Makefile
@@ -30,7 +30,7 @@ targets               := vmlinux.bin bootsect bootsect.o \
 
 EXTRA_CFLAGS := -m32
 
-host-progs     := tools/build
+hostprogs-y    := tools/build
 subdir-                := compressed/  #Let make clean descend in compressed/
 # ---------------------------------------------------------------------------
 

diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
index bcd60fb..907c593 100644 (file)
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
@@ -3,7 +3,7 @@
 #
 
 fore_200e-objs := fore200e.o
-host-progs     := fore200e_mkfirm
+hostprogs-y    := fore200e_mkfirm
 
 # Files generated that shall be removed upon make clean
 clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index c8feb83..4f3ae77 100644 (file)
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -10,7 +10,7 @@ raid6-objs    := raid6main.o raid6algos.o raid6recov.o raid6tables.o \
                   raid6int1.o raid6int2.o raid6int4.o \
                   raid6int8.o raid6int16.o raid6int32.o \
                   raid6mmx.o raid6sse1.o raid6sse2.o
-host-progs     := mktables
+hostprogs-y    := mktables
 
 # Note: link order is important.  All raid personalities
 # and xor.o must come before md.o, as they each initialise 

diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index 2e8403b..043468a 100644 (file)
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 
-host-progs     := fdump
+hostprogs-y    := fdump
 
 ifdef CONFIG_DVB_AV7110_FIRMWARE
 $(obj)/av7110.o: $(obj)/fdump $(obj)/av7110_firm.h 

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 377c723..474eacd 100644 (file)
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -35,7 +35,7 @@ ifndef CONFIG_X86
 obj-y += syscall.o
 endif
 
-host-progs := gen-devlist
+hostprogs-y := gen-devlist
 
 # Dependencies on generated files need to be listed explicitly
 $(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h

diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile
index 32f99d8..f621726 100644 (file)
--- a/drivers/zorro/Makefile
+++ b/drivers/zorro/Makefile
@@ -5,7 +5,7 @@
 obj-$(CONFIG_ZORRO)    += zorro.o zorro-driver.o zorro-sysfs.o names.o
 obj-$(CONFIG_PROC_FS)  += proc.o
 
-host-progs             := gen-devlist
+hostprogs-y            := gen-devlist
 
 # Files generated that shall be removed upon make clean
 clean-files := devlist.h

diff --git a/lib/Makefile b/lib/Makefile
index 295e70b..f80da45 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_LIBCRC32C)       += libcrc32c.o
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
 obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
 
-host-progs     := gen_crc32table
+hostprogs-y    := gen_crc32table
 clean-files    := crc32table.h
 
 $(obj)/crc32.o: $(obj)/crc32table.h

diff --git a/scripts/Makefile b/scripts/Makefile
index ae375b1..67763ee 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -13,8 +13,7 @@ hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
-host-progs     := $(sort $(hostprogs-y))
-always         := $(host-progs)
+always         := $(hostprogs-y)
 
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-$(CONFIG_MODULES)     += mod

diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 3afb3bf..f22e94c 100644 (file)
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -11,8 +11,8 @@
 #                include/config/...
 # docproc:      Used in Documentation/docbook
 
-host-progs     := fixdep split-include docproc
-always         := $(host-progs)
+hostprogs-y    := fixdep split-include docproc
+always         := $(hostprogs-y)
 
 # fixdep is needed to compile other host programs
 $(addprefix $(obj)/,$(filter-out fixdep,$(always))): $(obj)/fixdep

diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile
index 76f1fd1..5875f29 100644 (file)
--- a/scripts/genksyms/Makefile
+++ b/scripts/genksyms/Makefile
@@ -1,6 +1,6 @@
 
-host-progs     := genksyms
-always         := $(host-progs)
+hostprogs-y    := genksyms
+always         := $(hostprogs-y)
 
 genksyms-objs  := genksyms.o parse.o lex.o
 

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 89b986a..6377641 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -67,7 +67,7 @@ help:
 
 libkconfig-objs := zconf.tab.o
 
-host-progs     := conf mconf qconf gconf
+hostprogs-y    := conf mconf qconf gconf
 conf-objs      := conf.o  libkconfig.so
 mconf-objs     := mconf.o libkconfig.so
 

diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index 2f22b2f..cdc4024 100644 (file)
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -15,8 +15,8 @@ endif
 endif
 endif
 
-host-progs     := lxdialog
-always         := ncurses $(host-progs)
+hostprogs-y    := lxdialog
+always         := ncurses $(hostprogs-y)
 
 lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
                 util.o lxdialog.o msgbox.o

diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index f66bf52..11d69c3 100644 (file)
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -1,5 +1,5 @@
-host-progs     := modpost mk_elfconfig
-always         := $(host-progs) empty.o
+hostprogs-y    := modpost mk_elfconfig
+always         := $(hostprogs-y) empty.o
 
 modpost-objs   := modpost.o file2alias.o sumversion.o
 

diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 6fc30dc..226b395 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -103,7 +103,7 @@ sb_lib-objs := sb_common.o sb_audio.o sb_midi.o sb_mixer.o sb_ess.o
 vidc_mod-objs  := vidc.o vidc_fill.o
 wavefront-objs  := wavfront.o wf_midi.o yss225.o
 
-host-progs     := bin2hex hex2hex
+hostprogs-y    := bin2hex hex2hex
 
 # Files generated that shall be removed upon make clean
 clean-files := maui_boot.h msndperm.c msndinit.c pndsperm.c pndspini.c \

diff --git a/usr/Makefile b/usr/Makefile
index fe62659..965759f 100644 (file)
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -1,7 +1,7 @@
 
 obj-y := initramfs_data.o
 
-host-progs  := gen_init_cpio
+hostprogs-y  := gen_init_cpio
 
 clean-files := initramfs_data.cpio.gz