Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kbuild: refactor script/kconfig/Makefile

Now it is harmless to add all host programs to hostprogs-y.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

authored by

Masahiro Yamada and committed by
Michal Marek
022af62d 97e3226e

+3 -31
+3 -31
scripts/kconfig/Makefile
··· 157 157 qconf-objs := zconf.tab.o 158 158 gconf-objs := gconf.o zconf.tab.o 159 159 160 - hostprogs-y := conf 161 - 162 - ifeq ($(MAKECMDGOALS),nconfig) 163 - hostprogs-y += nconf 164 - endif 165 - 166 - ifeq ($(MAKECMDGOALS),menuconfig) 167 - hostprogs-y += mconf 168 - endif 169 - 170 - ifeq ($(MAKECMDGOALS),update-po-config) 171 - hostprogs-y += kxgettext 172 - endif 173 - 174 - ifeq ($(MAKECMDGOALS),xconfig) 175 - qconf-target := 1 176 - endif 177 - ifeq ($(MAKECMDGOALS),gconfig) 178 - gconf-target := 1 179 - endif 180 - 181 - 182 - ifeq ($(qconf-target),1) 183 - hostprogs-y += qconf 184 - endif 185 - 186 - ifeq ($(gconf-target),1) 187 - hostprogs-y += gconf 188 - endif 160 + hostprogs-y := conf nconf mconf kxgettext qconf gconf 189 161 190 162 clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck 191 163 clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h ··· 196 224 || echo "-lmenu -lpanel -lncurses" ) 197 225 $(obj)/qconf.o: $(obj)/.tmp_qtcheck 198 226 199 - ifeq ($(qconf-target),1) 227 + ifeq ($(MAKECMDGOALS),xconfig) 200 228 $(obj)/.tmp_qtcheck: $(src)/Makefile 201 229 -include $(obj)/.tmp_qtcheck 202 230 ··· 253 281 254 282 $(obj)/gconf.o: $(obj)/.tmp_gtkcheck 255 283 256 - ifeq ($(gconf-target),1) 284 + ifeq ($(MAKECMDGOALS),gconfig) 257 285 -include $(obj)/.tmp_gtkcheck 258 286 259 287 # GTK needs some extra effort, too...